synch recent changes from R1 to HEAD

9 files changed, 81 insertions, 115 deletions

diff --git a/templates/assignuser.tpl b/templates/assignuser.tpl
index 5ed7ea8..edf43df 100644
--- a/templates/assignuser.tpl
+++ b/templates/assignuser.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_users/templates/Attic/assignuser.tpl,v 1.2 2005/08/07 17:46:48 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_users/templates/Attic/assignuser.tpl,v 1.3 2005/08/24 20:59:13 squareing Exp $ *}
 {strip}
 <div class="floaticon">{bithelp}</div>
 <div class="floaticon"><a href="{$smarty.const.USERS_PKG_URL}admin/index.php">{biticon ipackage=liberty iname=back iexplain="back to users"}</a></div>
@@ -35,7 +35,7 @@
 						<a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?group_id={$groupId}">{$group.group_name}
 						{if $groupId eq $assignUser->mInfo.default_group_id}</strong>{/if}
 						{if $groupId != -1}
-							&nbsp;<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&amp;group_id={$groupId}&amp;assign_user={$assignUser->mUserId}">{biticon ipackage="liberty" iname="delete_small" iexplain="remove group"}</a>
+							&nbsp;<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&amp;group_id={$groupId}&amp;assign_user={$assignUser->mUserId}">{biticon ipackage="liberty" iname="delete_small" iexplain="remove group" iforce="icon"}</a>
 						{/if}
 						<br />
 					{/foreach}
@@ -73,7 +73,7 @@
 						<td>{$group.group_name}</td>
 						<td>{$group.group_desc}</td>
 						<td class="actionicon">
-							<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;action=assign&amp;group_id={$groupId}&amp;assign_user={$assignUser->mUserId}">{biticon ipackage="liberty" iname="assign" iexplain="assign"}</a>
+							<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;action=assign&amp;group_id={$groupId}&amp;assign_user={$assignUser->mUserId}">{biticon ipackage="liberty" iname="assign" iexplain="assign" iforce="icon"}</a>
 						</td>
 					</tr>
 				{/if}
diff --git a/templates/center_user_wiki_page.tpl b/templates/center_user_wiki_page.tpl
index e4e0599..0ba5bd3 100644
--- a/templates/center_user_wiki_page.tpl
+++ b/templates/center_user_wiki_page.tpl
@@ -13,17 +13,23 @@
 	<div class="body">
 		{jstabs}
 			{jstab title="User Page"}
-				{if $parsed}
-					{if $gBitUser->mUserId eq $gQueryUser->mUserId}
-						<div class="floaticon">
-							{smartlink ipackage=users ifile="edit_personal_page.php" ititle="Edit your personal wiki page" ibiticon="liberty/edit"}
-						</div>
-					{/if}
+				{if $gBitUser->hasPermission( 'bit_p_admin_users' ) || $gBitUser->mUserId eq $gQueryUser->mUserId}
+					<div class="floaticon">
+						{if $gBitUser->mUserId ne $gQueryUser->mUserId}
+							{smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id ititle="Assume user identity" ibiticon="users/assume_user"}
+						{else}
+							{smartlink ipackage=users ifile="preferences.php" ititle="Edit personal profile and images" ibiticon="liberty/edit"}
+						{/if}
+
+						{if $gBitUser->mUserId eq $gQueryUser->mUserId}
+							{smartlink ipackage=users ifile="edit_personal_page.php" ititle="Edit personal wiki page" ibiticon="liberty/edit"}
+						{/if}
+					</div>
+				{/if}
 
 					<div class="header">
 						<h1>{$userInfo.title}</h1>
 					</div>
-				{/if}
 
 				<div class="body">
 					<div class="content">
@@ -48,16 +54,6 @@
 			{/jstab}
 
 			{jstab title="User Information"}
-				{if $gBitUser->hasPermission( 'bit_p_admin_users' )}
-					<div class="floaticon">
-						{if $gBitUser->mUserId ne $gQueryUser->mUserId}
-							{smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id ititle="Assume user identity" ibiticon="users/assume_user"}
-						{else}
-							{smartlink ipackage=users ifile="preferences.php" ititle="Edit your personal profile" ibiticon="liberty/edit"}
-						{/if}
-					</div>
-				{/if}
-
 				<div class="header">
 					<h1 >{displayname hash=$userInfo nolink=true}</h1>
 				</div>
diff --git a/templates/menu_users.tpl b/templates/menu_users.tpl
index 3a945cf..67c3413 100644
--- a/templates/menu_users.tpl
+++ b/templates/menu_users.tpl
@@ -1,7 +1,7 @@
 {strip}
 <ul>
 	{if $gBitUser->isRegistered()}
-		<li><a class="item" href="{$smarty.const.USERS_PKG_URL}my.php">{biticon ipackage=liberty iname=spacer iforce=icon} {tr}My {$siteTitle|default:Site}{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.USERS_PKG_URL}my.php">{biticon ipackage=liberty iname=spacer iforce=icon} {tr}My {$gBitSystemPrefs.site_menu_title|default:$siteTitle}{/tr}</a></li>
 		<li><a class="item" href="{$smarty.const.USERS_PKG_URL}index.php?home={$gBitUser->mInfo.login}">{biticon ipackage=users iname=home iexplain="Home" iforce=icon} {tr}View My Homepage{/tr}</a></li>
 		{if $gBitSystem->isPackageActive( 'wiki' )}
 			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}edit_personal_page.php">{biticon ipackage=liberty iname=edit iforce=icon} {tr}Edit My Homepage{/tr}</a></li>
diff --git a/templates/user_information_inc.tpl b/templates/user_information_inc.tpl
index 27c42ba..6a933ef 100644
--- a/templates/user_information_inc.tpl
+++ b/templates/user_information_inc.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_users/templates/user_information_inc.tpl,v 1.4 2005/08/07 17:46:48 squareing Exp $ *}

+{* $Header: /cvsroot/bitweaver/_bit_users/templates/user_information_inc.tpl,v 1.5 2005/08/24 20:59:13 squareing Exp $ *}

 {strip}

 {if $userData->mUserPrefs.user_information eq 'public' or $gBitUser->mUserId eq $userData->mUserId}

 	<div class="row">

@@ -44,7 +44,7 @@
 		</div>

 	{/foreach}

 

-	{if $gBitUser->isAdmin()}

+	{if $gBitUser->hasPermission( 'bit_p_admin_users' )}

 		<div class="row">

 			{formlabel label="User ID"}

 			{forminput}

diff --git a/templates/user_menu.tpl b/templates/user_menu.tpl
index 2cddb26..dbc4923 100644
--- a/templates/user_menu.tpl
+++ b/templates/user_menu.tpl
@@ -1,35 +1,43 @@
-{assign var=opensec value='n'}
-
+{strip}
+{assign var=opensec value='y'}
+{assign var=submenus value='n'}
+<div class="menu"><ul>
 {if $menu_info.type eq 'e' or $menu_info.type eq 'd'}
-	{foreach key=pos item=chdata from=$channels}
-		{assign var=cname value=$menu_info.menuId|cat:'__'|cat:$chdata.position}
+	{foreach key=pos item=chdata from=$moptions}
+		{assign var=cname value='menu'|cat:$menu_info.menu_id|cat:'__'|cat:$chdata.position}
 		{if $chdata.type eq 's'}
-			{if $opensec eq 'y'}</div>{/if}
-
+			{if $opensec eq 'y'}
+				</ul></div>
+				{if $submenus eq 'n'}
+					<ul class="menu">
+					{assign var=submenus value='y'}
+				{else}
+					</li>
+				{/if}
+			{/if}
 			{if $gBitSystem->isFeatureActive( 'feature_menusfolderstyle' )}
-				<a class="menuhead" href="javascript:icntoggle('menu{$cname}');">{biticon ipackage=liberty iname="collapsed" name="menu`$cname`img" iexplain="folder"}
+				<li><a class="head" href="javascript:icntoggle('{$cname}');">{biticon ipackage=liberty iname="collapsed" id="`$cname`img" iexplain="folder"}{tr}{$chdata.name}{/tr}</a>
 			{else}
-				<a class="menuhead" href="javascript:toggle('menu{$cname}');">
+				<li><a class="head" href="javascript:toggle('{$cname}');">{tr}{$chdata.name}{/tr}</a>
 			{/if} 
-			{tr}{$chdata.name}{/tr}</a>
 			{assign var=opensec value='y'}
-			<div {if $menu_info.type eq 'd' and $smarty.cookies.$cname ne 'o'}style="display:none;"{else}style="display:block;"{/if} id="menu{$cname}">
-		{else}
-			<a class="menuoption" href="{$chdata.url|escape}">{tr}{$chdata.name}{/tr}</a>
-		{/if}
-		<script language="Javascript" type="text/javascript">
 			{if $gBitSystem->isFeatureActive( 'feature_menusfolderstyle' )}
-				setfoldericonstate('menu{$menu_info.menuId|cat:'__'|cat:$chdata.position}', '{$menu_info.type}');
+			<script type="text/javascript">setfoldericonstate('{$cname}');</script>
 			{/if}
-		</script>
+			<div {if $smarty.cookies.$cname eq 'o' or $menu_info.type eq 'e'}style="display:block;"{elseif $smarty.cookies.$cname eq 'c' or $menu_info.type eq 'd'}style="display:none;"{/if} id="{$cname}"><ul>
+		{else}
+			<li><a class="item" href="{$chdata.url|escape}">{tr}{$chdata.name}{/tr}</a></li>
+		{/if}
 	{/foreach}
-
 {else}
-	{foreach key=pos item=chdata from=$channels}
+	{foreach key=pos item=chdata from=$moptions}
 		{if $chdata.type eq 's'}
-			<a class="menuhead" href="{$chdata.url|escape}">{tr}{$chdata.name}{/tr}</a>
+			<li><a class="head" href="{$chdata.url|escape}">{tr}{$chdata.name}{/tr}</a></li>
 		{else}
-			<a class="menuoption" href="{$chdata.url|escape}">{tr}{$chdata.name}{/tr}</a>
+			<li><a class="item" href="{$chdata.url|escape}">{tr}{$chdata.name}{/tr}</a></li>
 		{/if}
 	{/foreach}
 {/if}
+</ul></div>
+</li></ul>
+{/strip}
diff --git a/templates/user_preferences.tpl b/templates/user_preferences.tpl
index 1586809..271388c 100644
--- a/templates/user_preferences.tpl
+++ b/templates/user_preferences.tpl
@@ -224,7 +224,7 @@
 				{form legend="Change your password"}
 					<input type="hidden" name="view_user" value="{$editUser.user_id}" />
 
-					{if !$view_user or ( $gBitUser->isAdmin and $view_user )}
+					{if !$view_user or ( $gBitUser->hasPermission('bit_p_admin_users') and $view_user )}
 						<div class="row">
 							{formlabel label="Old password" for="old"}
 							{forminput}
@@ -260,59 +260,7 @@
 
 			{if $gBitSystem->isPackageActive( 'messu' )}
 				{jstab title="User Messages"}
-					{form legend="User Messages"}
-						<div class="row">
-							{formlabel label="Personal Messages" for=""}
-							{forminput}
-								<a href="{$smarty.const.MESSU_PKG_URL}message_box.php">
-									{tr}You have <strong>{$unreadMsgs|default:no} unread</strong> {if $unreadMsgs eq '1'}message{else}messages{/if}{/tr}
-								</a>
-							{/forminput}
-						</div>
-
-						<div class="row">
-							{formlabel label="Messages per page" for="mess_maxRecords"}
-							{forminput}
-								<select name="mess_maxRecords" id="mess_maxRecords">
-									<option value="2" {if $mess_maxRecords eq 2}selected="selected"{/if}>{tr}2{/tr}</option>
-									<option value="5" {if $mess_maxRecords eq 5}selected="selected"{/if}>{tr}5{/tr}</option>
-									<option value="10" {if $mess_maxRecords eq 10}selected="selected"{/if}>{tr}10{/tr}</option>
-									<option value="20" {if $mess_maxRecords eq 20}selected="selected"{/if}>{tr}20{/tr}</option>
-									<option value="30" {if $mess_maxRecords eq 30}selected="selected"{/if}>{tr}30{/tr}</option>
-									<option value="40" {if $mess_maxRecords eq 40}selected="selected"{/if}>{tr}40{/tr}</option>
-									<option value="50" {if $mess_maxRecords eq 50}selected="selected"{/if}>{tr}50{/tr}</option>
-								</select>
-								{formhelp note=""}
-							{/forminput}
-						</div>
-
-						<div class="row">
-							{formlabel label="Allow messages from other users" for="allowMsgs"}
-							{forminput}
-								<input type="checkbox" name="allowMsgs" id="allowMsgs" {if $allowMsgs eq 'y'}checked="checked"{/if} />
-								{formhelp note=""}
-							{/forminput}
-						</div>
-
-						<div class="row">
-							{formlabel label="Send an email" for="minPrio"}
-							{forminput}
-								<select name="minPrio" id="minPrio">
-									<option value="1" {if $minPrio eq 1}selected="selected"{/if}>{tr}at least priority:{/tr} 1</option>
-									<option value="2" {if $minPrio eq 2}selected="selected"{/if}>{tr}at least priority:{/tr} 2</option>
-									<option value="3" {if $minPrio eq 3}selected="selected"{/if}>{tr}at least priority:{/tr} 3</option>
-									<option value="4" {if $minPrio eq 4}selected="selected"{/if}>{tr}at least priority:{/tr} 4</option>
-									<option value="5" {if $minPrio eq 5}selected="selected"{/if}>{tr}at least priority:{/tr} 5</option>
-									<option value="6" {if $minPrio eq 6}selected="selected"{/if}>{tr}never send message{/tr}</option>
-								</select>
-								{formhelp note="Here you can indicate when an email should be sent to you when you recieve a personal message."}
-							{/forminput}
-						</div>
-
-						<div class="row submit">
-							<input type="submit" name="messprefs" value="{tr}Change preferences{/tr}" />
-						</div>
-					{/form}
+					{include file='bitpackage:messu/messu_preferences_inc.tpl'}
 				{/jstab}
 			{/if}
 
diff --git a/templates/user_tasks.tpl b/templates/user_tasks.tpl
index ec1b83d..a1b72d1 100644
--- a/templates/user_tasks.tpl
+++ b/templates/user_tasks.tpl
@@ -29,16 +29,16 @@
 					<th style="width:25%;">{smartlink ititle="Percentage Done" isort=percentage offset=$offset tasks_use_dates=$tasks_use_dates}</th>
 				</tr>
 
-				{section name=user loop=$channels}
-					<tr {if $channels[user].status eq 'c'}style="text-decoration:line-through;"{/if} class="{cycle values='odd,even'} prio{$channels[user].priority}">
-						<td><input type="checkbox" name="task[{$channels[user].task_id}]" /></td>
-						<td><a href="{$smarty.const.USERS_PKG_URL}tasks.php?task_use_dates={$task_use_dates}&amp;task_id={$channels[user].task_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;find={$find}#tasks">{$channels[user].title}</a></td>
-						<td {if $channels[user].status eq 'c'}style="text-decoration:line-through;"{/if} class="prio{$channels[user].priority}">{$channels[user].date|bit_short_date}</td>
-						<td style="text-align:right;{if $channels[user].status eq 'c'}text-decoration:line-through;{/if}" class="prio{$channels[user].priority}">{$channels[user].priority}</td>
-						<td style="text-align:right;{if $channels[user].status eq 'c'}text-decoration:line-through;{/if}" class="prio{$channels[user].priority}">
-							<select name="task_perc[{$channels[user].task_id}]">
+				{section name=user loop=$tasks}
+					<tr {if $tasks[user].status eq 'c'}style="text-decoration:line-through;"{/if} class="{cycle values='odd,even'} prio{$tasks[user].priority}">
+						<td><input type="checkbox" name="task[{$tasks[user].task_id}]" /></td>
+						<td><a href="{$smarty.const.USERS_PKG_URL}tasks.php?task_use_dates={$task_use_dates}&amp;task_id={$tasks[user].task_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;find={$find}#tasks">{$tasks[user].title}</a></td>
+						<td {if $tasks[user].status eq 'c'}style="text-decoration:line-through;"{/if} class="prio{$tasks[user].priority}">{$tasks[user].date|bit_short_date}</td>
+						<td style="text-align:right;{if $tasks[user].status eq 'c'}text-decoration:line-through;{/if}" class="prio{$tasks[user].priority}">{$tasks[user].priority}</td>
+						<td style="text-align:right;{if $tasks[user].status eq 'c'}text-decoration:line-through;{/if}" class="prio{$tasks[user].priority}">
+							<select name="task_perc[{$tasks[user].task_id}]">
 								{section name=zz loop=$percs}
-									<option value="{$percs[zz]|escape}" {if $channels[user].percentage eq $percs[zz]}selected="selected"{/if}>{$percs[zz]}%</option>	
+									<option value="{$percs[zz]|escape}" {if $tasks[user].percentage eq $percs[zz]}selected="selected"{/if}>{$percs[zz]}%</option>	
 								{/section}
 							</select>
 						</td>
diff --git a/templates/users_admin.tpl b/templates/users_admin.tpl
index 50a6a45..04b86d3 100644
--- a/templates/users_admin.tpl
+++ b/templates/users_admin.tpl
@@ -1,5 +1,6 @@
-{* $Header: /cvsroot/bitweaver/_bit_users/templates/users_admin.tpl,v 1.2 2005/08/07 17:46:48 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_users/templates/users_admin.tpl,v 1.3 2005/08/24 20:59:13 squareing Exp $ *}
 {strip}
+{assign var=serviceEditTpls value=$gLibertySystem->getServiceValues('content_edit_tpl')}
 
 <div class="floaticon">{bithelp}</div>
 
@@ -93,6 +94,16 @@
 						{/forminput}
 					</div>
 
+					{if $serviceEditTpls.access_control }
+						{include file=$serviceEditTpls.access_control"}
+					{/if}
+
+					{if $serviceEditTpls.categorization }
+						{legend legend="Categorize"}
+							{include file=$serviceEditTpls.categorization"}
+						{/legend}
+					{/if}
+
 					<div class="row submit">
 						<input type="submit" name="newuser" value="{tr}Add User{/tr}"{if $defaultGroupId eq ''} disabled="disabled"{/if} />
 					</div>
@@ -107,9 +118,12 @@
 							<input type="file" name="csvlist" id="csvlist" /><br />
 							<label><input type="checkbox" name="overwrite" checked="checked" /> {tr}Overwrite existing users{/tr}</label>
 							{formhelp note="You can batch import users by uploading a CSV (comma-separated values) file. The CSV file needs to have the column names in the first record. The column titles must match with fields in 'users_users' table. Login, password and email are required fields. If an unexistant field is specified, it's ignored."}
-							<input type="submit" name="batchimport" value="{tr}import{/tr}" />
 						{/forminput}
 					</div>
+
+					<div class="row submit">
+						<input type="submit" name="batchimport" value="{tr}Import{/tr}" />
+					</div>
 				{/form}
 			{/jstab}
 		{/jstabs}
diff --git a/templates/users_list.tpl b/templates/users_list.tpl
index bafe861..a7b94db 100644
--- a/templates/users_list.tpl
+++ b/templates/users_list.tpl
@@ -19,21 +19,21 @@
 		<li class="item {cycle values='even,odd'}">
 			{if $gBitUser->hasPermission( 'bit_p_admin_users' )}
 				<div class="floaticon">
-					<a href="{$smarty.const.USERS_PKG_URL}admin/index.php?assume_user={$users[user].user_id}" title="{tr}Assume User Identity{/tr}">{biticon ipackage=users iname="assume_user" iexplain="assume user identity"}</a>
-					<a href="{$smarty.const.USERS_PKG_URL}preferences.php?view_user={$users[user].user_id}" title="{tr}Edit User Information{/tr}">{biticon ipackage=liberty iname="edit" iexplain="Edit User Information"}</a>
-					{if $gBitUser->isAdmin()}
-						<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?assign_user={$users[user].user_id}" title="{tr}Assign Group{/tr}">{biticon ipackage=liberty iname="permissions" iexplain="assign group"}</a>
+					<a href="{$smarty.const.USERS_PKG_URL}admin/index.php?assume_user={$users[user].user_id}" title="{tr}Assume User Identity{/tr}">{biticon ipackage=users iname="assume_user" iexplain="assume user identity" iforce="icon"}</a>
+					<a href="{$smarty.const.USERS_PKG_URL}preferences.php?view_user={$users[user].user_id}" title="{tr}Edit User Information{/tr}">{biticon ipackage=liberty iname="edit" iexplain="Edit User Information" iforce="icon"}</a>
+					{if $gBitUser->hasPermission( 'bit_p_admin_users' )}
+						<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?assign_user={$users[user].user_id}" title="{tr}Assign Group{/tr}">{biticon ipackage=liberty iname="permissions" iexplain="assign group" iforce="icon"}</a>
 						{if $users[user].user_id != -1}{* TODO: evil hardcoding *}
-							<a href="{$smarty.const.USERS_PKG_URL}admin/index.php?offset={$control.offset}&amp;numrows={$control.numrows}&amp;sort_mode={$control.sort_mode}&amp;action=delete&amp;user_id={$users[user].user_id}"  title="{tr}Remove{/tr}">{biticon ipackage=liberty iname="delete" iexplain="remove user"}</a>
+							<a href="{$smarty.const.USERS_PKG_URL}admin/index.php?offset={$control.offset}&amp;numrows={$control.numrows}&amp;sort_mode={$control.sort_mode}&amp;action=delete&amp;user_id={$users[user].user_id}"  title="{tr}Remove{/tr}">{biticon ipackage=liberty iname="delete" iexplain="remove user" iforce="icon"}</a>
 						{/if}
 					{/if}
 				</div>
 			{/if}
 
 			{if $users[user].real_name}
-				<h2>{displayname real_name=$users[user].real_name} <small>{$users[user].login}</small></h2>
+				<h2>{displayname hash=$users[user]} <small>{$users[user].login}</small></h2>
 			{else}
-				<h2>{displayname login=$users[user].login}</h2>
+				<h2>{displayname hash=$users[user]}</h2>
 			{/if}
 
 			{if $users[user].thumbnail_url}