From baf195b6f50c3da561b54bb591a9e176b786de12 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 17 May 2010 08:21:30 +0000
Subject: [PATCH] Updated the setup procedure -Stripped out unused
 functionality

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18501 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/contrib/gosa.conf                  | 233 +------------------
 gosa-core/html/setup.php                     |   5 +
 gosa-core/setup/class_setup.inc              |  12 +-
 gosa-core/setup/class_setupStep_Checks.inc   |   8 +
 gosa-core/setup/class_setupStep_Feedback.inc |   2 +-
 gosa-core/setup/setup_ldap.tpl               |   2 +-
 gosa-core/setup/setup_welcome.tpl            |   2 -
 7 files changed, 25 insertions(+), 239 deletions(-)

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 643b1dfdb..63d291ae0 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -62,7 +62,6 @@
     <section name="Addons">
       <plugin acl="all/all"  class="configViewer" />
       <plugin acl="server/rSyslogServer" class="rsyslog" />
-    <!--  <plugin acl="server/servservrepository,server/dakrepository,server/dakkeyring,server/dakqueue" class="dak_tabs" path="plugins/addons/dak" /> -->
       <plugin acl="mailqueue" class="mailqueue" />
       <plugin acl="users/viewFaxEntries:self,users/viewFaxEntries" class="faxreport" />
       <plugin acl="users/viewFonEntries:self,users/viewFonEntries" class="fonreport" />
@@ -189,7 +188,7 @@
      <tab class="termgeneric" name="Generic" />
      <tab class="termstartup" name="Recipe" />
      <tab class="termservice" name="Devices" />
-     <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
+     <tab class="terminfo" name="Information" />
   </termtabs>
 
   <servtabs>
@@ -198,7 +197,7 @@
      <tab class="ServerService" name="Services" />
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
-     <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
+     <tab class="terminfo" name="Information" />
   </servtabs>
 
   <worktabs>
@@ -206,7 +205,7 @@
      <tab class="workstartup" name="Recipe" />
      <tab class="workservice" name="Devices" />
      <tab class="printgeneric" name="Printer" />
-     <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
+     <tab class="terminfo" name="Information" />
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
   </worktabs>
@@ -225,11 +224,7 @@
 
   <serverservice>
     <tab class="goMailServer" />
-{if $cv.mail == "Kolab" || $cv.mail == "Kolab22"}
     <tab class="servkolab" />
-{else}
-    <!-- <tab class="servkolab" /> -->
-{/if}
     <tab class="goNtpServer" />
     <tab class="servrepository" />
     <tab class="goImapServer" />
@@ -282,34 +277,14 @@
     <tab class="ogroup" name="Generic" />
   </ogrouptabs>
 
-  <!-- Debian archive management plugin -->
-  <!--
-  <dak_tabs>
-    <tab class="dakrepository" name="Repository" />
-    <tab class="dakqueue" name="Queue" />
-    <tab class="dakkeyring" name="Key ring" />
-  </dak_tabs>
-  -->
-
   <!-- Connectivity plugins -->
   <connectivity>
-{if $cv.mail == "Kolab" || $cv.mail == "Kolab22"}
     <tab class='kolabAccount' />
-{else}
-<!-- <tab class='kolabAccount' /> -->
-{/if}
     <tab class="proxyAccount" />
     <tab class="pureftpdAccount" />
     <tab class="webdavAccount" />
     <tab class="phpgwAccount" />
     <tab class="intranetAccount" />
-    <!--
-    <tab class="opengwAccount"
-      username="OGo"
-      password=""
-      database="OGo"
-      databaseServer="localhost" />
-    -->
     <tab class="pptpAccount" /> 
     <tab class="phpscheduleitAccount" /> 
     <tab class="oxchangeAccount" />
@@ -318,8 +293,6 @@
   <ldiftab>
     <tab class="ldifexport" name="Export" />
     <tab class="xlsexport" name="Excel Export" />
-<!--    <tab class="ldifimport" name="Import" /> -->
-<!--    <tab class="csvimport" name="CSV Import" /> -->
   </ldiftab>
 
   <faipartitiontabs>
@@ -377,212 +350,14 @@
        the gosa.conf(5) manual page.
 
   -->
-  <main default="{$cv.location}"
-{if $cv.generic_settings.logging}
-        logging="true"
-{else}
-        logging="false"
-{/if}
-{if $cv.optional.list_summary}
-        listSummary="true"
-{else}
-        listSummary="false"
-{/if}
-{if $cv.pwd_rules.pwminlen_active}
-        passwordMinLength="{$cv.pwd_rules.pwminlen}"
-{/if}
-{if $cv.pwd_rules.pwdiffer_active}
-        passwordMinDiffer="{$cv.pwd_rules.pwdiffer}"
-{/if}
-{if $cv.pwd_rules.externalpwdhook_active}
-        passwordHook="{$cv.pwd_rules.externalpwdhook}"
-{/if}
-{if $cv.errorlvl}
-        displayErrors="true"
-{else}
-        displayErrors="false"
-{/if}
-{if $cv.enable_schema_check}
-        schemaCheck="true"
-{else}
-        schemaCheck="false"
-{/if}
-{if $cv.generic_settings.enableCopyPaste}
-        copyPaste="true"
-{else}
-        copyPaste="false"
-{/if}
-{if $cv.optional.forceglobals}
-        forceGlobals="true"
-{else}
-        forceGlobals="false"
-{/if}
-{if $cv.optional.forceSSL}
-        forceSSL="true"
-{else}
-        forceSSL="false"
-{/if}
-{if $cv.optional.ldapstats}
-        ldapStats="true"
-{else}
-        ldapStats="false"
-{/if}
-{if $cv.optional.warnSSL}
-        warnSSL="true"
-{else}
-        warnSSL="false"
-{/if}
-{if $cv.optional.ppd_path_active}
-        ppdGzip="true"
-        ppdPath="{$cv.optional.ppd_path}"
-{/if}
-{if $cv.optional.max_ldap_query_time_active}  
-        ldapMaxQueryTime="{$cv.optional.max_ldap_query_time}"
-{/if}
-{if $cv.optional.noprimarygroup}
-        primaryGroupFilter="true"
-{/if}
-{if $cv.optional.user_filter_cookie}
-        storeFilterSettings="true"
-{else}
-        storeFilterSettings="false"
-{/if}
-{if $cv.compressed}
-        sendCompressedOutput="true"
-{else}
-        sendCompressedOutput="false"
-{/if}
-{if $cv.optional.uniq_identifier_active}
-        modificationDetectionAttribute="{$cv.optional.uniq_identifier}"
-{else}
-        modificationDetectionAttribute=""
-{/if}
-        language="{$cv.lang_selected}"
-        theme="{$cv.theme}"
-        sessionLifetime="{$cv.optional.session_lifetime}"
-        templateCompileDirectory="{$cv.optional.templateCompileDirectory}"
-        debugLevel="{$cv.optional.debugLevel}"
-        sambaHashHook='{$cv.samba_settings.smbhash}'
-    >
+  <main default="{$cv.location}">
 
     <!-- Location definition -->
     <location name="{$cv.location}"
-              passwordDefaultHash="{$cv.encryption}"
-              accountPrimaryAttribute="{$cv.peopledn}"
-              userRDN="{$cv.peopleou}"
-              groupRDN="{$cv.groupou}"
-              gidNumberBase="{$cv.uidbase}"
-              uidNumberBase="{$cv.uidbase}"
-{if $cv.optional.sudoou_active}
-              sudoRDN="{$cv.optional.sudoou}"
-{/if}
-{if $cv.optional.gosaSupportURI_active}
-              gosaSupportURI="{$cv.optional.gosaSupportURI}"
-              gosaSupportTimeout="{$cv.optional.gosaSupportTimeout}"
-{else}
-              disabled_gosaSupportURI="gosa-si-secret@server:20081"
-              disabled_gosaSupportTimeout="15"
-{/if}
-{if $cv.optional.login_attribute}
-              loginAttribute="{$cv.optional.login_attribute}"
-{else}
-              loginAttribute="uid"
-{/if}
-{if $cv.timezone}
-              timezone="{$cv.timezone}"
-{/if}
-{if $cv.optional.strict_units}
-              honourUnitTags="true"
-{else}
-              honourUnitTags="false"
-{/if}
-{if $cv.krbsasl}
-              useSaslForKerberos="true"
-{else}
-              useSaslForKerberos="false"
-{/if}
-{if $cv.rfc2307bis}
-              rfc2307bis="true"
-{else}
-              rfc2307bis="false"
-{/if}
-{if $cv.include_personal_title}
-              personalTitleInDN="true"
-{else}
-              personalTitleInDN="false"
-{/if}
-{if $cv.base_hook_active}
-              nextIdHook="{$cv.base_hook}"
-{/if}
-{if $cv.generic_settings.wws_ou_active}
-              sambaMachineAccountRDN="{$cv.generic_settings.wws_ou}"
-{/if}
-{if $cv.id_settings.idgen_active}
-              idGenerator="{$cv.id_settings.idgen}"
-{/if}
-{if $cv.strict}
-              strictNamingRules="true"
-{else}
-              strictNamingRules="false"
-{/if}
-{if $cv.id_settings.minid_active}
-              minId="{$cv.id_settings.minid}"
-{/if}
-              mailAttribute="{$cv.mail_attrib}"
-              gosaSharedPrefix=""
-              mailUserCreation=""
-              mailFolderCreation=""
-              imapTimeout="10"
-{if $cv.mail != "disabled"}
-              mailMethod="{$cv.mail}"
-{if $cv.cyrusunixstyle}
-              cyrusUseSlashes="true"
-{else}
-              cyrusUseSlashes="false"
-{/if}
-{if $cv.mail_settings.vacationdir_active}
-              vacationTemplateDirectory="{$cv.mail_settings.vacationdir}"
-{/if}
-{/if}
-{if $cv.tls}
-              ldapTLS="true"
-{/if}
-{if $cv.governmentmode}
-              honourIvbbAttributes="true"
-{else}
-              honourIvbbAttributes="false"
-{/if}
-{if $cv.sambaidmapping}
-              sambaIdMapping="true"
-{/if}
-{if $cv.account_expiration}
-              handleExpiredAccounts="true"
-{/if}
-{if $cv.samba_settings.samba_sid_active}
-              sambaSID="{$cv.samba_settings.samba_sid}"
-{/if}
-{if $cv.samba_settings.samba_rid_active}
-              sambaRidBase="{$cv.samba_settings.samba_rid_active}"
-{/if}
-{if $cv.generic_settings.snapshot_active}  
-              enableSnapshots="true"
-              snapshotBase="{$cv.generic_settings.snapshot_base}"
-              snapshotAdminDn="{$cv.generic_settings.snapshot_user}"
-              snapshotAdminPassword="{$cv.generic_settings.snapshot_password}"
-              snapshotURI="{$cv.generic_settings.snapshot_server}"
-{else}
-              enableSnapshots="false"
-              snapshotBase="dc=localhost,dc=de"
-              snapshotAdminDn="cn=admin,dc=localhost,dc=de"
-              snapshotAdminPassword="secret"
-              snapshotURI="ldap://localhost:389"
-{/if}
               config="ou=gosa,ou=configs,ou=systems,{$cv.base}">
-
               <referral URI="{$cv.connection}/{$cv.base}"
                         adminDn="{$cv.admin}"
                         adminPassword="{$cv.password}" />
-
     </location>
   </main>
 </conf>
diff --git a/gosa-core/html/setup.php b/gosa-core/html/setup.php
index b402b0116..88aae85fa 100644
--- a/gosa-core/html/setup.php
+++ b/gosa-core/html/setup.php
@@ -24,6 +24,11 @@
 require_once ("../include/php_setup.inc");
 require_once ("functions.inc");
 
+// Do not use the GOsa default error handler.
+// To do so we require a valid config object - and at this point 
+//  we doesn't have one.
+restore_error_handler();
+
 require_once("../setup/class_setup.inc");
 require_once("../setup/class_setupStep.inc");
 require_once("../setup/class_setupStep_Welcome.inc");
diff --git a/gosa-core/setup/class_setup.inc b/gosa-core/setup/class_setup.inc
index 4f7c68b32..446e39217 100644
--- a/gosa-core/setup/class_setup.inc
+++ b/gosa-core/setup/class_setup.inc
@@ -35,15 +35,15 @@ class setup
   {
     $i = 1; 
     $this->o_steps[$i++] = new Step_Welcome();
-    $this->o_steps[$i++] = new Step_Language();
+#    $this->o_steps[$i++] = new Step_Language();
     $this->o_steps[$i++] = new Step_Checks();
     $this->o_steps[$i++] = new Step_License();
     $this->o_steps[$i++] = new Step_Ldap();
-    $this->o_steps[$i++] = new Step_Schema();
-    $this->o_steps[$i++] = new Step_Config1();
-    $this->o_steps[$i++] = new Step_Config2();
-    $this->o_steps[$i++] = new Step_Config3();
-    $this->o_steps[$i++] = new Step_Migrate();
+#    $this->o_steps[$i++] = new Step_Schema();
+#    $this->o_steps[$i++] = new Step_Config1();
+#    $this->o_steps[$i++] = new Step_Config2();
+#    $this->o_steps[$i++] = new Step_Config3();
+#    $this->o_steps[$i++] = new Step_Migrate();
     $this->o_steps[$i++] = new Step_Feedback();
     $this->o_steps[$i++] = new Step_Finish();
     $this->i_steps = $i-1;
diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc
index d231c4025..2a4d698b5 100644
--- a/gosa-core/setup/class_setupStep_Checks.inc
+++ b/gosa-core/setup/class_setupStep_Checks.inc
@@ -116,6 +116,14 @@ class Step_Checks extends setup_step
     $M = TRUE;
     $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
 
+    /* Is calendar module available/compiled/installed */
+    $N = msgPool::checkingFor(_("Calendar"));
+    $D = _("GOsa requires this module to calculate dates.");
+    $S = msgPool::installPhpModule("calendar");
+    $R = is_callable("cal_days_in_month");
+    $M = TRUE;
+    $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
+
     /* Mysql module loaded ? */
     $N = msgPool::checkingFor(_("MySQL"));
     $D = _("GOsa requires this module to communicate with several supported databases.");
diff --git a/gosa-core/setup/class_setupStep_Feedback.inc b/gosa-core/setup/class_setupStep_Feedback.inc
index d655c2e5e..7b8b3570a 100644
--- a/gosa-core/setup/class_setupStep_Feedback.inc
+++ b/gosa-core/setup/class_setupStep_Feedback.inc
@@ -92,7 +92,7 @@ class Step_Feedback  extends setup_step
                                                 "NAME" => _("UNIX accounts/groups"));
     $this->features_used['samba']       = array("USED" => isset($oc['sambaSamAccount']) || isset($oc['sambaAccount']) , 
                                                 "NAME" => _("Samba management"));
-    $this->features_used['mail']        = array("USED" => $cv['mail']  != "none", 
+    $this->features_used['mail']        = array("USED" => FALSE,
                                                 "NAME" => _("Mailsystem management"));
     $this->features_used['fax']         = array("USED" => isset($oc['goFaxAccount']) , 
                                                 "NAME" => _("FAX system administration"));
diff --git a/gosa-core/setup/setup_ldap.tpl b/gosa-core/setup/setup_ldap.tpl
index 2aeadd2f3..ccc8d9e7f 100644
--- a/gosa-core/setup/setup_ldap.tpl
+++ b/gosa-core/setup/setup_ldap.tpl
@@ -37,7 +37,7 @@
 	</div>
 	<div class='step4_container'>
 		<div class='step4_name'>
-			<div style='vertical-align:middle;height:100%;'>{t}Connection URI{/t}</div>
+			<div style='vertical-align:middle;'>{t}Connection URI{/t}</div>
 		</div>
 		<div class='step4_value'>
 			<input type='text' name='connection' maxlength='80' size='40' value='{$connection}'>
diff --git a/gosa-core/setup/setup_welcome.tpl b/gosa-core/setup/setup_welcome.tpl
index 5333adeab..a44d036ce 100644
--- a/gosa-core/setup/setup_welcome.tpl
+++ b/gosa-core/setup/setup_welcome.tpl
@@ -10,8 +10,6 @@
 	<ul>
 	 <li>{t}Create a basic, single site configuration{/t}</li>
 	 <li>{t}Tries to find problems within your PHP and LDAP setup{/t}</li>
-	 <li>{t}Let you choose from a set of basic and advanced configuration switches{/t}</li>
-	 <li>{t}Guided migration of existing LDAP trees{/t}</li>
 	</ul>
 	<p>
 	<b>{t}What will the wizard NOT do for you?{/t}</b>
-- 
2.30.2