identification method description

lam/docs/manual-sources/chapter-selfService.xml

@@ -1166,6 +1166,35 @@
         </mediaobject>
       </screenshot>
 
+      <para>Identification method, used LDAP attributes:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Email: mail</para>
+        </listitem>
+
+        <listitem>
+          <para>Employee number: employeeNumber</para>
+        </listitem>
+
+        <listitem>
+          <para>Self service login attribute: same as configured on first tab
+          of self service profile</para>
+        </listitem>
+
+        <listitem>
+          <para>User name: uid</para>
+        </listitem>
+
+        <listitem>
+          <para>User name and email address: uid and mail</para>
+        </listitem>
+
+        <listitem>
+          <para>User name or email address: uid and mail</para>
+        </listitem>
+      </itemizedlist>
+
       <para>You can now configure the minimum answer length for password reset
       answers. This is checked when you allow you users to specify their
       answers via the self service. Additionally, you can specify the text of
@@ -1195,9 +1224,8 @@
       The mail can include the new password by using the special wildcard
       "@@newPassword@@". Additionally, you may want to insert other wildcards
       that are replaced by the corresponding LDAP attributes. E.g. "@@uid@@"
-      will be replaced by the user name.
+      will be replaced by the user name. See <link
-      See <link linkend="mailSetup">here</link> for setting up your SMTP
+      linkend="mailSetup">here</link> for setting up your SMTP server.</para>
-      server.</para>
 
       <literallayout> </literallayout>
 

lam/lib/modules.inc

@@ -1069,6 +1069,7 @@ class accountContainer {
 		$suffixSelect->setHasDescriptiveElements(true);
 		$suffixSelect->setRightToLeftTextDirection(true);
 		$suffixSelect->setShortLabel();
+		$suffixSelect->setSortElements(false);
 		$titleBarSuffixRdn->add($suffixSelect, 12, 12, 7);
 		// RDN selection
 		$rdnlist = getRDNAttributes($this->type->getId());

lam/templates/3rdParty/pla/lib/QueryRender.php

@@ -210,8 +210,8 @@ class QueryRender extends PageRender {
 			echo '<br/>';
 			echo '<br/>';
 
-			switch(get_request('format','REQUEST',false,$_SESSION[APPCONFIG]->getValue('search','display'))) {
+			$format = get_request('format','REQUEST',false,$_SESSION[APPCONFIG]->getValue('search','display'));
-				case 'list':
+			if ($format === 'list') {
 				foreach ($results as $dndetails) {
 					$dndetails = array_change_key_case($dndetails);
 
@@ -263,16 +263,13 @@ class QueryRender extends PageRender {
 					echo '</table>';
 					echo '<br/>';
 				}
-
+			}
-					break;
+			else {
-
 				# Display the results.
-				case 'table':
 				if (!$results) {
 					echo _('Search returned no results');
-
-						continue;
 				}
+				else {
 
 					printf('<form action="cmd.php" method="post" id="massform_%s">', $counter);
 					echo '<div>';
@@ -370,11 +367,7 @@ class QueryRender extends PageRender {
 					echo '</table>';
 					echo '</form>';
 					echo "\n\n";
-
+				}
-					break;
-
-				default:
-					printf('Have ID [%s], run this query for page [%s]',$this->template_id,$this->page);
 			}
 
 			echo '</td></tr>';