Fixes from 24/05/2006

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5425 c91229c3-7414-0410-bfa2-8a42b809f60b

Fixes from 24/05/2006
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5425 c91229c3-7414-0410-bfa2-8a42b809f60b
Bryn Divey
1 parent a791ff7a
Showing 8 changed files with 179 additions and 113 deletions
config/config.ini
lib/templating/kt3template.inc.php
plugins/ktcore/admin/userManagement.php
preferences.php
templates/kt3/standard_page.smarty
templates/ktcore/principals/adduser.smarty
templates/ktcore/principals/useradmin.smarty
templates/ktstandard/action/email.smarty
@@ -179,6 +179,10 @@ passwordLength = 6
 ; default is set to "false" meaning that admins can create users with shorter passwords.
 restrictAdminPasswords = default
+; restrict users from accessing their preferences menus?
+restrictPreferences = true
+
+
 ; This is configuration for the built-in authentication provider
 [builtinauth]
 ;
@@ -268,7 +268,9 @@ class KTPage {
     /* final render call. */
     function render() {
-	    global $default; 
+	global $default; 
+        $oConfig = KTConfig::getSingleton();
+
         if (empty($this->contents)) {
             $this->contents = "";
         }
@@ -278,63 +280,60 @@ class KTPage {
             $this->contents = "";
         }
-		if (!is_string($this->contents)) {
-			$this->contents = $this->contents->render();
-		}
-		
-		// if we have no portlets, make the ui a tad nicer.
-		if (empty($this->portlets)) {
-		    $this->show_portlets = false;
-		}
+	if (!is_string($this->contents)) {
+	    $this->contents = $this->contents->render();
+	}
-		if (empty($this->title)) {
-		    if (!empty($this->breadcrumbDetails)) {
-				$this->title = $this->breadcrumbDetails;
-			} else if (!empty($this->breadcrumbs)) {
-				$this->title = array_slice($this->breadcrumbs, -1);
-				$this->title = $this->title[0]['label'];
-			} else if (!empty($this->breadcrumbSection)) {
-				$this->title = $this->breadcrumbSection['label'];
-			} else {
-			    $this->title = $this->componentLabel;
-			}
-		}
+	// if we have no portlets, make the ui a tad nicer.
+	if (empty($this->portlets)) {
+	    $this->show_portlets = false;
+	}
-		$this->userMenu = array();
-		if (!(PEAR::isError($this->user) || is_null($this->user) || $this->user->isAnonymous())) {
-			$this->userMenu = array(
-				"preferences" => $this->_actionHelper(array("name" => _kt("Preferences"), "action" => "preferences", "active" => 0)),
-				"logout" => $this->_actionHelper(array("name" => _kt("Logout"), "action" => "logout", "active" => 0)),
-			);
-		} else {
-			$this->userMenu = array(
-			    "login" => $this->_actionHelper(array("name" => _kt("Login"), "action" => "login")),
-			);
-		}		
+	if (empty($this->title)) {
+	    if (!empty($this->breadcrumbDetails)) {
+		$this->title = $this->breadcrumbDetails;
+	    } else if (!empty($this->breadcrumbs)) {
+		$this->title = array_slice($this->breadcrumbs, -1);
+		$this->title = $this->title[0]['label'];
+	    } else if (!empty($this->breadcrumbSection)) {
+		$this->title = $this->breadcrumbSection['label'];
+	    } else {
+		$this->title = $this->componentLabel;
+	    }
+	}
-		// FIXME we need a more complete solution to navigation restriction
-		if (!is_null($this->menu['administration']) && !is_null($this->user)) {
-			if (!Permission::userIsSystemAdministrator($this->user->getId())) {
-			    unset($this->menu['administration']);
-			}
-		}
+	$this->userMenu = array();
+	if (!(PEAR::isError($this->user) || is_null($this->user) || $this->user->isAnonymous())) {	    
+	    if ($oConfig->get("user_prefs/restrictPreferences", false) && !Permission::userIsSystemAdministrator($this->user->getId())) {
+		$this->userMenu = array("logout" => $this->_actionHelper(array("name" => _kt("Logout"), "action" => "logout", "active" => 0)),);
+	    } else {
+		$this->userMenu = array("preferences" => $this->_actionHelper(array("name" => _kt("Preferences"), "action" => "preferences", "active" => 0)),
+					"logout" => $this->_actionHelper(array("name" => _kt("Logout"), "action" => "logout", "active" => 0)),);
+	    }
+	} else {
+	    $this->userMenu = array("login" => $this->_actionHelper(array("name" => _kt("Login"), "action" => "login")),);
+	}		
-		$sContentType = 'Content-type: ' . $this->contentType;
-		if(!empty($this->charset)) {
-		    $sContentType .= '; charset=' . $this->charset;
-		};
+	// FIXME we need a more complete solution to navigation restriction
+	if (!is_null($this->menu['administration']) && !is_null($this->user)) {
+	    if (!Permission::userIsSystemAdministrator($this->user->getId())) {
+		unset($this->menu['administration']);
+	    }
+	}
+	
+	$sContentType = 'Content-type: ' . $this->contentType;
+	if(!empty($this->charset)) {
+	    $sContentType .= '; charset=' . $this->charset;
+	};
-		header($sContentType);
+	header($sContentType);
         $oTemplating =& KTTemplating::getSingleton();        
         $oTemplate = $oTemplating->loadTemplate($this->template);
-        $aTemplateData = array(
-            "page" => $this,
-			"systemversion" => $default->systemVersion,
-			"versionname" => $default->versionName,
-        );
-        $oConfig = KTConfig::getSingleton();
+        $aTemplateData = array("page" => $this,
+			       "systemversion" => $default->systemVersion,
+			       "versionname" => $default->versionName,);
         if ($oConfig->get("ui/automaticRefresh", false)) {
             $aTemplateData['refreshTimeout'] = (int)$oConfig->get("session/sessionTimeout") + 3;
         }
@@ -342,7 +341,7 @@ class KTPage {
         // unlike the rest of KT, we use echo here.
         echo $oTemplate->render($aTemplateData);
     }
-
+    
 	/**   heler functions */
 	// returns an array ("url", "label")
@@ -75,13 +75,17 @@ var $sHelpPage = &#39;ktcore/admin/manage users.html&#39;;
             $no_search = false;
         }
+
+        $aAuthenticationSources =& KTAuthenticationSource::getList();        
+
         $oTemplating =& KTTemplating::getSingleton();        
         $oTemplate = $oTemplating->loadTemplate("ktcore/principals/useradmin");
         $aTemplateData = array(
             "context" => $this,
             "search_fields" => $search_fields,
             "search_results" => $search_results,
-            'no_search' => $no_search,
+            "no_search" => $no_search,
+	    "authentication_sources" => $aAuthenticationSources,
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -121,14 +125,11 @@ var $sHelpPage = &#39;ktcore/admin/manage users.html&#39;;
         $add_fields[] =  new KTStringWidget(_kt('Mobile Number'), _kt("The mobile phone number of the user.  e.g. <strong>999 9999 999</strong>"), 'mobile_number', null, $this->oPage, false, null, null, $aOptions);        
         $add_fields[] =  new KTStringWidget(_kt('Maximum Sessions'), _kt('As a safety precaution, it is useful to limit the number of times a given account can log in, before logging out.  This prevents a single account being used by many different people.'), 'max_sessions', '3', $this->oPage, true, null, null, $aOptions);        
-        $aAuthenticationSources =& KTAuthenticationSource::getList();
-        
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate = $oTemplating->loadTemplate("ktcore/principals/adduser");
         $aTemplateData = array(
             "context" => &$this,
             "add_fields" => $add_fields,
-            "authentication_sources" => $aAuthenticationSources,
         );
         return $oTemplate->render($aTemplateData);
     }    
@@ -39,10 +39,15 @@ require_once(KT_LIB_DIR . &#39;/widgets/fieldWidgets.php&#39;);
 class PreferencesDispatcher extends KTStandardDispatcher {
     var $sSection = 'preferences';
-	function check() {
-	    if ($this->oUser->getId() == -2) { return false; }
-		return parent::check();
-	}
+    function check() {
+	$oConfig =& KTConfig::getSingleton();
+	if ($this->oUser->getId() == -2 || 
+	    ($oConfig->get('user_prefs/restrictPreferences', false) && !Permission::userIsSystemAdministrator($this->oUser->getId()))) { 
+	    return false; 
+	}	
+	
+	return parent::check();
+    }
     function PreferencesDispatcher() {
         $this->aBreadcrumbs = array(
@@ -52,15 +57,15 @@ class PreferencesDispatcher extends KTStandardDispatcher {
     }
     function do_main() {
-		$this->oPage->setBreadcrumbDetails(_kt("Your Preferences"));
-		$this->oPage->title = _kt("Dashboard");
+	$this->oPage->setBreadcrumbDetails(_kt("Your Preferences"));
+	$this->oPage->title = _kt("Dashboard");
-		$oUser =& $this->oUser;
+	$oUser =& $this->oUser;
-		$aOptions = array('autocomplete' => false);
+	$aOptions = array('autocomplete' => false);
-		$edit_fields = array();
+	$edit_fields = array();
         $edit_fields[] =  new KTStringWidget(_kt('Name'), _kt('Your full name.  This is shown in reports and listings.  e.g. <strong>John Smith</strong>'), 'name', $oUser->getName(), $this->oPage, true, null, null, $aOptions);        
         $edit_fields[] =  new KTStringWidget(_kt('Email Address'), _kt('Your email address.  Notifications and alerts are mailed to this address if <strong>email notifications</strong> is set below. e.g. <strong>jsmith@acme.com</strong>'), 'email_address', $oUser->getEmail(), $this->oPage, false, null, null, $aOptions);        
         $edit_fields[] =  new KTCheckboxWidget(_kt('Email Notifications'), _kt('If this is specified then the you will receive certain notifications.  If it is not set, then you will only see notifications on the <strong>Dashboard</strong>'), 'email_notifications', $oUser->getEmailNotification(), $this->oPage, false, null, null, $aOptions);        
@@ -76,7 +76,7 @@
         {foreach item=aMenuItem from=$page->userMenu name=prefmenu}
          {if ($aMenuItem.active == 1)}
-         <a href="{$aMenuItem.url}">{$aMenuItem.label}</a>
+         <a style='border: 4px solid red;' href="{$aMenuItem.url}">{$aMenuItem.label}</a>
          {else}
          <a href="{$aMenuItem.url}">{$aMenuItem.label}</a>
          {/if}
 <h2>{i18n}Add a user{/i18n}</h2>
-<p class="descriptiveText">{i18n}Please complete the form below to add a new user. Fields marked with a red square are required. By default, users are created using KnowledgeTree's builtin authentication provider. Should you wish to use an external authentication provider such as LDAP, please ensure that the provider's plugin is registered and enabled.{/i18n}</p>
-
-{if $authentication_sources}
-   <form action="{$smarty.server.PHP_SELF}" method="POST">
-   <input type="hidden" name="action" value="addUserFromSource" />
-   <fieldset><legend>{i18n}Add a user from an authentication source{/i18n}</legend>
-
-<p class="descriptiveText">{i18n}Instead of manually creating the user within
-the document management system, the user can be found within an
-authentication source (such as an LDAP directory) that has already been
-configured.  This ensures that the user is correctly set up with limited
-intervention from the administrator, and that the user will not need to
-remember an additional password for the document management
-system.{/i18n}</p>
-
-   {entity_select name="source_id" entities=$authentication_sources}
-   <div class="form_actions ">
-     <input type="submit" name="submit" value="{i18n}Add from source{/i18n}" />
-   </div>
-   </fieldset>
-   </form>
-</p>
-
-<p class="descriptiveText">{i18n}Alternatively, you can manually create a user
-within KnowledgeTree below.{/i18n}</p>
-{/if}
+<p class="descriptiveText">{i18n}Please complete the form below to add
+a new user. Fields marked with a red square are required. By default,
+users are created using KnowledgeTree's builtin authentication
+provider. Should you wish to use an external authentication provider
+such as LDAP, please ensure that the provider's plugin is registered
+and use the form on the User Management page.{/i18n}</p>
    <form action="{$smarty.server.PHP_SELF}" method="POST">
    <input type="hidden" name="action" value="createUser" />
 <h2>{i18n}User Management{/i18n}</h2>
-<!-- FIXME inline CSS is _very_ bad. -->
-<fieldset>
-<legend>{i18n}Add New Users{/i18n}</legend>
-<p class="descriptiveText">{i18n}To allow users access to the DMS, you need to provide them with
-credentials through this section.  Even if you are using an external source
-of login information like <strong>LDAP</strong>, you will need to use this section
-to retrieve their information from the external source.{/i18n}</p>
-<p><a href="{addQS}action=addUser{/addQS}" class="ktAction ktAddUser" style="float:
-left; padding-right: 0.5em;">{i18n}Add a new user{/i18n}</a><a
-href="{addQS}action=addUser{/addQS}">{i18n}Add a new user{/i18n}</a></p>
+
+<fieldset> <legend>{i18n}Add new users{/i18n}</legend> <p
+class="descriptiveText">{i18n}To add users to the DMS authentication
+provider, you need to provide them with credentials through this
+section.  If you are using an external source of login information
+like <strong>LDAP</strong>, ensure the appropriate plugin is loaded
+and use the section below.{/i18n}</p> <p><a
+href="{addQS}action=addUser{/addQS}" class="ktAction ktAddUser"
+style="float: left; padding-right: 0.5em;">{i18n}Add a new
+user{/i18n}</a><a href="{addQS}action=addUser{/addQS}">{i18n}Add a new
+user{/i18n}</a></p>
+
+
 </fieldset>
+{if $authentication_sources}
+   <form action="{$smarty.server.PHP_SELF}" method="POST">
+   <input type="hidden" name="action" value="addUserFromSource" />
+   <fieldset><legend>{i18n}Add a user from an authentication source{/i18n}</legend>
+
+<p class="descriptiveText">{i18n}Instead of manually creating the user within
+the document management system, the user can be found within an
+authentication source (such as an LDAP directory) that has already been
+configured.  This ensures that the user is correctly set up with limited
+intervention from the administrator, and that the user will not need to
+remember an additional password for the document management
+system.{/i18n}</p>
+
+   {entity_select name="source_id" entities=$authentication_sources}
+   <div class="form_actions ">
+     <input type="submit" name="submit" value="{i18n}Add from source{/i18n}" />
+   </div>
+   </fieldset>
+   </form>
+</p>
+{/if}
+
 <!-- we roll both in here. -->
 <form action="{$smarty.server.PHP_SELF}" method="POST">
@@ -44,21 +44,73 @@ addLoadEvent(kt_email_onload);
 <input type="hidden" name="fDocumentId" value="{$context->oDocument->getId()}" />
 <table>
-<tr><td valign="top" colspan="3"><strong>{i18n}Groups{/i18n}</strong></td></tr><tr><td valign="top" width=1%>
+<tr>
+    <td valign="top" colspan="3"><strong>{i18n}Groups{/i18n}</strong></td>
+</tr>
+<tr>
+    <td valign="top" width="1%">
-<select name="groupSelect" size="4" multiple>
-{foreach from=$groups item=oGroup}
-<OPTION value="{$oGroup->getId()}" onDblClick="optGroup.transferRight()" >{$oGroup->getName()}</OPTION>
-{/foreach}
-</select></td><td width=1%><input TYPE="button" NAME="right" VALUE="&gt;&gt;" ONCLICK="optGroup.transferRight()"><input TYPE="button" NAME="left" VALUE="&lt;&lt;" ONCLICK="optGroup.transferLeft()"></td><td><select name="chosenGroups" size="5" multiple><option>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option></select></td></tr>
+    <select name="groupSelect" size="4" multiple>
+    {foreach from=$groups item=oGroup}
+    <option value="{$oGroup->getId()}" onDblClick="optGroup.transferRight()" >{$oGroup->getName()}</option>
+    {/foreach}
+    </select>
+    </td>
-<tr><td colspan="3"><strong>{i18n}Users{/i18n}</strong></td><tr>
-<tr><td><select name="userSelect" size="4" multiple>
-{foreach from=$users item=oUser}
-<OPTION value="{$oUser->getId()}" onDblClick="optUser.transferRight()">
-{$oUser->getName()}</OPTION>
-{/foreach}
-</select></td><td><input TYPE="button" NAME="right" VALUE="&gt;&gt;" ONCLICK="optUser.transferRight()"><input TYPE="button" NAME="left" VALUE="&lt;&lt;" ONCLICK="optUser.transferLeft()"></td><td width="30%"><select name="chosenUsers" size="5" multiple><option>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option></select></td></tr>
+         <td align="center">
+            <input name="right" style="width: 60px;" value="&raquo;" onclick="optGroup.transferRight()" type="button"><br /><br />
+            <input name="left" style="width: 60px;" value="&laquo;" onclick="optGroup.transferLeft()" type="button">
+         </td>
+
+
+    <td valign="top" width="1%">
+    <select name="chosenGroups" size="5" multiple="multiple">
+    </select>
+    </td>
+</tr>
+
+<tr>
+         <td><label for="ug-filter">{i18n}Filter{/i18n}</label>
+            <input name="filterUG" id="ug-filter" onkeyup="optGroup.sortSelectMatch(groupSelect, this.value)" onchange="optGroup.sortSelectMatch(groupSelect, this.value)" type="text">
+         </td>
+         <td>&nbsp;</td>
+         <td><label for="og-filter">{i18n}Filter{/i18n}</label>
+            <input name="filterOG" id="og-filter" onkeyup="optGroup.sortSelectMatch(chosenGroups, this.value)" onchange="optGroup.sortSelectMatch(chosenGroups, this.value)" type="text">
+         </td>
+      </tr>
+
+<tr>
+    <td colspan="3"><strong>{i18n}Users{/i18n}</strong></td>
+</tr>
+<tr>
+    <td valign="top" width="1%">
+    <select name="userSelect" size="10" multiple="multiple">
+    {foreach from=$users item=oUser}
+    <option value="{$oUser->getId()}" onDblClick="optUser.transferRight()">{$oUser->getName()}</option>
+    {/foreach}
+    </select>
+    </td>
+
+         <td align="center">
+            <input name="right" style="width: 60px;" value="&raquo;" onclick="optUser.transferRight()" type="button"><br /><br />
+            <input name="left" style="width: 60px;" value="&laquo;" onclick="optUser.transferLeft()" type="button">
+         </td>
+
+    <td valign="top" width="1%">
+    <select name="chosenUsers" size="10" multiple="multiple">
+    </select>
+    </td>
+</tr>
+<tr>
+         <td><label for="uu-filter">{i18n}Filter{/i18n}</label>
+            <input name="filterUU" id="uu-filter" onkeyup="optUser.sortSelectMatch(userSelect, this.value)" onchange="optUser.sortSelectMatch(userSelect, this.value)" type="text">
+         </td>
+         <td>&nbsp;</td>
+         <td><label for="ou-filter">{i18n}Filter{/i18n}</label>
+            <input name="filterOU" id="ou-filter" onkeyup="optUser.sortSelectMatch(chosenUsers, this.value)" onchange="optUser.sortSelectMatch(chosenUsers, this.value)" type="text">
+         </td>
+      </tr>
+    
 </table>