Updated in_array checks in GOsa.

[gosa.git] / gosa-core / setup / class_setupStep_Migrate.inc

diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index 2dc73858609dcc35ab56dae780f2f829dd27c382..cceda31c8dcf578e4008dd14a2697c04e7eefe46 100644 (file)
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -131,7 +131,7 @@ class Step_Migrate extends setup_step
             $this->checks['permissions']['STATUS']    = FALSE;
             $this->checks['permissions']['STATUS_MSG']= _("Failed");
             $this->checks['permissions']['ERROR_MSG'] = 
-                sprintf(_("The specified user '%s' does not have full access to your ldap database."),$cv['admin']);
+                sprintf(_("The specified user '%s' does not have full access to your LDAP database."),$cv['admin']);
             return(false);
         }
 
@@ -144,13 +144,13 @@ class Step_Migrate extends setup_step
             $this->checks['permissions']['STATUS']    = FALSE;
             $this->checks['permissions']['STATUS_MSG']= _("Failed");
             $this->checks['permissions']['ERROR_MSG'] = 
-                sprintf(_("The specified user '%s' does not have full access to your ldap database."),$cv['admin']);
+                sprintf(_("The specified user '%s' does not have full access to your LDAP database."),$cv['admin']);
             return(false);
         }
 
         /* Create & remove of dummy object was successful */
         $this->checks['permissions']['STATUS']    = TRUE;
-        $this->checks['permissions']['STATUS_MSG']= _("Ok");
+        $this->checks['permissions']['STATUS_MSG']= _("OK");
         $this->checks['permissions']['ERROR_MSG'] = "";
         return(true);
     } 
@@ -300,7 +300,7 @@ class Step_Migrate extends setup_step
                     $str.= "<b>"._("Groups")."</b>:&nbsp;".trim($valid_groups,", ")."<br>";
                 }
                 $this->checks['acls']['STATUS']    = TRUE;
-                $this->checks['acls']['STATUS_MSG']= _("Ok");
+                $this->checks['acls']['STATUS_MSG']= _("OK");
                 $this->checks['acls']['ERROR_MSG'] = $str;
             }else{
                 $this->checks['acls']['STATUS']    = FALSE;
@@ -412,7 +412,7 @@ class Step_Migrate extends setup_step
         $ldap->cd($cv['base']);
         $ldap->search("(uid=".$uid.")");
         if($ldap->count()){
-            msg_dialog::display(_("Input error"),msgPool::duplicated(_("Uid")), ERROR_DIALOG);
+            msg_dialog::display(_("Input error"),msgPool::duplicated(_("UID")), ERROR_DIALOG);
             return false;
         }
 
@@ -681,7 +681,7 @@ class Step_Migrate extends setup_step
 
         /* Create & remove of dummy object was successful */
         $this->checks['root']['STATUS']    = TRUE;
-        $this->checks['root']['STATUS_MSG']= _("Ok");
+        $this->checks['root']['STATUS_MSG']= _("OK");
     }
 
 
@@ -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;
                     }
@@ -825,7 +825,7 @@ class Step_Migrate extends setup_step
 
         /* Create & remove of dummy object was successful */
         $this->checks['rootOC']['STATUS']    = TRUE;
-        $this->checks['rootOC']['STATUS_MSG']= _("Ok");
+        $this->checks['rootOC']['STATUS_MSG']= _("OK");
         $this->checks['rootOC']['ERROR_MSG'] = "";
     }