Added check to prevent "gosamailquato undefined "

[gosa.git] / include / functions_setup.inc

diff --git a/include/functions_setup.inc b/include/functions_setup.inc
index f7f3e422492ac8ca599f706a130bd4bba9a36cdc..84fcebc777fcd4707b9e7f063d51ed88df45af7c 100644 (file)
--- a/include/functions_setup.inc
+++ b/include/functions_setup.inc
@@ -56,7 +56,7 @@ function is_schema_readable($server, $admin, $password)
   return(true);
 } 
 
-function schema_check($server, $admin, $password, $aff=0)
+function schema_check($server, $admin, $password, $aff=0,$CalledByIndexPhP=false)
 {
   global $config;
 
@@ -79,7 +79,7 @@ function schema_check($server, $admin, $password, $aff=0)
       "gosaApplicationGroup"  => array("version" => "2.4", "class" => "appgroup","file" => "gosa.schema"),
 
       "GOhard"                => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"),
-      "gotoTerminal"          => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"),
+      "gotoTerminal"          => array("version" => "2.0", "class" => "terminals","file" => "goto.schema"),
       "goServer"              => array("version" => "2.4","class" => "server","file" => "goserver.schema"),
       "goTerminalServer"      => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"),
       "goNfsServer"           => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"),
@@ -226,21 +226,24 @@ function schema_check($server, $admin, $password, $aff=0)
     $affich['phoneaccount']['msg']= _("Support for gofon enabled")."<td class=\"check\">gofon.schema</td>";
     $affich['phoneaccount']['status']= true;
   }
-
-  if(($_SESSION['ldapconf']['mail_methods'][$_SESSION['ldapconf']['mail']] == "kolab")){
-    if(!isset($objectclasses['kolabInetOrgPerson']))
-    {
-      $messages['kolab']['msg']= _("Support for Kolab disabled, no schema seems to be installed, setting mail-method to cyrus");
-      $affich['kolab']['msg']=$messages['kolab']['msg']."<td class=\"check\">kolab2.schema</td>";
-
-      $tmp= array_flip($_SESSION['ldapconf']['mail_methods']);
-      $_SESSION['ldapconf']['mail']=$tmp['cyrus'];
-      $messages['kolab']['status']= FALSE;
-      $affich['kolab']['status']= FALSE;
-    }else{
-      $affich['kolab']['msg']=_("Support for Kolab enabled")."<td class=\"check\">gofon.schema</td>";
-      $affich['kolab']['status']= TRUE;
-    }
+  
+  /* Fix for PHP Fehler "Undefined index: ldapconf"
+   * Ablaufverfolgung[1]: Funktion schema_check        Datei: /home/hickert/gosa/include/functions_setup.inc (Zeile 230)
+   */
+  if((isset($_SESSION['ldapconf']['mail_methods']))&&(isset($_SESSION['ldapconf']))){
+       if(($_SESSION['ldapconf']['mail_methods'][$_SESSION['ldapconf']['mail']] == "kolab")&&(!$CalledByIndexPhP)){
+         if(!isset($objectclasses['kolabInetOrgPerson']))  {
+           $messages['kolab']['msg']= _("Support for Kolab disabled, no schema seems to be installed, setting mail-method to cyrus");
+           $affich['kolab']['msg']=$messages['kolab']['msg']."<td class=\"check\">kolab2.schema</td>";
+           $tmp= array_flip($_SESSION['ldapconf']['mail_methods']);
+           $_SESSION['ldapconf']['mail']=$tmp['cyrus'];
+           $messages['kolab']['status']= FALSE;
+           $affich['kolab']['status']= FALSE;
+         }else{
+           $affich['kolab']['msg']=_("Support for Kolab enabled")."<td class=\"check\">gofon.schema</td>";
+           $affich['kolab']['status']= TRUE;
+         }
+       }
   }
   if($aff==0){
     return ($messages);
@@ -334,6 +337,7 @@ function perform_php_checks(&$faults)
 
 function perform_additional_checks(&$faults)
 {
+  $ret = NULL;
   /* Programm check */
   $msg= "<h1>"._("Checking for some additional programms")."</h1>";
 
@@ -473,6 +477,7 @@ function parse_contrib_conf()
   $replacements['{GOVERNMENTMODE}']= "false"; 
   $replacements['{kolabAccount}']  = "";
   $replacements['{servKolab}']     = "";
+  $replacements['{errorlvl}']     = $ldapconf['errorlvl'];
 
   /* This array contains all preg_replace syntax to delete all unused plugins
      THE kEY MUST BE THE CLASSNAME so we can check it with $ldapconf['classes'] */
@@ -573,6 +578,7 @@ function parse_contrib_conf()
 /* Show setup_page 1 */
 function show_setup_page1($withoutput = true)
 {
+  $faults = array();
   $smarty = get_smarty();  
   $smarty->assign ("content", get_template_path('setup_introduction.tpl'));
   $smarty->assign ("tests", perform_php_checks($faults));
@@ -602,6 +608,7 @@ function show_setup_page1($withoutput = true)
 /* Show setup_page 2 */
 function show_setup_page2($withoutput = true)
 {
+  $faults = array();
   $smarty = get_smarty();
   $smarty->assign ("content", get_template_path('setup_step2.tpl'));
   $smarty->assign ("tests", perform_additional_checks($faults));
@@ -625,6 +632,7 @@ function show_setup_page2($withoutput = true)
 
 function show_setup_page3($withoutput = true)
 {
+  $ds = NULL;
   $smarty = get_smarty();
 
   /* Take the Post oder the Sessioin saved data */
@@ -712,6 +720,7 @@ function show_setup_page4($withoutput = true)
 {
   $smarty= get_smarty();      
 
+       // ?
   if(!isset($_SESSION['ldapconf']['base'])){
     $_SESSION['ldapconf']['base']= $base;
   }
@@ -727,7 +736,7 @@ function show_setup_page4($withoutput = true)
   $arr_crypts= array();
   $temp      = "";
   $checkvars = array("location", "admin", "password", "peopleou", "base",
-      "peopledn", "arr_crypts", "mail", "uidbase");
+      "peopledn", "arr_crypts", "mail", "uidbase","errorlvl");
 
   if(!isset($_SESSION['ldapconf']['arr_cryptkeys'])) {
     require_once("class_password-methods.inc");
@@ -853,7 +862,7 @@ function show_setup_page4($withoutput = true)
 
     if(!is_schema_readable($ldapconf['uri'],$ldapconf['admin'],$ldapconf['password'])){
       if($withoutput){
-        print_red(_("Can't read schema informations, GOsa needs to know your schema setup. Pleasy verify taht it is readable for GOsa"));
+        print_red(_("Can't read schema informations, GOsa needs to know your schema setup. Please verify that it is readable for GOsa"));
       }
       $fault=true;
     }
@@ -1100,7 +1109,7 @@ function create_user_for_setup($withoutput=true)
     return(true);
   } else {
 
-    if(!($create_user)) {
+    if((!isset($create_user))||(!($create_user))) {
       $smarty->assign ("content", get_template_path('setup_useradmin.tpl'));
       $smarty->assign("exists",true);
     } else {