fixed problem with Ajax tag editing

[contagged] / index.php

diff --git a/index.php b/index.php
index 43ae1b0b47963bf2ec62d151d270dbb336eef8d9..5bd4fca712ba37020553766e7bde7e8841b1b763 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,5 +1,6 @@
-<?
-  require_once('init.php');
+<?php
+
+  require_once('inc/init.php');
   ldap_login();
 
   //prepare filter
@@ -43,10 +44,6 @@
 
   //prepare templates
   tpl_std();
-  tpl_markers(); //FIXME not needed anymore!?
-  tpl_categories();
-  tpl_timezone();
-  tpl_country();
   if (empty($_REQUEST['filter'])) $_REQUEST['filter']='';
   if (empty($_REQUEST['marker'])) $_REQUEST['marker']='';
   if (empty($_REQUEST['search'])) $_REQUEST['search']='';
@@ -115,7 +112,7 @@
       $marker = explode(',',$marker);
       foreach($marker as $m){
         $m = trim($m);
-        $ldapfilter .= '('.$FIELDS['*marker'].'='.$m.')';
+        $ldapfilter .= '('.$FIELDS['_marker'].'='.$m.')';
       }
       $ldapfilter .= ')';
     }elseif(!empty($search)){
@@ -139,7 +136,7 @@
         $other .= '(!('.$FIELDS['name'].'='.chr($i).'*))';
       }
       $ldapfilter = "(&(objectClass=inetOrgPerson)$other)";
-    }elseif($filter=='*'){
+    }elseif($filter=='\2a'){ //escaped asterisk
       // List all
       $ldapfilter = "(objectClass=inetOrgPerson)";
     }else{