fixed error display of error message/table if no users are found
This commit is contained in:
		
							parent
							
								
									4babfb0ddd
								
							
						
					
					
						commit
						d83d1a7eba
					
				|  | @ -130,7 +130,9 @@ if ($_SESSION["userlist"] && $_GET["norefresh"]) { | ||||||
|     $userinfo = ldap_get_entries ($_SESSION["ldap"]->server, $sr); |     $userinfo = ldap_get_entries ($_SESSION["ldap"]->server, $sr); | ||||||
|     ldap_free_result ($sr); |     ldap_free_result ($sr); | ||||||
|     if ($userinfo["count"] == 0) |     if ($userinfo["count"] == 0) | ||||||
|       StatusMessage("WARN", "", _("No Users found!")); |       StatusMessage ("WARN", "", | ||||||
|  | 		     _("No User(s) found with applied search filter <") . | ||||||
|  | 		     $filter . ">"); | ||||||
| 
 | 
 | ||||||
|     // delete first array entry which is "count"
 |     // delete first array entry which is "count"
 | ||||||
|     array_shift($userinfo); |     array_shift($userinfo); | ||||||
|  | @ -146,15 +148,22 @@ $user_count = sizeof ($_SESSION["userlist"]); | ||||||
| 
 | 
 | ||||||
| echo ("<form action=\"listusers.php\" method=\"post\">\n"); | echo ("<form action=\"listusers.php\" method=\"post\">\n"); | ||||||
| 
 | 
 | ||||||
| // create navigation bar on top of user table
 | // display table only if users exist in LDAP
 | ||||||
| draw_navigation_bar ($user_count); | if ($user_count != 0) { | ||||||
| echo ("<br />"); |  | ||||||
| 
 | 
 | ||||||
| // print user table header
 |   // create navigation bar on top of user table
 | ||||||
| echo "<table rules=\"all\" class=\"userlist\" width=\"100%\">\n"; |   draw_navigation_bar ($user_count); | ||||||
| echo "<tr class=\"userlist_head\"><th width=22 height=34></th><th></th>\n"; | 
 | ||||||
| // table header
 |   echo ("<br />"); | ||||||
| for ($k = 0; $k < sizeof ($desc_array); $k++) { | } | ||||||
|  | 
 | ||||||
|  |   // print user table header
 | ||||||
|  |   echo "<table rules=\"all\" class=\"userlist\" width=\"100%\">\n"; | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  |   echo "<tr class=\"userlist_head\"><th width=22 height=34></th><th></th>\n"; | ||||||
|  |   // table header
 | ||||||
|  |   for ($k = 0; $k < sizeof ($desc_array); $k++) { | ||||||
|     if ($sortattrib == strtolower($attr_array[$k])) |     if ($sortattrib == strtolower($attr_array[$k])) | ||||||
|       echo "<th class=\"userlist_activecolumn\">\n"; |       echo "<th class=\"userlist_activecolumn\">\n"; | ||||||
|     else |     else | ||||||
|  | @ -162,25 +171,27 @@ for ($k = 0; $k < sizeof ($desc_array); $k++) { | ||||||
|     echo "<a class=\"userlist\" href=\"listusers.php?norefresh=1&sort=1&sortattrib=" .  |     echo "<a class=\"userlist\" href=\"listusers.php?norefresh=1&sort=1&sortattrib=" .  | ||||||
|       strtolower($attr_array[$k]) . $searchfilter . "\">" .  |       strtolower($attr_array[$k]) . $searchfilter . "\">" .  | ||||||
|       $desc_array[$k] . "</a></th>\n"; |       $desc_array[$k] . "</a></th>\n"; | ||||||
| } |   } | ||||||
| echo "</tr>\n"; |   echo "</tr>\n"; | ||||||
| echo "<tr class=\"test\"><th width=22 height=34></th><th>\n"; |  | ||||||
| echo "<input type=\"submit\" name=\"apply_filter\" value=\"" . _("Apply") . "\">"; |  | ||||||
| echo "</th>\n"; |  | ||||||
| 
 | 
 | ||||||
| // print input boxes for filters
 |   echo "<tr class=\"test\"><th width=22 height=34></th><th>\n"; | ||||||
| for ($k = 0; $k < sizeof ($desc_array); $k++) { |   echo "<input type=\"submit\" name=\"apply_filter\" value=\"" . _("Apply") . "\">"; | ||||||
|  |   echo "</th>\n"; | ||||||
|  | 
 | ||||||
|  |   // print input boxes for filters
 | ||||||
|  |   for ($k = 0; $k < sizeof ($desc_array); $k++) { | ||||||
|     echo "<th>"; |     echo "<th>"; | ||||||
|     echo ("<input type=\"text\" name=\"filter" . strtolower ($attr_array[$k]) .  |     echo ("<input type=\"text\" name=\"filter" . strtolower ($attr_array[$k]) .  | ||||||
| 	  "\" value=\"" . $_POST["filter" . strtolower($attr_array[$k])] . "\">"); | 	  "\" value=\"" . $_POST["filter" . strtolower($attr_array[$k])] . "\">"); | ||||||
|     echo "</th>"; |     echo "</th>"; | ||||||
| } |   } | ||||||
| echo "</tr>\n"; |   echo "</tr>\n"; | ||||||
| 
 | 
 | ||||||
| // print user list
 | if ($user_count != 0) { | ||||||
| $userinfo = array_slice ($userinfo, ($page - 1) * $max_pageentrys,  |   // print user list
 | ||||||
|  |   $userinfo = array_slice ($userinfo, ($page - 1) * $max_pageentrys,  | ||||||
| 			   $max_pageentrys);  | 			   $max_pageentrys);  | ||||||
| for ($i = 0; $i < sizeof ($userinfo); $i++) { // ignore last entry in array which is "count"
 |   for ($i = 0; $i < sizeof ($userinfo); $i++) { // ignore last entry in array which is "count"
 | ||||||
|     echo("<tr class=\"userlist\" onMouseOver=\"user_over(this, '" . $userinfo[$i]["dn"] . "')\"" . |     echo("<tr class=\"userlist\" onMouseOver=\"user_over(this, '" . $userinfo[$i]["dn"] . "')\"" . | ||||||
| 	 " onMouseOut=\"user_out(this, '" . $userinfo[$i]["dn"] . "')\"" . | 	 " onMouseOut=\"user_out(this, '" . $userinfo[$i]["dn"] . "')\"" . | ||||||
| 	 " onClick=\"user_click(this, '" . $userinfo[$i]["dn"] . "')\"" . | 	 " onClick=\"user_click(this, '" . $userinfo[$i]["dn"] . "')\"" . | ||||||
|  | @ -198,19 +209,24 @@ for ($i = 0; $i < sizeof ($userinfo); $i++) { // ignore last entry in array whic | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|     echo ("</td>"); |     echo ("</td>"); | ||||||
|  |   } | ||||||
|  |   echo("</tr>\n"); | ||||||
| } | } | ||||||
| echo("</tr>\n"); |  | ||||||
| 
 |  | ||||||
| echo ("</table>"); | echo ("</table>"); | ||||||
| 
 | 
 | ||||||
| echo ("<br />"); | echo ("<br />"); | ||||||
| draw_navigation_bar ($user_count); | if ($user_count != 0) { | ||||||
| echo ("<br />"); |   draw_navigation_bar ($user_count); | ||||||
|  |   echo ("<br />"); | ||||||
|  | } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| echo ("<table align=\"left\" border=\"0\">"); | echo ("<table align=\"left\" border=\"0\">"); | ||||||
| echo ("<tr><td align=\"left\"><input type=\"submit\" name=\"new_user\" value=\"" . _("New User") . "\"></td>"); | echo ("<tr><td align=\"left\"><input type=\"submit\" name=\"new_user\" value=\"" . _("New User") . "\"></td>"); | ||||||
| echo ("<td align=\"left\"><input type=\"submit\" name=\"del_user\" value=\"" . _("Delete User(s)") . "\"></td></tr>"); | 
 | ||||||
|  | if ($user_count != 0) { | ||||||
|  |   echo ("<td align=\"left\"><input type=\"submit\" name=\"del_user\" value=\"" . _("Delete User(s)") . "\"></td></tr>"); | ||||||
|  | } | ||||||
| echo ("</table>\n"); | echo ("</table>\n"); | ||||||
| echo ("</form>\n"); | echo ("</form>\n"); | ||||||
| echo "</body></html>\n"; | echo "</body></html>\n"; | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue