Manage error page for advanced search

Author: coudot

htdocs/advancedsearch.php

@@ -12,26 +12,22 @@
 $ldap_search_base = "";
 $ldap_search_filter = "";
 
-if (!isset($_POST["submit"])) {
-    $smarty->assign('advanced_search_criteria', $advanced_search_criteria);
-    $smarty->assign('advanded_search_display_search_objects', $advanded_search_display_search_objects);
-
-    # Check if an attribute is a list type and prepare the list
-    $ldap_connection = $ldapInstance->connect();
-    $ldap = $ldap_connection[0];
-    $result = $ldap_connection[1];
-
-    if ($ldap) {
-        $item_list = array();
-        foreach ( $advanced_search_criteria as $criteria ) {
-            if ( $attributes_map[$criteria]["type"] === "list" ) {
-                $item_list[$criteria] = $ldapInstance->get_list( $attributes_list[$criteria]["base"], $attributes_list[$criteria]["filter"], $attributes_list[$criteria]["key"], $attributes_list[$criteria]["value"]  );
-            }
+$smarty->assign('advanced_search_criteria', $advanced_search_criteria);
+$smarty->assign('advanded_search_display_search_objects', $advanded_search_display_search_objects);
+
+# Check if an attribute is a list type and prepare the list
+$ldap_connection = $ldapInstance->connect();
+$ldap = $ldap_connection[0];
+$result = $ldap_connection[1];
+
+if ($ldap) {
+    $item_list = array();
+    foreach ( $advanced_search_criteria as $criteria ) {
+        if ( $attributes_map[$criteria]["type"] === "list" ) {
+            $item_list[$criteria] = $ldapInstance->get_list( $attributes_list[$criteria]["base"], $attributes_list[$criteria]["filter"], $attributes_list[$criteria]["key"], $attributes_list[$criteria]["value"]  );
         }
-        $smarty->assign('item_list', $item_list);
     }
-
-    $result = "displayform";
+    $smarty->assign('item_list', $item_list);
 }
 
 if (isset($_POST["type"])) {
@@ -50,14 +46,13 @@
     $result_items = $search_result_group_items;
 }
 
-if ($result === "") {
+if (!isset($_POST["submit"])) {
+     $result = "displayform";
+}
 
-    require_once("../lib/date.inc.php");
+if ($result == "") {
 
-    $ldap_connection = $ldapInstance->connect();
-    $ldapInstance->ldap_user_base = $ldap_search_base;
-    $ldap = $ldap_connection[0];
-    $result = $ldap_connection[1];
+    require_once("../lib/date.inc.php");
 
     if ($ldap) {
 
@@ -176,6 +171,8 @@
                 $page = "search";
             }
         }
+    } else {
+        $page = "error";
     }
 }