From 05cf7e8a942556271dfce82c3f185ad83389d46e Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 29 Sep 2006 10:28:52 +0000
Subject: [PATCH] remove old templates fixed some acl stuff

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4836 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../class_glpiPrinterCartridgesEdit.inc       |   8 -
 plugins/admin/systems/class_winGeneric.inc    |   5 +-
 plugins/admin/systems/servdb.tpl              | 144 ------------------
 plugins/admin/systems/servservice.tpl         | 112 --------------
 4 files changed, 2 insertions(+), 267 deletions(-)
 delete mode 100644 plugins/admin/systems/servdb.tpl
 delete mode 100644 plugins/admin/systems/servservice.tpl

diff --git a/plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc b/plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc
index 7830396ed..8e6a23d87 100644
--- a/plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc
+++ b/plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc
@@ -136,17 +136,9 @@ class glpiPrinterCartridgesEdit extends plugin
       return($display);
     }
 
-
-
-
-
-
-
- 
     /* Assign attributes */ 
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
-      $smarty->assign($attr."ACL",chkacl($this->acl,$attr));
     }
 
     /* Selecte technical responsible person
diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc
index 30a0939dc..d1673bc93 100644
--- a/plugins/admin/systems/class_winGeneric.inc
+++ b/plugins/admin/systems/class_winGeneric.inc
@@ -107,7 +107,6 @@ class wingeneric extends plugin
 
     /* Assign attributes */
     foreach ($this->attributes as $attr){
-      $smarty->assign($attr."ACL", chkacl($this->acl, $attr));
       $smarty->assign("$attr", $this->$attr);
     }
     
@@ -143,7 +142,7 @@ class wingeneric extends plugin
     plugin::save_object();
     $this->netConfigDNS->save_object();
     /* Save base, since this is no LDAP attribute */
-    if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
+    if (isset($_POST['base']) && $this->acl_is_moveable(){
       $this->base= $_POST['base'];
     }
   }
@@ -160,7 +159,7 @@ class wingeneric extends plugin
     $ui= get_userinfo();
     $acl= get_permissions ($this->dn, $ui->subtreeACL);
     $acl= get_module_permission($acl, "component", $this->dn);
-    if (chkacl($acl, "create") != ""){
+    if(!$this->acl_is_createable() && $this->dn == "new"){
       $message[]= _("You have no permissions to create a component on this 'Base'.");
     }
 
diff --git a/plugins/admin/systems/servdb.tpl b/plugins/admin/systems/servdb.tpl
deleted file mode 100644
index a2a4ec5d4..000000000
--- a/plugins/admin/systems/servdb.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-<table summary="" style="width:100%">
- <tr>
- 
-  <td style="vertical-align:top; border-right:1px solid #A0A0A0; padding-right:5px;">
-  
-   <input type=checkbox name="goKrbServer" value="1" {$goKrbServer} {$goKrbServerACL} onclick="changeState('goKrbAdmin'); changeState('goKrbPassword'); changeState('goKrbRealm');"> <b>{t}Kerberos kadmin access{/t}</b>
-  
-   <table summary="">
-    <tr>
-	 <td>{t}Kerberos Realm{/t}</td>
-	 <td><input name="goKrbRealm" id="goKrbRealm" size=30 maxlength=60 {$goKrbRealmACL} value="{$goKrbRealm}" {$goKrbServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Admin user{/t}</td>
-	 <td><input name="goKrbAdmin" id="goKrbAdmin" size=30 maxlength=60 {$goKrbAdminACL} value="{$goKrbAdmin}" {$goKrbServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Password{/t}</td>
-	 <td><input type=password name="goKrbPassword" id="goKrbPassword" size=30 maxlength=60 {$goKrbPasswordACL} value="{$goKrbPassword}" {$goKrbServerState}></td>
-	</tr>
-   </table>
-
-   <p class="seperator">&nbsp;</p>
-   <br>
-
-   <input type=checkbox name="goFaxServer" value="1" {$goFaxServer} {$goFaxServerACL} onclick="changeState('goFaxAdmin'); changeState('goFaxPassword');"> <b>{t}FAX database{/t}</b>
-  
-   <table summary="">
-    <tr>
-	 <td>{t}FAX DB user{/t}</td>
-	 <td><input name="goFaxAdmin" size=30 maxlength=60 {$goFaxAdminACL} id="goFaxAdmin" value="{$goFaxAdmin}" {$goFaxServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Password{/t}</td>
-	 <td><input type=password name="goFaxPassword" id="goFaxPassword" size=30 maxlength=60 {$goFaxPasswordACL}   value="{$goFaxPassword}" {$goFaxServerState}></td>
-	</tr>
-   </table>
-
-   <p class="seperator">&nbsp;</p>
-   <br>
-
-   <input type=checkbox name="goFonServer" value="1" {$goFonServer} {$goFonServerACL} onclick="changeState('goFonAdmin'); changeState('goFonPassword'); changeState('goFonCountryCode'); changeState('goFonAreaCode');"> <b>{t}Asterisk management{/t}</b>
-  
-   <table summary="">
-    <tr>
-	 <td>{t}Asterisk DB user{/t}</td>
-	 <td><input name="goFonAdmin" size=30 maxlength=60 id="goFonAdmin" {$goFonServerACL} value="{$goFonAdmin}" {$goFonServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Password{/t}</td>
-	 <td><input type=password name="goFonPassword" id="goFonPassword" size=30 maxlength=60 {$goFonPasswordACL}   value="{$goFonPassword}" {$goFonServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Country dial prefix{/t}</td>
-	 <td><input name="goFonCountryCode" size=10 maxlength=30 id="goFonCountryCode" {$goFonCountryCodeACL}   value="{$goFonCountryCode}" {$goFonServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Local dial prefix{/t}</td>
-	 <td><input name="goFonAreaCode" size=10 maxlength=30 id="goFonAreaCode" {$goFonServerState} {$goFonAreaCodeACL}   value="{$goFonAreaCode}"></td>
-	</tr>
-   </table>
-
-  
-  </td>
-  
-  
-  <td style="vertical-align:top">
-
-   <input type=checkbox name="goImapServer" value="1" {$goImapServer} {$goImapServerACL} onclick="changeState('goImapName'); changeState('goImapConnect');
-   changeState('goImapAdmin'); changeState('goImapPassword'); changeState('goImapSievePort');"> <b>{t}IMAP admin access{/t}</b>
-  
-   <table summary="">
-    <tr>
-	 <td>{t}Server identifier{/t}</td>
-	 <td><input name="goImapName" id="goImapName" size=40 maxlength=60 {$goImapNameACL} value="{$goImapName}" {$goImapServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Connect URL{/t}</td>
-	 <td><input name="goImapConnect" id="goImapConnect" size=40 maxlength=60 {$goImapConnectACL} value="{$goImapConnect}" {$goImapServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Admin user{/t}</td>
-	 <td><input name="goImapAdmin" id="goImapAdmin" size=30 maxlength=60 {$goImapAdminACL} value="{$goImapAdmin}" {$goImapServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Password{/t}</td>
-	 <td><input type=password name="goImapPassword" id="goImapPassword" size=30 maxlength=60 {$goImapPasswordACL}
-	 value="{$goImapPassword}" {$goImapServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Sieve port{/t}</td>
-	 <td><input name="goImapSievePort" id="goImapSievePort" size=10 maxlength=30 {$goImapSievePortACL}
-value="{$goImapSievePort}" {$goImapServerState}></td>
-	</tr>
-   </table>
-
-   <p class="seperator">&nbsp;</p>
-   <br>
-
-   <input type=checkbox name="goLogDBServer" value="1" {$goLogDBServer} {$goLogDBServerACL} onclick="changeState('goLogAdmin');changeState('goLogPassword');"> <b>{t}Logging database{/t}</b>
-  
-   <table summary="">
-    <tr>
-	 <td>{t}Logging DB user{/t}</td>
-	 <td><input name="goLogAdmin" id="goLogAdmin" size=30 maxlength=60 {$goLogAdminACL}
-value="{$goLogAdmin}" {$goLogDBServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Password{/t}</td>
-	 <td><input type=password name="goLogPassword" id="goLogPassword" size=30 maxlength=60 {$goLogPasswordACL}
-value="{$goLogPassword}" {$goLogDBServerState}></td>
-	</tr>
-   </table>
-  
-   <p class="seperator">&nbsp;</p>
-   <br>
-
-
-   <input type=checkbox name="goGlpiServer" value="1" {$goGlpiServer} {$goGlpiServerACL} onclick="changeState('goGlpiAdmin');changeState('goGlpiPassword');changeState('goGlpiDatabase');"> <b>{t}Glpi database{/t}</b>
-  
-   <table summary="">
-    <tr>
-	 <td>{t}Logging DB user{/t}</td>
-	 <td><input name="goGlpiAdmin" id="goGlpiAdmin" size=30 maxlength=60 {$goGlpiAdminACL}
-value="{$goGlpiAdmin}" {$goGlpiServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Password{/t}</td>
-	 <td><input type="password" name="goGlpiPassword" id="goGlpiPassword" size=30 maxlength=60 {$goGlpiPasswordACL}
-value="{$goGlpiPassword}" {$goGlpiServerState}></td>
-	</tr>
-    <tr>
-	 <td>{t}Database{/t}</td>
-	 <td><input name="goGlpiDatabase" id="goGlpiDatabase" size=30 maxlength=60 {$goGlpiDatabaseACL}
-value="{$goGlpiDatabase}" {$goGlpiServerState}></td>
-	</tr>
-   </table>
-  
-  </td>
-  
- </tr>
-</table>
-
-<input type="hidden" name="dbtab">
diff --git a/plugins/admin/systems/servservice.tpl b/plugins/admin/systems/servservice.tpl
deleted file mode 100644
index 81729b2e0..000000000
--- a/plugins/admin/systems/servservice.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-<table summary="" style="width:100%">
- <tr>
-  <td style="vertical-align:top; border-right:1px solid #A0A0A0; padding-right:5px;" width="50%">
-
-   <input type=checkbox name="goShareServer" value="1" {$goShareServer} 
-   	onchange="changeState('goExportEntry');
-			changeState('NewNfsEditId');
-			changeState('DelNfsEntId');
-			changeState('NewNfsAddId');"> 
-
-		<b>{t}Shares{/t}</b>
-   <table summary="" style="width:100%">
-    <tr>
-     <td>
-		<select style="width:100%" id="goExportEntry" name="goExportEntryList[]" {$goExportEntryACL} {$goShareServerState} size=12 multiple >
-    		{html_options values=$goExportEntry output=$goExportEntryKeys}
-			<option disabled>&nbsp;</option>
-	    </select>
-	<br>	
-		<input type="submit" 	value="{t}Add{/t}"	name="NewNfsAdd"  {$goShareServer} {$goExportEntryACL}	id="NewNfsAddId"> 
-		<input type="submit" 	value="{t}Edit{/t}" 	name="NewNfsEdit" {$goShareServer} {$goExportEntryACL}  id="NewNfsEditId"> 
-		<input type="submit" 	value="{t}Delete{/t}"  	name="DelNfsEnt"  {$goShareServer} {$goExportEntryACL}	id="DelNfsEntId">
-	</td>
-	</tr>
-   </table>
-   
-   <p class="seperator">&nbsp;</p>
-	
-	<br>
-
-   <input type=checkbox name="goNtpServer" value="1" {$goNtpServer} {$goNtpServerACL}
-            onchange="changeState('goTimeEntry');
-            changeState('NewNTPExportId');
-            changeState('DelNTPEntId');
-            changeState('NewNTPAddId');">
-
-        <b>{t}Time Service{/t}</b>
-   <table summary="" style="width:100%">
-    <tr>
-     <td>
-        <select style="width:100%;" id="goTimeEntry" name="goTimeSource[]" {$goNtpServerState} {$goNtpServerACL}  size=4 multiple>
-            {html_options values=$goTimeSource output=$goTimeSource}
-			<option disabled>&nbsp;</option>
-        </select>
-    <br>
-        <input type="text" name="NewNTPExport" {$goNtpServerState} id="NewNTPExportId">
-        <input type="submit"    value="{t}Add{/t}"      name="NewNTPAdd"    {$goNtpServerState} {$goNtpServerACL} id="NewNTPAddId">
-        <input type="submit"    value="{t}Delete{/t}"   name="DelNTPEnt"    {$goNtpServerState} {$goNtpServerACL} id="DelNTPEntId">
-    </td>
-	</tr>
-   </table>
-
-
-
-  </td>
-  <td style="width:50%;vertical-align:top">
-
-  <input type=checkbox name="goLdapServer" value="1" {$goLdapServer} {$goLdapServerACL}
-            onchange="changeState('goLdapBaseId');">
-
-     <b>{t}LDAP Service{/t}</b><br>&nbsp;&nbsp;{t}Base{/t}&nbsp;<input type="text" style="width:70%" value="{$goLdapBase}"     {$goLdapBaseACL}    name="goLdapBase" {$goLdapServerState} id="goLdapBaseId">
-
-	<p class="seperator">&nbsp;</p>
-    <br>
-
-	 <input type=checkbox name="goTerminalServer" value="1" {$goTerminalServer} {$goTerminalServerACL}
-            onchange="changeState('FontPathId');
-            		  changeState('Temporariid');">
-
-     <b>{t}Terminal Service{/t}</b>
-
-  <table summary="">
-	<tr>
-	 <td colspan=2>
-	  <input type="checkbox" value="true" name="goXdmcpIsEnabled" {$goTerminalServerState} {$goXdmcpIsEnabledACL} id="Temporariid" {$goXdmcpIsEnabled}> {t}Temporary disable login{/t}</td>
-    </tr>
-    <tr>
-	 <td>{t}Font path{/t}</td>
-	 <td> <input type="text"      value="{$goFontPath}"         name="goFontPath" {$goTerminalServerState} {$goXdmcpIsEnabledACL}  id="FontPathId"></td>
-	</tr>
-   </table>
-
-
-
-	
-   	<p class="seperator">&nbsp;</p>
-    <br>
-
-     <input type=checkbox name="goSyslogServer" value="1" {$goSyslogServer} {$goSyslogServerACL}>
-
-     <b>{t}Syslog Service{/t}</b>
-
-   	<p class="seperator">&nbsp;</p>
-    <br>
-	
-
-     <input type=checkbox name="goCupsServer" value="1" {$goCupsServer} {$goCupsServerACL}>
-
-     <b>{t}Print Service{/t}</b>
-   	
-	<p class="seperator">&nbsp;</p>
-    <br>
-	
-
-     <input type=checkbox name="goMailServer" value="1" {$goMailServer} {$goMailServerACL}>
-
-     <b>{t}Mail server{/t}</b>
-	</td>	
- </tr>
-</table>
-
-<input type="hidden" name="servicetab">
-- 
2.30.2