Applied in_array strict patches from trunk

gosa-core

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.7@20981 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 8e0d14d1680c6ea24303163f1a4a907b99b36c94..70432abcbbc76cae2150cab4d8d09b994f765b1c 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -163,7 +163,7 @@ if (!session::global_is_set('plist')){
   /* Initially load all classes */
   $class_list= get_declared_classes();
   foreach ($class_mapping as $class => $path){
-    if (!in_array($class, $class_list)){
+    if (!in_array_strict($class, $class_list)){
       if (is_readable("$BASE_DIR/$path")){
         require_once("$BASE_DIR/$path");
       } else {

diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index 62f3e3702e01ee030248ed034f9f0735e35a1ff7..1149370076b558c8f19c07a94fd80e5169a97006 100644 (file)
--- a/gosa-core/include/class_CopyPasteHandler.inc
+++ b/gosa-core/include/class_CopyPasteHandler.inc
@@ -73,7 +73,7 @@ class CopyPasteHandler {
       return(FALSE);
     }
 
-    if(!in_array($action,array("cut","copy"))){
+    if(!in_array_strict($action,array("cut","copy"))){
       trigger_error(sprintf("Specified action %s does not exists for copy & paste.", bold($action)));
       return(FALSE);
     } 

diff --git a/gosa-core/include/class_ItemSelector.inc b/gosa-core/include/class_ItemSelector.inc
index 75ea6db837930b64b3024058e4193f5c8e1c941b..f3eca46910af2515bac978b4e09c88a33c43b767 100644 (file)
--- a/gosa-core/include/class_ItemSelector.inc
+++ b/gosa-core/include/class_ItemSelector.inc
@@ -46,7 +46,7 @@ class ItemSelector {
 
         // Generate instance wide unique ID
         $pid = "";
-        while($pid == "" || in_array($pid, $usedIds)){
+        while($pid == "" || in_array_strict($pid, $usedIds)){
 
             // Wait 1 msec to ensure that we definately get a new id
             if($pid != "") usleep(1);

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index ad4d2fc7cb21fb67596d168c141053d2477d548d..f3b8907ab2b98387ae6c67760f7bdfdfea61c0df 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -754,7 +754,7 @@ class config  {
             /* Detect department type */
             $type_data = array();
             foreach($types as $t => $data){
-                if(in_array($data['OC'],$attrs['objectClass'])){
+                if(in_array_strict($data['OC'],$attrs['objectClass'])){
                     $type_data = $data;
                     break;
                 }

diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index e9b48edab7ee406194d2c09fe708f0ada2792e08..ca23f4b003d65b7c7ed0853ac2230c3c54408a33 100644 (file)
--- a/gosa-core/include/class_configRegistry.inc
+++ b/gosa-core/include/class_configRegistry.inc
@@ -334,7 +334,7 @@ class configRegistry{
                     if(count($info) > 2){
                         foreach($info as $name => $value){
                             
-                            if(!in_array($name, array('CLASS','NAME'))){
+                            if(!in_array_strict($name, array('CLASS','NAME'))){
                                 $class= $info['CLASS'];    
                                 $this->fileStoredProperties[$class][strtolower($name)] = $value;
                             }
@@ -355,7 +355,7 @@ class configRegistry{
                 
                     if(count($entry) > 2 ){
                         foreach($entry as $name => $value){
-                            if(!in_array($name, array('CLASS','ACL'))){
+                            if(!in_array_strict($name, array('CLASS','ACL'))){
                                 $this->fileStoredProperties[strtolower($class)][strtolower($name)] = $value;
                             }
                         }
@@ -375,7 +375,7 @@ class configRegistry{
 
                 if(count($entry) > 2 ){
                     foreach($entry as $name => $value){
-                        if(!in_array($name, array('CLASS','ACL'))){
+                        if(!in_array_strict($name, array('CLASS','ACL'))){
                             $this->fileStoredProperties[strtolower($class)][strtolower($name)] = $value;
                         }
                     }
@@ -567,7 +567,7 @@ class configRegistry{
         foreach($this->properties as $prop){
 
             // Is this property modified
-            if(in_array($prop->getStatus(),array('modified','removed'))){
+            if(in_array_strict($prop->getStatus(),array('modified','removed'))){
 
                 // Check if we've to migrate something before we can make the changes effective. 
                 if($prop->migrationRequired()){
@@ -681,7 +681,7 @@ class gosaProperty
 
     static function isBool($message,$class,$name,$value, $type)
     {
-        $match = in_array($value,array('true','false',''));
+        $match = in_array_strict($value,array('true','false',''));
 
         // Display the reason for failing this check.         
         if($message && ! $match){
@@ -912,7 +912,7 @@ class gosaProperty
 
     function setValue($str) 
     {
-        if(in_array($this->getStatus(), array('modified'))){
+        if(in_array_strict($this->getStatus(), array('modified'))){
             $this->tmp_value = $str; 
         }elseif($this->value != $str){
             $this->setStatus('modified'); 
@@ -923,7 +923,7 @@ class gosaProperty
     function getValue($temporary = FALSE) 
     { 
         if($temporary){
-            if(in_array($this->getStatus(), array('modified','removed'))){
+            if(in_array_strict($this->getStatus(), array('modified','removed'))){
                 return($this->tmp_value); 
             }else{
                 return($this->value); 
@@ -945,7 +945,7 @@ class gosaProperty
 
     function restoreDefault() 
     {
-        if(in_array($this->getStatus(),array('ldap'))){
+        if(in_array_strict($this->getStatus(),array('ldap'))){
             $this->setStatus('removed'); 
 
             // Second check for values in the config file.
@@ -1024,7 +1024,7 @@ class gosaProperty
 
     private function setStatus($state) 
     {
-        if(!in_array($state, array('ldap','file','undefined','modified','removed'))) {
+        if(!in_array_strict($state, array('ldap','file','undefined','modified','removed'))) {
             trigger_error("Unknown property status given '{$state}' for {$this->class}:{$this->name}!");
         }else{
             $this->status = $state; 

diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 81272f9a4c5f4e808a7a9e7e685aca6df02eac93..b140e805370f13b39e3ee36bdbd599dc644c72bc 100644 (file)
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -177,7 +177,7 @@ class gosaSupportDaemon
     $line = __LINE__;
     $class = __CLASS__;
     foreach($debug as $info){
-      if(!in_array($info['function'],array("send_data","_send","set_error","connect"))){
+      if(!in_array_strict($info['function'],array("send_data","_send","set_error","connect"))){
         $file = $info['file'];
         $line = $info['line'];
         $class = get_class($this);
@@ -1039,7 +1039,7 @@ class gosaSupportDaemon
     $line = __LINE__;
     $class = __CLASS__;
     foreach($debug as $info){
-      if(!in_array($info['function'],array("send_data","_send"))){
+      if(!in_array_strict($info['function'],array("send_data","_send"))){
         $file = $info['file'];
         $line = $info['line'];
         $class = get_class($this);

diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index 5bd013a85ded0f79a48c9d20e401d319c2736d3b..9d32048e0adb7f0852048a30a509e8b747c6f4b1 100644 (file)
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -764,7 +764,7 @@ class LDAP
                     /* Get name of first matching objectClass */
                     $ocname= "";
                     foreach($classes as $class){
-                        if (isset($class['MUST']) && in_array($type, $class['MUST'])){
+                        if (isset($class['MUST']) && in_array_strict($type, $class['MUST'])){
 
                             /* Look for first classes that is structural... */
                             if (isset($class['STRUCTURAL'])){
@@ -965,7 +965,7 @@ class LDAP
 
         // Check scope values
         $scope = trim($scope);
-        if(!empty($scope) && !in_array($scope, array('base', 'one', 'sub', 'children'))){
+        if(!empty($scope) && !in_array_strict($scope, array('base', 'one', 'sub', 'children'))){
             trigger_error(sprintf("Invalid parameter for scope '%s', please use 'base', 'one', 'sub' or 'children'."), $scope);
             return(NULL);
         }
@@ -1280,7 +1280,7 @@ class LDAP
                     $attrs = $this->fetch($srp);
                     foreach($attrs as $name => $value ){
                         if(!is_numeric($name)){
-                            if(in_array($name,array("dn","count"))) continue;
+                            if(in_array_strict($name,array("dn","count"))) continue;
                             if(!isset($data[$name])){
                                 $data[$name] = array();
                             }
@@ -1375,7 +1375,7 @@ class LDAP
 
                     case ')': if ($name != ""){
                                   $v = $this->value2container($value);
-                                  if(in_array($name, array('MUST', 'MAY')) && !is_array($v)){
+                                  if(in_array_strict($name, array('MUST', 'MAY')) && !is_array($v)){
                                       $v = array($v);
                                   }
                                   $objectclasses[$ocname][$name]= $v;
@@ -1394,7 +1394,7 @@ class LDAP
                     case 'MAY':
                               if ($name != ""){
                                   $v = $this->value2container($value);
-                                  if(in_array($name, array('MUST', 'MAY')) && !is_array($v)){
+                                  if(in_array_strict($name, array('MUST', 'MAY')) && !is_array($v)){
                                       $v = array($v);
                                   }
                                   $objectclasses[$ocname][$name]= $v;

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 456b3cb8d087bffbe022c7cdf10c81c74de4d57d..4e3ef82ccb5edec0f9cefdaa96587e9719a52eb9 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -848,11 +848,11 @@ function getObjectType($types, $classes)
         foreach ($ocs as $oc){
             if (preg_match('/^!(.*)$/', $oc, $match)) {
                 $oc= $match[1];
-                if (in_array($oc, $classes)) {
+                if (in_array_strict($oc, $classes)) {
                     $found= false;
                 }
             } else {
-                if (!in_array($oc, $classes)) {
+                if (!in_array_strict($oc, $classes)) {
                     $found= false;
                 }
             }
@@ -932,12 +932,12 @@ function filterActions($dn, $row, $classes)
             $objectclass= $action['objectclass'];
             if (preg_match('/^!(.*)$/', $objectclass, $m)){
                 $objectclass= $m[1];
-                if(in_array($objectclass, $classes)) {
+                if(in_array_strict($objectclass, $classes)) {
                     $result.= image('images/empty.png');
                     continue;
                 }
             } elseif (is_string($objectclass)) {
-                if(!in_array($objectclass, $classes)) {
+                if(!in_array_strict($objectclass, $classes)) {
                     $result.= image('images/empty.png');
                     continue;
                 }
@@ -1403,14 +1403,14 @@ function getDepartments()
 
     // Analyze list of departments
     foreach ($res as $department) {
-        if (!in_array($department['dn'], $validDepartments)) {
+        if (!in_array_strict($department['dn'], $validDepartments)) {
             continue;
         }
 
         // Add the attribute where we use for sorting
         $oc= null;
         foreach(array_keys($types) as $type) {
-            if (in_array($type, $department['objectClass'])) {
+            if (in_array_strict($type, $department['objectClass'])) {
                 $oc= $type;
                 break;
             }

diff --git a/gosa-core/include/class_log.inc b/gosa-core/include/class_log.inc
index b03687de7ef086ec8acea8499efafc0957311f5b..6568778daf26807c5ee9576fe302679f78f78869 100644 (file)
--- a/gosa-core/include/class_log.inc
+++ b/gosa-core/include/class_log.inc
@@ -98,7 +98,7 @@ class log {
   {
     $msgs = array();
 
-    if(!isset($entry['action']) || !in_array($entry['action'],array("modify","create","remove","copy","snapshot","view","security","debug"))){
+    if(!isset($entry['action']) || !in_array_strict($entry['action'],array("modify","create","remove","copy","snapshot","view","security","debug"))){
       $msgs[] = sprintf(_("Invalid option %s specified!"), bold($entry['action']));
     }
 

diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc
index 0e31efbeac96d938ecda86638fc755ea22286ca5..eb00b048b947f6af87f979d80fd9e785e3167cf3 100644 (file)
--- a/gosa-core/include/class_management.inc
+++ b/gosa-core/include/class_management.inc
@@ -1016,7 +1016,7 @@ class management
    */
   function handle_post_events($mode, $addAttrs= array())
   {
-    if(!in_array($mode, array('add','remove','modify'))){
+    if(!in_array_strict($mode, array('add','remove','modify'))){
       trigger_error(sprintf("Invalid post event type given %s! Valid types are [add,modify,remove].", bold($mode)));
       return;
     }

diff --git a/gosa-core/include/class_msg_dialog.inc b/gosa-core/include/class_msg_dialog.inc
index 656fe69440c5deb283210726cc22496f291852c2..203dfd8ccb89b4334c318a9b87d80cac81bae9c2 100644 (file)
--- a/gosa-core/include/class_msg_dialog.inc
+++ b/gosa-core/include/class_msg_dialog.inc
@@ -41,7 +41,7 @@ class msg_dialog
 
         if(empty($s_message)) return;
 
-        if(!in_array($i_type,array(INFO_DIALOG,WARNING_DIALOG,ERROR_DIALOG,CONFIRM_DIALOG,FATAL_ERROR_DIALOG,OK_CANCEL_DIALOG))){
+        if(!in_array_strict($i_type,array(INFO_DIALOG,WARNING_DIALOG,ERROR_DIALOG,CONFIRM_DIALOG,FATAL_ERROR_DIALOG,OK_CANCEL_DIALOG))){
             trigger_error("Invalid msg_dialog type.");
             $i_type = INFO_DIALOG;
         }

diff --git a/gosa-core/include/class_multi_plug.inc b/gosa-core/include/class_multi_plug.inc
index ff1e8b6c520656b6a6bcabe78343de21032d688a..3c9d5aaba0b1a8115865b5ddc8277ef69e8e4337 100644 (file)
--- a/gosa-core/include/class_multi_plug.inc
+++ b/gosa-core/include/class_multi_plug.inc
@@ -213,7 +213,7 @@ class multi_plug
             $add[$key]['count'] = count($add[$key]);
           }
           for($i=0;$i<$add[$key]['count'];$i++){
-            if(!in_array($add[$key][$i],$base[$key])){
+            if(!in_array_strict($add[$key][$i],$base[$key])){
               $base[$key][] = $add[$key][$i];
               $base[$key]['count']++;
             }
@@ -245,7 +245,7 @@ class multi_plug
             $base[$key]['count'] = count($base[$key]);
           }
         for($i = 0 ; $i < $base[$key]['count'] ; $i ++){
-          if(isset($base[$key][$i]) && in_array($base[$key][$i],$minus[$key])){
+          if(isset($base[$key][$i]) && in_array_strict($base[$key][$i],$minus[$key])){
             $tmp[] = $base[$key][$i];
           }
         }

diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc
index 0180a8529a50fc25e108417911f1fecfdd84d9ad..692feb5e82481b2cee96d093ab56f93a5c28c22d 100644 (file)
--- a/gosa-core/include/class_plugin.inc
+++ b/gosa-core/include/class_plugin.inc
@@ -438,7 +438,7 @@ class plugin
    */
   function handle_pre_events($mode, $addAttrs= array())
   {
-    if(!in_array($mode, array('add','remove','modify'))){
+    if(!in_array_strict($mode, array('add','remove','modify'))){
       trigger_error(sprintf("Invalid pre event type given %s! Valid types are [add,modify,remove].", $mode));
       return;
     }
@@ -607,7 +607,7 @@ class plugin
     foreach($this->attributes as $name){
 
         // Skip the ones in skip list 
-        if (in_array($name, $skip)) continue;
+        if (in_array_strict($name, $skip)) continue;
         if (!isset($this->attrs[$name]['count'])) continue;
 
         $value= $this->attrs[$name][0];
@@ -982,7 +982,7 @@ class plugin
     // Update 'manager' attributes from gosaDepartment and inetOrgPerson 
     $filter = "(&(objectClass=inetOrgPerson)(manager=".LDAP::prepare4filter(LDAP::fix($src_dn))."))";
     $ocs = $ldap->get_objectclasses();
-    if(isset($ocs['gosaDepartment']['MAY']) && in_array('manager', $ocs['gosaDepartment']['MAY'])){
+    if(isset($ocs['gosaDepartment']['MAY']) && in_array_strict('manager', $ocs['gosaDepartment']['MAY'])){
       $filter = "(|".$filter."(&(objectClass=gosaDepartment)(manager=".LDAP::prepare4filter(LDAP::fix($src_dn)).")))";
     }
     $leaf_deps=  get_list($filter,array("all"),$this->config->current['BASE'], 
@@ -1106,7 +1106,7 @@ class plugin
     if(count($this->objectclasses)){
       $this->is_account = TRUE;
       foreach($this->objectclasses as $class){
-        if(!in_array($class,$source['objectClass'])){
+        if(!in_array_strict($class,$source['objectClass'])){
           $this->is_account = FALSE;
         }
       }
@@ -1480,7 +1480,7 @@ class plugin
   {
     $ret = array();
     foreach($this->attributes as $attr){
-      if(in_array($attr,$this->multi_boxes)){
+      if(in_array_strict($attr,$this->multi_boxes)){
         $ret[$attr] = $this->$attr;
       }
     }
@@ -1585,7 +1585,7 @@ class plugin
    */
   function handle_post_events($mode, $addAttrs= array())
   {
-    if(!in_array($mode, array('add','remove','modify'))){
+    if(!in_array_strict($mode, array('add','remove','modify'))){
       trigger_error(sprintf("Invalid post event type given %s! Valid types are [add,modify,remove].", bold($mode)));
       return;
     }

diff --git a/gosa-core/include/class_releaseSelector.inc b/gosa-core/include/class_releaseSelector.inc
index fe62b530e3f04569c119237a92929c8968091186..3800728e04f274bf277915f14a6e392b012e895d 100644 (file)
--- a/gosa-core/include/class_releaseSelector.inc
+++ b/gosa-core/include/class_releaseSelector.inc
@@ -46,7 +46,7 @@ class releaseSelector {
 
         // Generate instance wide unique ID
         $pid = "";
-        while($pid == "" || in_array($pid, $usedIds)){
+        while($pid == "" || in_array_strict($pid, $usedIds)){
 
             // Wait 1 msec to ensure that we definately get a new id
             if($pid != "") usleep(1);

diff --git a/gosa-core/include/class_remoteObject.inc b/gosa-core/include/class_remoteObject.inc
index 013ed719389f29fa4f30e04387777ecba84473ac..6abc73ae5e181a9b5083e72369a5bf7e88013dd4 100644 (file)
--- a/gosa-core/include/class_remoteObject.inc
+++ b/gosa-core/include/class_remoteObject.inc
@@ -53,13 +53,13 @@ class remoteObject
         // Check if such an attribute is registered
         if(preg_match("/^get_/", $name)){
             $varName = preg_replace("/^get_/","", $name);
-            if(in_array($varName, $this->properties)){
+            if(in_array_strict($varName, $this->properties)){
                 $force = isset($args[0]) && $args[0];
                 return($this->__getProperty($varName, $force));
             } 
         }elseif(preg_match("/^set_/", $name)){
             $varName = preg_replace("/^set_/","", $name);
-            if(in_array($varName, $this->properties)){
+            if(in_array_strict($varName, $this->properties)){
                 return($this->__setProperty($varName, $args[0]));
             }
         }
@@ -73,7 +73,7 @@ class remoteObject
     function __set($varName, $value)
     {
         // Set property value
-        if(in_array($varName, $this->properties)){
+        if(in_array_strict($varName, $this->properties)){
             return($this->__setProperty($varName, $value));
         }
 
@@ -90,7 +90,7 @@ class remoteObject
 
     function __get($varName)
     {
-        if(in_array($varName, $this->properties)){
+        if(in_array_strict($varName, $this->properties)){
             return($this->__getProperty($varName));
         }
 

diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc
index 22d7a18df155707ea590a84e436a23fcc79feb94..df89b48217e8e38d4b139b03233c2458e9789490 100644 (file)
--- a/gosa-core/include/class_sortableListing.inc
+++ b/gosa-core/include/class_sortableListing.inc
@@ -70,7 +70,7 @@ class sortableListing {
 
         // Generate instance wide unique ID
         $id = "";
-        while($id == "" || in_array($id, $usedIds)){
+        while($id == "" || in_array_strict($id, $usedIds)){
 
             // Wait 1 msec to ensure that we definately get a new id
             if($id != "") usleep(1);
@@ -558,7 +558,7 @@ class sortableListing {
     {
         // Only add if not already there
         if (!$key) {
-            if (in_array($entry, $this->data)) {
+            if (in_array_strict($entry, $this->data)) {
                 return;
             }
         } else {

diff --git a/gosa-core/include/class_tabs.inc b/gosa-core/include/class_tabs.inc
index 7affa029d2235b3763948b383256b3a35346f255..7d985ec7ea4c43c8561b667be35e3b4968d1e00e 100644 (file)
--- a/gosa-core/include/class_tabs.inc
+++ b/gosa-core/include/class_tabs.inc
@@ -101,7 +101,7 @@ class tabs
     $baseobject= NULL;
     foreach($this->by_object as $name => $object){
       $class = get_class($object);
-      if(in_array($class,array("reference","acl"))) continue;
+      if(in_array_strict($class,array("reference","acl"))) continue;
       if ($baseobject === NULL){
         $baseobject= new $class($this->config, $this->dn);
         $baseobject->enable_CSN_check();

diff --git a/gosa-core/include/class_userFilter.inc b/gosa-core/include/class_userFilter.inc
index b1ee8224726524993d36f576a5a0143750d94b8a..4cbf99af336388d6822517e6538cd15e7612df3c 100644 (file)
--- a/gosa-core/include/class_userFilter.inc
+++ b/gosa-core/include/class_userFilter.inc
@@ -228,8 +228,8 @@ class userFilter extends plugin
  
         // The filter is visible if it is shared or if is one of our own creations.
         //  ... and enabled.
-        $visible = in_array('enable', $tmp['flags']) && 
-          ($attrs['dn'] == $ui->dn || in_array('share', $tmp['flags']));
+        $visible = in_array_strict('enable', $tmp['flags']) && 
+          ($attrs['dn'] == $ui->dn || in_array_strict('share', $tmp['flags']));
          
         // Add filter if it matches the category list
         if($visible && (count($category) == 0 || array_intersect($category, $tmp['categories']))){ 

diff --git a/gosa-core/include/class_userFilterEditor.inc b/gosa-core/include/class_userFilterEditor.inc
index 5cfc7c073d44f9eb3a823a433131d5bce4ee16a8..cdf62871bb984d04d778597e26a15adffced2a6f 100644 (file)
--- a/gosa-core/include/class_userFilterEditor.inc
+++ b/gosa-core/include/class_userFilterEditor.inc
@@ -42,8 +42,8 @@ class userFilterEditor extends plugin
                 $this->queries[] = $query;
             }
             $this->selectedCategories = $entry['categories'];
-            $this->share = in_array("share",$entry['flags']);
-            $this->enable = in_array("enable",$entry['flags']);
+            $this->share = in_array_strict("share",$entry['flags']);
+            $this->enable = in_array_strict("enable",$entry['flags']);
         }
         $this->orig_name = $this->name;
 

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 1deade4a7c11b3b65e9f2087016370c035d524ef..c7f0d1bf79da1946a2f397f6b33430822dd76bf4 100644 (file)
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -373,7 +373,7 @@ class userinfo
         if(!isset($this->ocMapping[$aclCategory])){
             trigger_error("Invalid ACL category '".$aclCategory."'! ({$object})");
             return("");
-        }elseif(isset($aclClass) && !in_array($aclClass, $this->ocMapping[$aclCategory])){
+        }elseif(isset($aclClass) && !in_array_strict($aclClass, $this->ocMapping[$aclCategory])){
             trigger_error("Invalid ACL class '".$aclClass."'! ({$object})");
             return("");
         }

diff --git a/gosa-core/include/exporter/class_pdfExporter.inc b/gosa-core/include/exporter/class_pdfExporter.inc
index d1c836e79e0296e0db033ac865126d856744bd59..35e8325aa5f15d9b3e56c0e3e5749e939175d221 100644 (file)
--- a/gosa-core/include/exporter/class_pdfExporter.inc
+++ b/gosa-core/include/exporter/class_pdfExporter.inc
@@ -4,7 +4,7 @@
 
 // Load supporter class only if FPDF is loaded
 $classes= get_declared_classes();
-if(in_array('FPDF', $classes)) {
+if(in_array_strict('FPDF', $classes)) {
   include('class_PDF.inc');
 }
 
@@ -141,7 +141,7 @@ class pdfExporter
   {
     // Check if class defined
     $classes= get_declared_classes();
-    if(in_array('FPDF', $classes)) {
+    if(in_array_strict('FPDF', $classes)) {
       return array("exportPDF" => array( "label" => _("PDF"), "image" => "images/lists/pdf.png", "class"=> "pdfExporter", "mime" => "application/pdf", "filename" => "export.pdf" ));
     } else {
       return null;

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index d14308bcb45988897ccb484c7606655a47c14ebe..729d9f08c9d1e95aef6ffda49d179421b302d214 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -591,7 +591,7 @@ function ldap_login_user ($username, $password)
   if($config->get_cfg_value("core","loginAttribute") != ""){
     $tmp = explode(",", $config->get_cfg_value("core","loginAttribute")); 
     foreach($tmp as $attr){
-      if(in_array($attr,$allowed_attributes)){
+      if(in_array_strict($attr,$allowed_attributes)){
         $verify_attr[] = $attr;
       }
     }
@@ -3503,7 +3503,7 @@ function get_next_id_traditional($attrib, $dn)
     $base= get_base_from_hook($dn, $attrib);
   }
   for ($id= $base; $id++; $id < pow(2,32)){
-    if (!in_array($id, $ids)){
+    if (!in_array_strict($id, $ids)){
       return ($id);
     }
   }
@@ -3922,5 +3922,13 @@ function gosa_fopen($filename, $mode)
     }
 }
 
+
+/*\brief    Our own in_array method which defaults to a strict mode.
+ */
+function in_array_strict($needle, $haystack, $strict = TRUE)
+{
+    return(in_array($needle, $haystack, $strict));
+}
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/gosa-core/include/utils/class_tests.inc b/gosa-core/include/utils/class_tests.inc
index 6b2e283a2ac6167972563a6e90d8c5cf24b75d7a..2bfbf0d46afebd3544398cff6be007dbf9898c24 100644 (file)
--- a/gosa-core/include/utils/class_tests.inc
+++ b/gosa-core/include/utils/class_tests.inc
@@ -155,7 +155,7 @@ class tests {
                           "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/","",$ip);
 
                   $mask = preg_replace("/^\//","",$mask);
-                  if((in_array("$mask",$res)) && preg_match("/^[0-9\.]/",$mask)){
+                  if((in_array_strict("$mask",$res)) && preg_match("/^[0-9\.]/",$mask)){
                           return(TRUE);
                   }
           }

diff --git a/gosa-core/include/utils/class_xml.inc b/gosa-core/include/utils/class_xml.inc
index 01d5a4ade3cd0997dc86c2128edda4ad8d24b95d..bb79e33e326444cc5249ae4557be4d459a55171e 100644 (file)
--- a/gosa-core/include/utils/class_xml.inc
+++ b/gosa-core/include/utils/class_xml.inc
@@ -109,7 +109,7 @@ class xml {
         //See tag status and do the needed.
         if($type == "open") {//The starting of the tag '<tag>'
             $parent[$level-1] = &$current;
-            if(!is_array($current) or (!in_array($tag, array_keys($current)))) { //Insert New tag
+            if(!is_array($current) or (!in_array_strict($tag, array_keys($current)))) { //Insert New tag
                 $current[$tag] = $result;
                 if($attributes_data) $current[$tag. '_attr'] = $attributes_data;
                 $repeated_tag_index[$tag.'_'.$level] = 1;

diff --git a/gosa-core/plugins/addons/dyngroup/class_DynamicLdapGroup.inc b/gosa-core/plugins/addons/dyngroup/class_DynamicLdapGroup.inc
index 2c02078f19ddbcb15e9548686ef70c76c33bc9be..60f05865fcbc066a6633567172a1594232260e92 100644 (file)
--- a/gosa-core/plugins/addons/dyngroup/class_DynamicLdapGroup.inc
+++ b/gosa-core/plugins/addons/dyngroup/class_DynamicLdapGroup.inc
@@ -84,7 +84,7 @@ class DynamicLdapGroup extends plugin
             list($base,$attr,$scope,$filter) = preg_split("/\?/",$entry); 
             
             // Ignore entries that do not have a valid scope value (one,base,sub)
-            if(!in_array($scope,array('base','one','sub'))) continue;
+            if(!in_array_strict($scope,array('base','one','sub'))) continue;
 
             // Append parsed uri
             $scope = array_search($scope,$this->scopes);
@@ -117,7 +117,7 @@ class DynamicLdapGroup extends plugin
             // Check for invalid attributes
             if(empty($entry['attr'])){
                 $messages[] = msgPool::required(_("Attribute")." {$nr}");
-            }elseif(in_array(strtolower($entry['attr']), array('objectclass'))){
+            }elseif(in_array_strict(strtolower($entry['attr']), array('objectclass'))){
                 $messages[] = msgPool::reserved(_("Attribute")." {$nr}");
             }
 

diff --git a/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc b/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc
index cba453763cfbbf45b54746bda336a9a49a741b77..b4fc9924ef8a65591bdf4a6bda558e3c3ae674b8 100644 (file)
--- a/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc
+++ b/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc
@@ -131,7 +131,7 @@ class propertyEditor extends management
         // Walk trough all properties and check if we have modified something
         $all = $this->config->configRegistry->getAllProperties();
         foreach($all as $prop){
-            $modified = in_array($prop->getStatus(),array('modified','removed'));
+            $modified = in_array_strict($prop->getStatus(),array('modified','removed'));
             if($modified) break;
         }
        

diff --git a/gosa-core/plugins/admin/departments/class_department.inc b/gosa-core/plugins/admin/departments/class_department.inc
index 99c36aa7d41fe66ceacbbbf9e73ba19554d1ace6..da11d868e14a65c4959818663532caa938791035 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_department.inc
+++ b/gosa-core/plugins/admin/departments/class_department.inc
@@ -137,7 +137,7 @@ class department extends plugin
         // If the 'manager' attribute is present in gosaDepartment allow to manage it.
         $ldap = $this->config->get_ldap_link();
         $ocs = $ldap->get_objectclasses();
-        if(isset($ocs['gosaDepartment']['MAY']) && in_array('manager', $ocs['gosaDepartment']['MAY'])){
+        if(isset($ocs['gosaDepartment']['MAY']) && in_array_strict('manager', $ocs['gosaDepartment']['MAY'])){
             $this->manager_enabled = TRUE;
 
             // Detect the managers name

diff --git a/gosa-core/plugins/admin/groups/class_group.inc b/gosa-core/plugins/admin/groups/class_group.inc
index bf21e508e7c6322ff036e797dc17e0d8073eeee8..cab9e58ff0ef43a7969ac023baf5908cccb7cb00 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_group.inc
+++ b/gosa-core/plugins/admin/groups/class_group.inc
@@ -131,7 +131,7 @@ class group extends plugin
         }
 
         /* Set mail flag */
-        if (isset($this->attrs['objectClass']) && in_array('gosaMailAccount', $this->attrs['objectClass'])){
+        if (isset($this->attrs['objectClass']) && in_array_strict('gosaMailAccount', $this->attrs['objectClass'])){
             $this->has_mailAccount= TRUE;
         }
 
@@ -423,14 +423,14 @@ class group extends plugin
         $smarty->assign("multiple_support",$this->multiple_support_active);
 
         foreach($this->attributes as $val){
-            if(in_array($val,$this->multi_boxes)){
+            if(in_array_strict($val,$this->multi_boxes)){
                 $smarty->assign("use_".$val,TRUE);
             }else{
                 $smarty->assign("use_".$val,FALSE);
             }
         }
         foreach(array("base","smbgroup","groupType","sambaDomainName","fon_group","nagios_group") as $val){
-            if(in_array($val,$this->multi_boxes)){
+            if(in_array_strict($val,$this->multi_boxes)){
                 $smarty->assign("use_".$val,TRUE);
             }else{
                 $smarty->assign("use_".$val,FALSE);
@@ -1135,7 +1135,7 @@ class group extends plugin
         $ret = array_merge($ret,$this->trustModeDialog->get_multi_edit_values());
 
         foreach(array("base","smbgroup","groupType","sambaDomainName","fon_group","nagios_group") as $attr){    
-            if(in_array($attr,$this->multi_boxes)){
+            if(in_array_strict($attr,$this->multi_boxes)){
                 $ret[$attr] = $this->$attr;
             }
         }
@@ -1169,7 +1169,7 @@ class group extends plugin
 
         if (isset($all['memberUid'])){
             for ($i= 0; $i<$all['memberUid']['count']; $i++){
-                if(!in_array($all['memberUid'][$i],$this->memberUid)){
+                if(!in_array_strict($all['memberUid'][$i],$this->memberUid)){
                     $this->memberUid_used_by_some[$all['memberUid'][$i]]= $all['memberUid'][$i];
                 }
             }
@@ -1250,7 +1250,7 @@ class group extends plugin
         }
 
         // Detect samba groups and adapt its values.
-        $this->smbgroup = in_array('sambaGroupMapping', $source['objectClass']);
+        $this->smbgroup = in_array_strict('sambaGroupMapping', $source['objectClass']);
         if ($this->smbgroup) { 
             $this->sambaSID = $this->getSambaSID(); 
         } 
@@ -1286,7 +1286,7 @@ class group extends plugin
 
         /* Update groupMembership, keep optinal group */
         foreach($attrs['memberUid_used_by_some'] as $uid){
-            if(in_array($uid,$this->memberUid)){
+            if(in_array_strict($uid,$this->memberUid)){
                 $users[$uid] = $uid;
             }
         }

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index b4e75fccbab7d07519ad52b4121bbecd1e048918..c68ac83f4794400b9ef91abd7e136b2624b591c0 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -491,7 +491,7 @@ class ogroup extends plugin
                     /* Skip workstations which are already assigned to an object group.
                      */
                     if ($this->gosaGroupObjects == "[W]" || $this->gosaGroupObjects == "[T]"){
-                        if(in_array($attrs['dn'],$this->used_workstations)){
+                        if(in_array_strict($attrs['dn'],$this->used_workstations)){
                             continue;
                         }
                     }
@@ -596,7 +596,7 @@ class ogroup extends plugin
         $type= "I";
 
         foreach($this->typeToClass as $index => $class){
-            if (in_array($class, $attrs['objectClass'])){
+            if (in_array_strict($class, $attrs['objectClass'])){
                 $type= $index;
                 break;
             }
@@ -609,7 +609,7 @@ class ogroup extends plugin
     {
         /* Person? */
         $name =""; 
-        if (in_array('gosaAccount', $attrs['objectClass'])){
+        if (in_array_strict('gosaAccount', $attrs['objectClass'])){
             if(isset($attrs['sn']) && isset($attrs['givenName'])){
                 $name= $attrs['sn'][0].", ".$attrs['givenName'][0];
             } else {

diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/class_objectSelect.inc b/gosa-core/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
index b25311e133b3d8a39f40492bec848527052918c2..03a6d1bec85218ce73f47b5ebb0aa6cd68f5d8d3 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
+++ b/gosa-core/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
@@ -71,7 +71,7 @@ class objectSelect extends management
     static function filterDepLabel($row,$dn,$pid,$base,$objectClass, $cn)
     {
         $cn = $cn[0];
-        if(!in_array('gosaDepartment', $objectClass)){
+        if(!in_array_strict('gosaDepartment', $objectClass)){
             return($cn);
         }
         if($dn == $base){

diff --git a/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc b/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
index df5694788e89b0b5d7995922e4b97f3412b9324e..c285290fee4a29641930efdcfd23095bc9c6ab45 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
@@ -63,7 +63,7 @@ class ogrouptabs extends tabs
                 if(isset($this->by_object['ogroup']->objcache[$dn])){
                     $obj = $this->by_object['ogroup']->objcache[$dn];
                     if(isset($obj['objectClass'])){
-                        if(in_array("goFonAccount",$obj['objectClass'])){
+                        if(in_array_strict("goFonAccount",$obj['objectClass'])){
                             $usePhoneTab = true;
                         }
                     }
@@ -135,7 +135,7 @@ class ogrouptabs extends tabs
                     if(isset($this->by_object['ogroup']->objcache[$dn])){
                         $obj = $this->by_object['ogroup']->objcache[$dn];
                         if(isset($obj['objectClass'])){
-                            if(in_array("goFonAccount",$obj['objectClass'])){
+                            if(in_array_strict("goFonAccount",$obj['objectClass'])){
                                 $this->by_name['phonequeue']= _("Phone queue");
                                 $this->by_object['phonequeue']= new phonequeue($this->config, $this->dn);
                                 $this->by_object['phonequeue']->parent= &$this;

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 2d27f7c4f50c7a51662ddec92b8a73ea1d7c3e3b..a51a5c21fbdecd1264d9dc1635f9f42ef1d4f863 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -274,8 +274,8 @@ class userManagement extends management
             $ldap->cat($this->dn);
             $attrs = $ldap->fetch();
             $this->passwordChangeForceable = 
-                    in_array('sambaAccount', $attrs['objectClass']) || 
-                    (in_array('posixAccount', $attrs['objectClass']) && isset($attrs['shadowMax']));
+                    in_array_strict('sambaAccount', $attrs['objectClass']) || 
+                    (in_array_strict('posixAccount', $attrs['objectClass']) && isset($attrs['shadowMax']));
             $smarty->assign("passwordChangeForceable" , $this->passwordChangeForceable);
             $smarty->assign("enforcePasswordChange" , $this->enforcePasswordChange);
 
@@ -363,8 +363,8 @@ class userManagement extends management
                     $ldap->cd($this->config->current['BASE']);
                     $ldap->cat($this->dn);
                     $attrs = $ldap->fetch();
-                    $samba = in_array('sambaSamAccount', $attrs['objectClass']);
-                    $posix = in_array('posixAccount', $attrs['objectClass']);
+                    $samba = in_array_strict('sambaSamAccount', $attrs['objectClass']);
+                    $posix = in_array_strict('posixAccount', $attrs['objectClass']);
 
                     // Update the posix shadow flag...
                     if($posix){

diff --git a/gosa-core/plugins/generic/dashBoard/class_rssReader.inc b/gosa-core/plugins/generic/dashBoard/class_rssReader.inc
index 4e3d0976dfe49aae785c9687b7ce48a306254b25..eeedcef69180ac34bda140a772c749e8c2fe2695 100644 (file)
--- a/gosa-core/plugins/generic/dashBoard/class_rssReader.inc
+++ b/gosa-core/plugins/generic/dashBoard/class_rssReader.inc
@@ -73,7 +73,7 @@ class rssReader{
     {
 
         // Do not try to sort for invalid attributes.
-        if(!in_array($sortBy, self::$attributes)){
+        if(!in_array_strict($sortBy, self::$attributes)){
             trigger_error("Invalid sortby attribute '{$sortBy}'!");
             return($feedRes);
         }

diff --git a/gosa-core/plugins/generic/infoPage/class_infoPage.inc b/gosa-core/plugins/generic/infoPage/class_infoPage.inc
index d4f158e9e1711a89bb73fc56720c0695989e0dfe..b42c67e63b7ee22da7ef337a1ca192db56c8d46f 100644 (file)
--- a/gosa-core/plugins/generic/infoPage/class_infoPage.inc
+++ b/gosa-core/plugins/generic/infoPage/class_infoPage.inc
@@ -57,7 +57,7 @@ class infoPage extends plugin
     function checkAccess($class)
     {
         foreach($this->ui->ocMapping as $cat => $aclClasses){
-            if(in_array($class, $aclClasses)){
+            if(in_array_strict($class, $aclClasses)){
                 if(preg_match('/[rw]/',$this->ui->get_permissions($this->ui->dn, "{$cat}/{$class}", ''))){
                     return(TRUE);
                 }

diff --git a/gosa-core/plugins/generic/references/class_aclResolver.inc b/gosa-core/plugins/generic/references/class_aclResolver.inc
index 22d76e176f15159c76232476114329b163dfd822..f1526468cc14fc0fc81150070c096cd20b859521 100644 (file)
--- a/gosa-core/plugins/generic/references/class_aclResolver.inc
+++ b/gosa-core/plugins/generic/references/class_aclResolver.inc
@@ -252,7 +252,7 @@ class aclResolver
                                 $ldap->cat($gdn,array('memberUid'));
                                 if($ldap->count()){
                                     $attrs = $ldap->fetch();
-                                    if(isset($attrs['memberUid']) && in_array($this->validateUid, $attrs['memberUid'])){
+                                    if(isset($attrs['memberUid']) && in_array_strict($this->validateUid, $attrs['memberUid'])){
                                         $found = TRUE;
                                         $groups[] = $name;
                                         continue;

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_actionSelectChart.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_actionSelectChart.inc
index e78ff90d294b2f4ed30da6ee6b5e4b635cd363f5..f77ae3732ffecd72e448fce5af35ed48e005804a 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_actionSelectChart.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_actionSelectChart.inc
@@ -34,7 +34,7 @@ class actionSelectChart extends statChart
             $dataBase = $gData['actionTypeGraph'][$this->current_action];
 
             foreach($dataBase as $category => $entriesPerDate){
-                if(empty($category) || in_array($category, $this->skipSeries)) continue;
+                if(empty($category) || in_array_strict($category, $this->skipSeries)) continue;
 
                 // Add results to our data set.
                 $dataSet->AddPoint($entriesPerDate, $category);

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_categoryActionOverTime.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_categoryActionOverTime.inc
index 99703a56a08ffe6c6f2c854d287feaf25060a666..236e133c865ed5e871a9f8253a179c8592b7f417 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_categoryActionOverTime.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_categoryActionOverTime.inc
@@ -21,7 +21,7 @@ class categoryActionsOverTime extends statChart
         $dataSet = new pData;  
         $seriesCnt = 0;
         foreach($gData['actionsGraph'] as $category => $entriesPerDate){
-            if(empty($category) || in_array($category, $this->skipSeries)) continue;
+            if(empty($category) || in_array_strict($category, $this->skipSeries)) continue;
 
             // Add results to our data set.
             $dataSet->AddPoint($entriesPerDate, $category);
@@ -44,7 +44,7 @@ class categoryActionsOverTime extends statChart
 
         // Create a dataSet containing all series 
         $allSeriesDataSet = clone $dataSet;
-        if(!in_array('errorsPerInterval', $this->skipSeries)){
+        if(!in_array_strict('errorsPerInterval', $this->skipSeries)){
             $allSeriesDataSet->AddPoint($gData['errorsPerInterval'], 'Errors');
             $allSeriesDataSet->SetSerieName(_('Error'), 'Errors');
             $allSeriesDataSet->AddSerie('Errors');
@@ -86,7 +86,7 @@ class categoryActionsOverTime extends statChart
         // Do we've to add the errors series?
         // If we have to, then add the error-data-series.
         //  and set the color for the new error-series to red.
-        if(!in_array('errorsPerInterval', $this->skipSeries)){
+        if(!in_array_strict('errorsPerInterval', $this->skipSeries)){
 
             // Set the color for the error Series to 'red'. 
             // This has to be done before drawing the legend.
@@ -101,7 +101,7 @@ class categoryActionsOverTime extends statChart
 
         // Draw the error graph on top of the other graphs now.
         // But remove the category-graph before. 
-        if(!in_array('errorsPerInterval', $this->skipSeries)){
+        if(!in_array_strict('errorsPerInterval', $this->skipSeries)){
 
             // Remove all graph series and add the error-series, then draw the new graph.
             // (It is not relevant if it was really added before, so we simply remove all series!)

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_objectCountChart.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_objectCountChart.inc
index 4c5a2f55948da394ed66fb8e2ed28987f4042deb..bf62fe4993cc8ad77f3e6a6dff6c0067abeab609 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_objectCountChart.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_objectCountChart.inc
@@ -21,7 +21,7 @@ class objectCountChart extends statChart
         $seriesCnt = 0;
 
         foreach($gData['objectCountPerInterval'] as $category => $count){
-            if(empty($category) || in_array($category, $this->skipSeries)) continue;
+            if(empty($category) || in_array_strict($category, $this->skipSeries)) continue;
 
             // Add results to our data set.
             $dataSet->AddPoint($count, $category);

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_passwordChangeChart.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_passwordChangeChart.inc
index a2fb8d93f323a2efd56eeffb50e3f885a6451d48..ddcfc48e83c05d1b4b4b1a02403706da553007ed 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_passwordChangeChart.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_passwordChangeChart.inc
@@ -24,7 +24,7 @@ class passwordChangeChart extends statChart
         $dataBase = $gData['usedPasswordHashes'];
     
         foreach($dataBase as $category => $entriesPerDate){
-            if(empty($category) || in_array($category, $this->skipSeries)) continue;
+            if(empty($category) || in_array_strict($category, $this->skipSeries)) continue;
 
             // Add results to our data set.
             $dataSet->AddPoint($entriesPerDate, $category);

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_statChart.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_statChart.inc
index 7b5046506ec8aaf853da590378a3a78d97251c9d..32fd19db3db50ed2a8e56b01d6b85152b78fbef6 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_statChart.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_statChart.inc
@@ -104,7 +104,7 @@ class statChart{
         $str = "<input type='hidden' name='{$this->graphName}_posted' value='1'>";
         $list = $this->getSeriesList();
         foreach($list as $key => $item){
-            $checked = (in_array($key, $this->skipSeries))? '': 'checked';
+            $checked = (in_array_strict($key, $this->skipSeries))? '': 'checked';
             $str .= "<span style='padding-right:20px'>".
                     "   <input id='addSeries_{$this->graphName}_{$key}' type='checkbox' ".
                     "       name='addSeries_{$this->graphName}_{$key}' value='1'".

diff --git a/gosa-core/plugins/generic/statistics/class_statistics.inc b/gosa-core/plugins/generic/statistics/class_statistics.inc
index aaedbbee13238dec2f9c85281e53932b487179bb..a74335c38c94745b37c9d7d335c88f69ae1e15b3 100644 (file)
--- a/gosa-core/plugins/generic/statistics/class_statistics.inc
+++ b/gosa-core/plugins/generic/statistics/class_statistics.inc
@@ -366,12 +366,12 @@ class statistics extends plugin
         $gData['objectCountPerInterval'] = array(); 
         foreach($res['objectCountPerInterval'] as $category => $data){
             if(empty($category)) continue;
-            if(in_array($category,$mapSystems)){
+            if(in_array_strict($category,$mapSystems)){
                 $category = 'systems';
             }
 
             // Skip series which are not interesting for us
-            if(!in_array($category,array('users','groups','department','systems','ogroups','fai'))){
+            if(!in_array_strict($category,array('users','groups','department','systems','ogroups','fai'))){
                 $category = 'remaining';
             }
 

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index e2c45e168778c7e01797ded55b12dc45097ec8ff..da5180054daee2081c0b2ace8e55b483fd594e40 100644 (file)
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -629,14 +629,14 @@ class user extends plugin
     $ui =get_userinfo();
     foreach($this->attributes as $val){
       $smarty->assign("$val", set_post($this->$val));
-      if(in_array($val,$this->multi_boxes)){
+      if(in_array_strict($val,$this->multi_boxes)){
         $smarty->assign("use_".$val,TRUE);
       }else{
         $smarty->assign("use_".$val,FALSE);
       }
     }
     foreach(array("base","pw_storage","edit_picture") as $val){
-      if(in_array($val,$this->multi_boxes)){
+      if(in_array_strict($val,$this->multi_boxes)){
         $smarty->assign("use_".$val,TRUE);
       }else{
         $smarty->assign("use_".$val,FALSE);
@@ -753,7 +753,7 @@ class user extends plugin
     // Update 'manager' attributes from gosaDepartment and inetOrgPerson
     $filter = "(&(objectClass=inetOrgPerson)(manager=".LDAP::prepare4filter($this->dn)."))";
     $ocs = $ldap->get_objectclasses();
-    if(isset($ocs['gosaDepartment']['MAY']) && in_array('manager', $ocs['gosaDepartment']['MAY'])){
+    if(isset($ocs['gosaDepartment']['MAY']) && in_array_strict('manager', $ocs['gosaDepartment']['MAY'])){
       $filter = "(|".$filter."(&(objectClass=gosaDepartment)(manager=".LDAP::prepare4filter($this->dn).")))";
     }
     $leaf_deps=  get_list($filter,array("all"),$this->config->current['BASE'],
@@ -1387,7 +1387,7 @@ class user extends plugin
       return(FALSE);
     }else{
 
-      if(in_array("pw_storage",$this->multi_boxes)){
+      if(in_array_strict("pw_storage",$this->multi_boxes)){
         return(TRUE);
       }
       return($this->pw_storage != $this->last_pw_storage && !$this->is_template);
@@ -1509,7 +1509,7 @@ class user extends plugin
       /* Walk through govattrs */
       foreach ($this->govattrs as $val){
 
-        if (in_array($val, $skip)){
+        if (in_array_strict($val, $skip)){
           continue;
         }
 
@@ -1755,10 +1755,10 @@ class user extends plugin
   function get_multi_edit_values()
   {
     $ret = plugin::get_multi_edit_values();
-    if(in_array("pw_storage",$this->multi_boxes)){
+    if(in_array_strict("pw_storage",$this->multi_boxes)){
       $ret['pw_storage'] = $this->pw_storage;
     }
-    if(in_array("edit_picture",$this->multi_boxes)){
+    if(in_array_strict("edit_picture",$this->multi_boxes)){
       $ret['jpegPhoto'] = $this->jpegPhoto;
       $ret['photoData'] = $this->photoData;
       $ret['old_jpegPhoto'] = $this->old_jpegPhoto;
@@ -1771,7 +1771,7 @@ class user extends plugin
       unset($ret['cn']);
     }
     $ret['is_modified'] = $this->is_modified;
-    if(in_array("base",$this->multi_boxes)){
+    if(in_array_strict("base",$this->multi_boxes)){
       $ret['orig_base']="Changed_by_Multi_Plug";
       $ret['base']=$this->base;
     }
@@ -1838,25 +1838,25 @@ class user extends plugin
     if($this->dn == "new") {
       $this->set_acl_base($this->base);
     }
-    if (!tests::is_url($this->labeledURI) && in_array("labeledURI",$this->multi_boxes)){
+    if (!tests::is_url($this->labeledURI) && in_array_strict("labeledURI",$this->multi_boxes)){
       $message[]= msgPool::invalid(_("Homepage"));
     }
-    if (!tests::is_phone_nr($this->telephoneNumber) && in_array("telephoneNumber",$this->multi_boxes)){
+    if (!tests::is_phone_nr($this->telephoneNumber) && in_array_strict("telephoneNumber",$this->multi_boxes)){
       $message[]= msgPool::invalid(_("Phone"), $this->telephoneNumber, "/[\/0-9 ()+*-]/");
     }
-    if (!tests::is_phone_nr($this->facsimileTelephoneNumber) &&  in_array("facsimileTelephoneNumber",$this->multi_boxes)){
+    if (!tests::is_phone_nr($this->facsimileTelephoneNumber) &&  in_array_strict("facsimileTelephoneNumber",$this->multi_boxes)){
       $message[]= msgPool::invalid(_("Fax"), $this->facsimileTelephoneNumber, "/[\/0-9 ()+*-]/");
     }
-    if (!tests::is_phone_nr($this->mobile) && in_array("mobile",$this->multi_boxes)){
+    if (!tests::is_phone_nr($this->mobile) && in_array_strict("mobile",$this->multi_boxes)){
       $message[]= msgPool::invalid(_("Mobile"), $this->mobile, "/[\/0-9 ()+*-]/");
     }
-    if (!tests::is_phone_nr($this->pager) && in_array("pager",$this->multi_boxes)){
+    if (!tests::is_phone_nr($this->pager) && in_array_strict("pager",$this->multi_boxes)){
       $message[]= msgPool::invalid(_("Pager"), $this->pager, "/[\/0-9 ()+*-]/");
     }
-    if (preg_match ('/[,+"?\'()=<>;\\\\]/', $this->givenName) && in_array("givenName",$this->multi_boxes)){
+    if (preg_match ('/[,+"?\'()=<>;\\\\]/', $this->givenName) && in_array_strict("givenName",$this->multi_boxes)){
       $message[]= msgPool::invalid(_("Given name"), $this->giveName, '/[^,+"?\'()=<>;\\\\]/');
     }
-    if (preg_match ('/[,+"?\'()=<>;\\\\]/', $this->sn) && in_array("sn",$this->multi_boxes)){
+    if (preg_match ('/[,+"?\'()=<>;\\\\]/', $this->sn) && in_array_strict("sn",$this->multi_boxes)){
       $message[]= msgPool::invalid(_("Name"), $this->sn, '/[^,+"?\'()=<>;\\\\]/');
     }
     return($message);
@@ -1922,7 +1922,7 @@ class user extends plugin
 
     // Update loginRestrictions, keep my settings while ip is optional
     foreach($attrs['gosaLoginRestriction_some'] as $ip){
-      if(in_array($ip, $this->gosaLoginRestriction) && in_array($ip, $attrs['gosaLoginRestriction'])){
+      if(in_array_strict($ip, $this->gosaLoginRestriction) && in_array_strict($ip, $attrs['gosaLoginRestriction'])){
         $lR[] = $ip;
       }
     }
@@ -1945,7 +1945,7 @@ class user extends plugin
     $data = array();
     foreach($all as $ip){
       $data['data'][] = $ip;
-      if(!in_array($ip, $this->gosaLoginRestriction)){
+      if(!in_array_strict($ip, $this->gosaLoginRestriction)){
         $data['displayData'][] = array('mode' => LIST_MARKED , 'data' => array($ip.' ('._("Entries differ").')'));
       }else{
         $data['displayData'][] = array('mode' => 0 , 'data' => array($ip));

diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 9e4adc8b53d128a9db020cf053304a2b16110eeb..88b1c132d08449faa8cbf3c422d229c635acfa7f 100644 (file)
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -128,7 +128,7 @@ class posixAccount extends plugin
 
       /* Correct is_account. shadowAccount is not required. */
       if (isset($this->attrs['objectClass']) &&
-          in_array ('posixAccount', $this->attrs['objectClass'])){
+          in_array_strict('posixAccount', $this->attrs['objectClass'])){
 
         $this->is_account= TRUE;
       }
@@ -217,7 +217,7 @@ class posixAccount extends plugin
     }
 
     /* Insert possibly missing loginShell */
-    if ($this->loginShell != "" && !in_array($this->loginShell, $this->loginShellList)){
+    if ($this->loginShell != "" && !in_array_strict($this->loginShell, $this->loginShellList)){
       $this->loginShellList[]= $this->loginShell;
     }
 
@@ -452,7 +452,7 @@ class posixAccount extends plugin
     $smarty->assign("force_idsACL", $this->getacl("uidNumber").$this->getacl("gidNumber"));
 
     foreach(array("primaryGroup","activate_shadowWarning","activate_shadowInactive","activate_shadowMin","activate_shadowMax","activate_shadowExpire","mustchangepassword") as $val){
-      if(in_array($val,$this->multi_boxes)){
+      if(in_array_strict($val,$this->multi_boxes)){
         $smarty->assign("use_".$val,TRUE);
       }else{
         $smarty->assign("use_".$val,FALSE);
@@ -462,7 +462,7 @@ class posixAccount extends plugin
 
     /* Load attributes and acl's */
     foreach($this->attributes as $val){
-      if(in_array($val,$this->multi_boxes)){
+      if(in_array_strict($val,$this->multi_boxes)){
         $smarty->assign("use_".$val,TRUE);
       }else{
         $smarty->assign("use_".$val,FALSE);
@@ -932,47 +932,47 @@ class posixAccount extends plugin
   function multiple_check()
   {
     $message = plugin::multiple_check();
-    if ($this->homeDirectory == "" && in_array("homeDirectory",$this->multi_boxes)){
+    if ($this->homeDirectory == "" && in_array_strict("homeDirectory",$this->multi_boxes)){
       $message[]= msgPool::required(_("Home directory"));
     }
-    if (!tests::is_path($this->homeDirectory) && in_array("homeDirectory",$this->multi_boxes)){
+    if (!tests::is_path($this->homeDirectory) && in_array_strict("homeDirectory",$this->multi_boxes)){
       $message[]= msgPool::invalid(_("Home directory"), "", "", "/home/yourname" );
     }
 
     /* Check shadow settings, well I like spaghetties... */
-    if ($this->activate_shadowMin && in_array("activate_shadowMin",$this->multi_boxes)){
+    if ($this->activate_shadowMin && in_array_strict("activate_shadowMin",$this->multi_boxes)){
       if (!tests::is_id($this->shadowMin)){
         $message[]= msgPool::invalid(_("shadowMin"), $this->shadowMin, "/[0-9]/");
       }
     }
-    if ($this->activate_shadowMax && in_array("activate_shadowMax",$this->multi_boxes)){
+    if ($this->activate_shadowMax && in_array_strict("activate_shadowMax",$this->multi_boxes)){
       if (!tests::is_id($this->shadowMax)){
         $message[]= msgPool::invalid(_("shadowMax"), $this->shadowMax, "/[0-9]/");
       }
     }
-    if ($this->activate_shadowWarning && in_array("activate_shadowWarning",$this->multi_boxes)){
+    if ($this->activate_shadowWarning && in_array_strict("activate_shadowWarning",$this->multi_boxes)){
       if (!tests::is_id($this->shadowWarning)){
         $message[]= msgPool::invalid(_("shadowWarning"), $this->shadowWarning, "/[0-9]/");
       }
-      if (!$this->activate_shadowMax && in_array("activate_shadowMax",$this->multi_boxes)){
+      if (!$this->activate_shadowMax && in_array_strict("activate_shadowMax",$this->multi_boxes)){
         $message[]= msgPool::depends("shadowWarning", "shadowMax");
       }
-      if ($this->shadowWarning > $this->shadowMax && in_array("activate_shadowWarning",$this->multi_boxes)){
+      if ($this->shadowWarning > $this->shadowMax && in_array_strict("activate_shadowWarning",$this->multi_boxes)){
         $message[]= msgPool::toobig("shadowWarning", "shadowMax");
       }
-      if ($this->activate_shadowMin && $this->shadowWarning < $this->shadowMin && in_array("activate_shadowMin",$this->multi_boxes)){
+      if ($this->activate_shadowMin && $this->shadowWarning < $this->shadowMin && in_array_strict("activate_shadowMin",$this->multi_boxes)){
         $message[]= msgPool::tosmall("shadowWarning", "shadowMin");
       }
     }
-    if ($this->activate_shadowInactive && in_array("activate_shadowInactive",$this->multi_boxes)){
+    if ($this->activate_shadowInactive && in_array_strict("activate_shadowInactive",$this->multi_boxes)){
       if (!tests::is_id($this->shadowInactive)){
         $message[]= msgPool::invalid(_("shadowInactive"), $this->shadowInactive, "/[0-9]/");
       }
-      if (!$this->activate_shadowMax && in_array("activate_shadowMax",$this->multi_boxes)){
+      if (!$this->activate_shadowMax && in_array_strict("activate_shadowMax",$this->multi_boxes)){
         $message[]= msgPool::depends("shadowInactive", "shadowMax");
       }
     }
-    if ($this->activate_shadowMin && $this->activate_shadowMax && in_array("activate_shadowMin",$this->multi_boxes)){
+    if ($this->activate_shadowMin && $this->activate_shadowMax && in_array_strict("activate_shadowMin",$this->multi_boxes)){
       if ($this->shadowMin > $this->shadowMax){
         $message[]= msgPool::toobig("shadowMin", "shadowMax");
       }
@@ -1333,17 +1333,17 @@ class posixAccount extends plugin
     $ret['groupMembership']     = $this->groupMembership;
     $ret['groupMembership_some']= $this->groupMembership_some;
 
-    if(in_array("primaryGroup",$this->multi_boxes)){
+    if(in_array_strict("primaryGroup",$this->multi_boxes)){
       $ret['primaryGroup'] = $this->primaryGroup;
     }
     foreach(array("shadowWarning","shadowInactive","shadowMin","shadowMax", "shadowExpire") as $entry){
       $active = "activate_".$entry;
-      if(in_array($active,$this->multi_boxes)){
+      if(in_array_strict($active,$this->multi_boxes)){
         $ret[$entry] = $this->$entry;
         $ret[$active] = $this->$active;
       }
     }
-    if(in_array("mustchangepassword",$this->multi_boxes)){
+    if(in_array_strict("mustchangepassword",$this->multi_boxes)){
       $ret['mustchangepassword'] = $this->mustchangepassword;
     }
     return($ret);
@@ -1375,7 +1375,7 @@ class posixAccount extends plugin
       foreach(array("shadowMin","shadowMax","shadowExpire","shadowInactive","shadowWarning") as $var) {
         if($this->acl_is_writeable($var)){
           $activate_var = "activate_".$var;
-          if(in_array($activate_var, $this->multi_boxes)){
+          if(in_array_strict($activate_var, $this->multi_boxes)){
             if(isset($_POST['activate_'.$var])){
               $this->$activate_var  = true;
               $this->$var      = get_post($var);
@@ -1388,7 +1388,7 @@ class posixAccount extends plugin
       }
 
       /* Restore shadow value, if the shadow attribute isn't used */
-      if(!in_array("activate_shadowExpire",$this->multi_boxes)){
+      if(!in_array_strict("activate_shadowExpire",$this->multi_boxes)){
         $this->shadowExpire = $expire_tmp;
       }
 
@@ -1447,7 +1447,7 @@ class posixAccount extends plugin
     $groups_all = $groups_some;
     foreach($groups_all as $id => $group){
       foreach($uids as $uid){
-        if(!in_array($uid,$groups_uid[$id])){
+        if(!in_array_strict($uid,$groups_uid[$id])){
           unset($groups_all[$id]);
           break;
         }

diff --git a/gosa-core/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc b/gosa-core/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
index b78f2b2871be4d7f4043df69f3c9d79a91455465..2454e522624879650a6af11fb9e2feae551a235c 100644 (file)
--- a/gosa-core/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
+++ b/gosa-core/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
@@ -18,7 +18,7 @@ class filterLDAPBlacklist {
             if(isset($entry[$attr_name])){
               $test = $entry[$attr_name];
               if(!is_array($test)) $test = array($test);
-              if(in_array($match, $test)) unset($entries[$id]);
+              if(in_array_strict($match, $test)) unset($entries[$id]);
             }
           }
         }

diff --git a/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc b/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc
index 35ca9921c1b06e3a9fb0cc6974d9957579899755..9098913142a0583533a1f97e7f87f90e6c49ac6c 100644 (file)
--- a/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc
+++ b/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc
@@ -78,11 +78,11 @@ class trustModeDialog extends plugin
         if($ldap->count() != 0){
             $attrs = $ldap->fetch();
             $img = $desc = "";
-            if(in_array("gotoWorkstation",$attrs['objectClass'])){
+            if(in_array_strict("gotoWorkstation",$attrs['objectClass'])){
                 $img = image('plugins/systems/images/select_workstation.png'); 
-            }elseif(in_array("gotoTerminal",$attrs['objectClass'])){
+            }elseif(in_array_strict("gotoTerminal",$attrs['objectClass'])){
                 $img = image('plugins/systems/images/select_terminal.png'); 
-            }elseif(in_array("goServer",$attrs['objectClass'])){
+            }elseif(in_array_strict("goServer",$attrs['objectClass'])){
                 $img = image('plugins/systems/images/select_server.png'); 
             }
             if(isset($attrs['description'][0])) {
@@ -180,7 +180,7 @@ class trustModeDialog extends plugin
             $smarty->assign("emptyArrAccess",false);
 
 
-        $smarty->assign($smarty->assign("use_trustmode",in_array("trustmode", $this->multi_boxes)));
+        $smarty->assign($smarty->assign("use_trustmode",in_array_strict("trustmode", $this->multi_boxes)));
         $smarty->assign("multiple_support" , $this->multiple_support_active);
 #        $this->trustList->update();
         $smarty->assign("trustList", $this->trustList->render());
@@ -258,7 +258,7 @@ class trustModeDialog extends plugin
     public function get_multi_edit_values()
     {
         $ret = plugin::get_multi_edit_values();
-        if(in_array("trustmode",$this->multi_boxes)){
+        if(in_array_strict("trustmode",$this->multi_boxes)){
             $ret['trustModel'] = $this->trustModel;
             $ret['accessTo'] = $this->accessTo;
         }

diff --git a/gosa-core/setup/class_setupStep_Ldap.inc b/gosa-core/setup/class_setupStep_Ldap.inc
index cf0370712e984f5aea7eb22cce501a60d9e06a5e..12454831bd3a0b71cd3cd43df001084f8ba2b80a 100644 (file)
--- a/gosa-core/setup/class_setupStep_Ldap.inc
+++ b/gosa-core/setup/class_setupStep_Ldap.inc
@@ -151,7 +151,7 @@ class Step_Ldap extends setup_step
     $reset = FALSE;
     foreach($this->attributes as $attr){
       if(isset($_POST[$attr])){
-        if(in_array($attr,array("base","connection")) && $this->$attr != get_post($attr)){
+        if(in_array_strict($attr,array("base","connection")) && $this->$attr != get_post($attr)){
           $reset = TRUE;
         }
         $this->$attr = get_post($attr);
@@ -161,7 +161,7 @@ class Step_Ldap extends setup_step
     if($reset){
       $this->parent->disable_steps_from(($this->parent->step_name_to_id(get_class($this))) +1);
       $attr = @LDAP::get_naming_contexts($this->connection);
-      if(is_array($attr) && !in_array(get_post("base"),$attr)){
+      if(is_array($attr) && !in_array_strict(get_post("base"),$attr)){
         if(isset($attr[0])){
           $this->base = $attr[0];
         }

diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index 84360939770a737ce0ad790f1d9d08abca7d9a89..cceda31c8dcf578e4008dd14a2697c04e7eefe46 100644 (file)
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -715,7 +715,7 @@ class Step_Migrate extends setup_step
 
         /* Root object doesn't exists 
          */
-        if(!in_array("gosaDepartment",$attrs['objectClass'])){
+        if(!in_array_strict("gosaDepartment",$attrs['objectClass'])){
             if($just_check){
 
                 $this->rootOC_details = array();       
@@ -737,7 +737,7 @@ class Step_Migrate extends setup_step
                 $dep_types = departmentManagement::get_support_departments();
                 $dep_type ="";
                 foreach($dep_types as $dep_name => $dep_class){
-                    if(in_array($dep_class['CLASS'], $attrs['objectClass'])){
+                    if(in_array_strict($dep_class['CLASS'], $attrs['objectClass'])){
                         $dep_type = $dep_name;
                         break;
                     }

diff --git a/gosa-core/setup/class_setupStep_Schema.inc b/gosa-core/setup/class_setupStep_Schema.inc
index b58b9013705bc3c041af15b2153c0a4228efac2f..eb3b9473122bda14f991d2251bf89ca56cfe9e10 100644 (file)
--- a/gosa-core/setup/class_setupStep_Schema.inc
+++ b/gosa-core/setup/class_setupStep_Schema.inc
@@ -76,7 +76,7 @@ class Step_Schema extends setup_step
         $this->is_completed = count($objectclasses);
 
         // Now check if the core requirements are fulfilled.
-        if(in_array('core', $disabled)){
+        if(in_array_strict('core', $disabled)){
             $message = "";
             $this->is_completed = FALSE;
             $coreDefs = core::plInfo();