From 045b58df09c8152ca58d4150610d7be190cfa839 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 10 May 2007 05:48:51 +0000
Subject: [PATCH] Temporary disabled schema check. (Will reimplement it later,
 today) Added contrib gosa.conf.

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@6322 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 contrib/gosa.conf | 331 ++++++++++++++++++++++++++++++++++------------
 html/index.php    |  22 +--
 2 files changed, 255 insertions(+), 98 deletions(-)

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 987666f9e..b72fb3595 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+{literal}<?xml version="1.0"?>{/literal}
 <conf>
 	<menu>
 		<section name="My account">
@@ -7,7 +7,9 @@
 			<plugin acl="default" class="posixAccount" icon="posix.png"
 				path="plugins/personal/posix" />
 			<plugin acl="default" class="environment" icon="env.png"
-				kioskpath="/var/spool/kiosk"
+{if $cv.optional.kioskpath_active}
+				kioskpath="{$cv.optional.kioskpath}"
+{/if}
 				path="plugins/personal/environment" />
 			<plugin acl="default" class="mailAccount" icon="email.png"
 				path="plugins/personal/mail" />
@@ -21,8 +23,10 @@
 				path="plugins/gofax/faxaccount" />
 			<plugin acl="default" class="phoneAccount" icon="phone.png"
 				path="plugins/gofon/phoneaccount" />
-<!--                     <plugin acl="default" class="nagiosAccount" icon="monitoring.png"
-                                path="plugins/personal/nagios" /> -->
+<!-- 
+            <plugin acl="default" class="nagiosAccount" icon="monitoring.png"
+                path="plugins/personal/nagios" /> 
+-->
 			<plugin acl="default" class="password" icon="password.png"
 				path="plugins/personal/password" />
 		</section>
@@ -40,6 +44,8 @@
 				icon="application.png" path="plugins/admin/applications" />
 			<plugin acl="systems" class="systems" icon="system.png"
 				path="plugins/admin/systems" />
+			<plugin acl="mimetype" class="mimetypeManagement"
+				icon="mimetypes.png" path="plugins/admin/mimetypes" />
 
 			<!-- Use 'lock_dn'      for dn
                      'lock_name'    for name
@@ -69,6 +75,12 @@
 				path="plugins/addons/mailqueue" />
 			<plugin acl="ldapmanager" class="ldif" icon="ldif.png"
 				path="plugins/addons/ldapmanager" />
+			<plugin acl="notifications" class="msgplug" icon="notifications.png"
+                                path="plugins/addons/notifications" />
+<!--
+			<plugin acl="gotomasses" class="gotomasses" icon="system.png"
+                                path="plugins/addons/gotomasses" />
+-->
 		</section>
 	</menu>
 
@@ -82,34 +94,34 @@
 		<tab class="connectivity" name="Connectivity" />
 		<tab class="gofaxAccount" name="Fax" />
 		<tab class="phoneAccount" name="Phone" />
-<!--            <tab class="nagiosAccount" name="Nagios" /> -->
-		<tab class="reference" name="References" />
+<!--            
+		<tab class="nagiosAccount" name="Nagios" /> 
+-->
 	</usertabs>
 
+	<mimetabs>
+		<tab class="mimetype" name="Generic" />
+	</mimetabs>
+
 	<grouptabs>
 		<tab class="group" name="Generic" />
 		<tab class="environment" name="Environment" />
 		<tab class="appgroup" name="Applications" />
 		<tab class="mailgroup" name="Mail" />
-		<tab class="acl" name="ACL" />
-		<tab class="reference" name="References" />
 	</grouptabs>
 
 	<appstabs>
 		<tab class="application" name="Generic" />
 		<tab class="applicationParameters" name="Options" />
-		<tab class="reference" name="References" />
 	</appstabs>
 
 	<conferencetabs>
 		<tab class="conference" name="Generic" />
-		<tab class="reference" name="References" />
 	</conferencetabs>
 
 	<macrotabs>
 		<tab class="macro" name="Generic" />
 		<tab class="macroParameter" name="Parameter" />
-		<tab class="reference" name="References" />
 	</macrotabs>
 
 	<termtabs>
@@ -118,7 +130,6 @@
 		<tab class="termservice" name="Devices" />
 		<tab class="printgeneric" name="Printer" />
 		<tab class="terminfo" name="Information" />
-		<tab class="reference" name="References" />
 	</termtabs>
 
 	<servtabs>
@@ -126,15 +137,13 @@
 		<tab class="workstartup" name="Startup" />
 		<tab class="servdb" name="Databases" />
 		<tab class="servservice" name="Services" />
-		{servKolab}
-		<!-- external_hook should return something like that 
-			 DisplayName:ServerName -->
-		<tab class="servrepository" name="Repository"
-                        external_hook="/bin/echo ''" />
-		<tab class="servrepository" name="Repository" />
-		<tab class="faiSummaryTab" name="FAI summary" />
-		<tab class="terminfo" name="Information" />
-		<tab class="reference" name="References" />
+{if $cv.mail == "kolab"}
+		<tab class="servkolab" name="Kolab"/>
+{/if}
+	   <tab class="servrepository" name="Repository" />
+	   <tab class="faiSummaryTab" name="FAI summary" />
+	   <tab class="terminfo" name="Information" />
+	   <tab class="reference" name="References" />
 	</servtabs>
 
 	<worktabs>
@@ -144,55 +153,68 @@
 		<tab class="printgeneric" name="Printer" />
 		<tab class="terminfo" name="Information" />
 		<tab class="faiSummaryTab" name="FAI summary" />
-		<tab class="reference" name="References" />
 	</worktabs>
 
 	<printtabs>
 		<tab class="printgeneric" name="Generic" />
-		<tab class="reference" name="References" />
 	</printtabs>
 
     <phonetabs>
         <tab class="phonegeneric" name="Generic" />
-        <tab class="reference" name="References" />
     </phonetabs>
 
+	<serverservice>
+        <tab class="goMailServer" />
+        <tab class="goNtpServer" />
+		<tab class="servrepository" />
+        <tab class="goImapServer" />
+        <tab class="goKrbServer" />
+        <tab class="goFaxServer" />
+        <tab class="goFonServer" />
+        <tab class="goLogDBServer" />
+        <tab class="goGlpiServer" />
+        <tab class="goCupsServer" />
+        <tab class="goSyslogServer" />
+        <tab class="goTerminalServer" />
+        <tab class="goLdapServer" />
+        <tab class="goShareServer" />
+    </serverservice>
+
     <componenttabs>
-        <tab class="componentgeneric" name="Generic" />
-        <tab class="reference" name="References" />
+    	<tab class="componentgeneric" name="Generic" />
     </componenttabs>
 
-	<wintabs>
-		<tab class="wingeneric" name="Generic" />
-		<tab class="reference" name="References" />
-	</wintabs>
+    <wintabs>
+    	<tab class="wingeneric" name="Generic" />
+    </wintabs>
 
-	<deptabs>
-		<tab class="department" name="Generic" />
-		<tab class="reference" name="References" />
-	</deptabs>
+    <deptabs>
+    	<tab class="department" name="Generic" />
+    </deptabs>
 
-	<ogrouptabs>
-		<tab class="ogroup" name="Generic" />
-		<tab class="reference" name="References" />
-	</ogrouptabs>
+    <ogrouptabs>
+    	<tab class="ogroup" name="Generic" />
+    </ogrouptabs>
 
-	<connectivity>
-		{kolabAccount}<tab class="proxyAccount" />
+    <connectivity>
+{if $cv.mail == "kolab"}
+		<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"
-            datahost="localhost"
-            />
-
-<!--		<tab class="pptpAccount" /> -->
-<!--		<tab class="phpscheduleitAccount" /> -->
-<!--		<tab class="glpiAccount" /> -->
+             username="OGo"
+             password=""
+             database="OGo"
+             datahost="localhost" />
+<!--	
+		<tab class="pptpAccount" /> 
+		<tab class="phpscheduleitAccount" /> 
+		<tab class="glpiAccount" /> 
+-->
 	</connectivity>
 
 	<ldiftab>
@@ -203,23 +225,23 @@
 	</ldiftab>
 
 	<faipartitiontabs>
-			<tab class="faiPartitionTable" name="Partitions" />
+		<tab class="faiPartitionTable" name="Partitions" />
 	</faipartitiontabs>
 
 	<faiscripttabs>
-			<tab class="faiScript" name="Script" />
+		<tab class="faiScript" name="Script" />
 	</faiscripttabs>
 
 	<faihooktabs>
-			<tab class="faiHook" name="Hooks" />
+		<tab class="faiHook" name="Hooks" />
 	</faihooktabs>
 
 	<faivariabletabs>
-			<tab class="faiVariable" name="Variables" />
+		<tab class="faiVariable" name="Variables" />
 	</faivariabletabs>
 
 	<faitemplatetabs>
-			<tab class="faiTemplate" name="Templates" />
+		<tab class="faiTemplate" name="Templates" />
 	</faitemplatetabs>
 
 	<faiprofiletabs>
@@ -228,45 +250,180 @@
 	</faiprofiletabs>
 
 	<faipackagetabs>
-			<tab class="faiPackage" name="Packages" />
+		<tab class="faiPackage" name="Packages" />
 	</faipackagetabs>
 	
-	<main default="{LOCATIONNAME}"
-		mailQueueScriptPath="/usr/bin/sudo /usr/local/sbin/mailqueue %action %id %server" 
-		enableCopyPaste="false" 
-		ppd_path="/var/spool/ppd/" 
-		compile="/var/spool/gosa"
-		lang=""
-		theme="default"
-		debuglevel="0"
+	<main default="{$cv.location}"
+
+{if $cv.pwd_rules.pwminlen_active}
+		pwminlen="{$cv.pwd_rules.pwminlen}"
+{/if}
+{if $cv.pwd_rules.pwdiffer_active}
+		pwdiffer="{$cv.pwd_rules.pwdiffer}"
+{/if}
+{if $cv.pwd_rules.externalpwdhook_active}
+		pwdiffer="{$cv.pwd_rules.externalpwdhook}"
+{/if}
+{if $cv.errorlvl}
+		displayerrors="true"
+{else}
+		displayerrors="false"
+{/if}
+{if $cv.enable_schema_check}
+		schema_check="true"
+{else}
+		schema_check="false"
+{/if}
+{if $cv.generic_settings.enableCopyPaste}
+		enableCopyPaste="true"
+{else}
+		enableCopyPaste="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"
-		iconsize="48x48"
-		pwminlen="6"
-		forceglobals="false"
-		smbhash='{SMBHASH}'
-		session_lifetime="7200"
-		schema_check="true"
-		max_ldap_query_time="5.0"
-		displayerrors="{errorlvl}">
-
-		<location name="{LOCATIONNAME}"
-			uidbase="{UIDBASE}"
-			governmentmode="{GOVERNMENTMODE}"
-			sambaversion="{SAMBAVERSION}"
-			{SID}
-			{RIDBASE}
-			mailMethod="{MAILMETHOD}"
-			hash="{CRYPT}"
-			dnmode="{DNMODE}"
-			server="{LDAPHOST}"
-			include_personal_title="false"
-			config="ou=gosa,ou=configs,ou=systems,{LDAPBASE}">
+{/if}
+{if $cv.optional.ppd_path_active}
+		ppd_path="{$cv.optional.ppd_path}"
+{/if}
+{if $cv.optional.max_ldap_query_time_active}	
+		max_ldap_query_time="{$cv.optional.max_ldap_query_time}"
+{/if}
+{if $cv.optional.noprimarygroup}
+		noprimarygroup="true"
+{/if}
+{if $cv.optional.mailQueueScriptPath_active}
+		mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
+{/if}
+{if $cv.optional.auto_network_hook_active}
+		auto_network_hook="{$cv.optional.auto_network_hook} "
+{/if}
+{if $cv.optional.strict_units}
+		strict_units="true"
+{else}
+		strict_units="false"
+{/if}
+		lang="{$cv.lang_selected}"
+		theme="{$cv.theme}"
+		session_lifetime="{$cv.optional.session_lifetime}"
+		compile="{$cv.optional.compile}"
+		debuglevel="{$cv.optional.debuglevel}"
+		smbhash='{$cv.samba_settings.smbhash}'
+		>
 
+		<location name="{$cv.location}"
+			hash="{$cv.encryption}"
+			dnmode="{$cv.peopledn}"
+			server="{$cv.connection}"
+			people="{$cv.peopleou}"
+			groups="{$cv.groupou}"
+			gidbase="{$cv.uidbase}"
+			uidbase="{$cv.uidbase}"
+{if $cv.krbsasl}
+			krbsasl="true"
+{else}
+			krbsasl="false"
+{/if}
+{if $cv.rfc2307bis}
+			rfc2307bis="true"
+{else}
+			rfc2307bis="false"
+{/if}
+{if $cv.include_personal_title}
+			include_personal_title="true"
+{else}
+			include_personal_title="false"
+{/if}
+{if $cv.optional.notifydir_active }
+			notifydir="{$cv.optional.notifydir}"
+{/if}
+{if $cv.base_hook_active}
+			base_hook="{$cv.base_hook}"
+{/if}
+{if $cv.generic_settings.wws_ou_active}
+			winstations="{$cv.generic_settings.wws_ou}"
+{/if}
+{if $cv.id_settings.idgen_active}
+			idgen="{$cv.id_settings.idgen}"
+{/if}
+{if $cv.strict}
+			strict="yes"
+{else}
+			strict="no"
+{/if}
+{if $cv.id_settings.minid_active}
+			minid="{$cv.id_settings.minid}"
+{/if}
+{if $cv.mail != "disabled"}
+			mailMethod="{$cv.mail}"
+{if $cv.cyrusunixstyle}
+			cyrusunixstyle="true"
+{else}
+			cyrusunixstyle="false"
+{/if}
+{if $cv.mail_settings.vacationdir_active}
+			vacationdir="{$cv.mail_settings.vacationdir}"
+{/if}
+{/if}
+{if $cv.tls}
+			tls="true"
+{/if}
+{if $cv.governmentmode}
+			governmentmode="true"
+{else}
+			governmentmode="false"
+{/if}
+{if $cv.sambaidmapping}
+			sambaidmapping="true"
+{/if}
+{if $cv.account_expiration}
+			account_expiration="true"
+{/if}
+{if $cv.samba_settings.samba_sid_active}
+			SID="{$cv.samba_settings.samba_sid}"
+{/if}
+{if $cv.samba_settings.samba_rid_active}
+			RIDBASE="{$cv.samba_settings.samba_rid_active}"
+{/if}
+{if $cv.generic_settings.snapshot_active}	
+			enable_snapshot="true"
+{if $cv.generic_settings.snapshot_base != ""}
+			snapshot_base="{$cv.generic_settings.snapshot_base}"
+{/if}
+{if $cv.generic_settings.snapshot_user != ""}
+			snapshot_user="{$cv.generic_settings.snapshot_user}"
+{/if}
+{if $cv.generic_settings.snapshot_password != ""}
+			snapshot_password="{$cv.generic_settings.snapshot_password}"
+{/if}
+{if $cv.generic_settings.snapshot_server != ""}
+			snapshot_server="{$cv.generic_settings.snapshot_server}"
+{/if}
+{/if}
+{if $cv.samba_version != 0}
+			sambaversion="{$cv.samba_version}"
+{/if}
+			config="ou=gosa,ou=configs,ou=systems,{$cv.base}">
 
-			<referral url="{LDAPHOST}/{LDAPBASE}"
-				admin="{LDAPADMIN}"
-				password="{PASSWORD}" />
+			<referral url="{$cv.connection}/{$cv.base}"
+				admin="{$cv.admin}"
+				password="{$cv.password}" />
 		</location>
 
 		<language name="German" tag="de_DE" />
diff --git a/html/index.php b/html/index.php
index 80446f1f2..14379e012 100644
--- a/html/index.php
+++ b/html/index.php
@@ -46,7 +46,7 @@ function displayLogin()
 
     /* Displasy SSL mode warning? */
     if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
-      $smarty->assign ("ssl", "<b>"._("Warning").":<\/b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."<\/b></a>!");
+      $smarty->assign ("ssl", "<b>"._("Warning").":</b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."</b></a>!");
     } else {
       $smarty->assign ("ssl", "");
     }
@@ -217,21 +217,21 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
     $recursive = (isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true");
     $tls =       (isset($config->current['TLS'])       && $config->current['TLS'] == "true");
 
-    if(!is_schema_readable($config->current['SERVER'], $config->current['ADMIN'], $config->current['PASSWORD'], $recursive, $tls)){
+    if(!count($ldap->get_objectclasses())){
 
       print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible."));
       displayLogin();
       exit();
     }else{
-      $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'], $recursive, $tls, 0, TRUE));
-      $checkarr = array();
-      foreach($str as $tr){
-        if(isset($tr['needonstartup'])){
-          print_red($tr['msg']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
-          displayLogin();
-          exit();
-        }
-      }
+#      $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'], $recursive, $tls, 0, TRUE));
+#      $checkarr = array();
+#      foreach($str as $tr){
+#        if(isset($tr['needonstartup'])){
+#          print_red($tr['msg']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
+#          displayLogin();
+#          exit();
+#        }
+#      }
     }
   }
   /* Check for locking area */
-- 
2.30.2