removed old acls from templates

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4837 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc
index d1673bc9371baa466afbd095eedae984ad051740..42efcc779f3cea64ae02e121fd85db1176f21d9e 100644 (file)
--- a/plugins/admin/systems/class_winGeneric.inc
+++ b/plugins/admin/systems/class_winGeneric.inc
@@ -142,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']) && $this->acl_is_moveable(){
+    if (isset($_POST['base']) && $this->acl_is_moveable()){
       $this->base= $_POST['base'];
     }
   }

diff --git a/plugins/admin/systems/glpiPrinterCartridgesEdit.tpl b/plugins/admin/systems/glpiPrinterCartridgesEdit.tpl
index 894af570d1e853857160b6c52fc1c569570d653c..22001e6b24937116923a8e076cb4854903d1caac 100644 (file)
--- a/plugins/admin/systems/glpiPrinterCartridgesEdit.tpl
+++ b/plugins/admin/systems/glpiPrinterCartridgesEdit.tpl
@@ -7,14 +7,14 @@
                                        <td>{t}Name{/t}
                                        </td>
                                        <td>
-                                               <input type="text" name="name" value="{$name}" {$nameACL}>
+                                               <input type="text" name="name" value="{$name}">
                                        </td>
                                </tr>
                                <tr>
                                        <td>{t}Reference{/t}
                                        </td>
                                        <td>
-                                               <input type="text" name="ref" value="{$ref}" {$refACL}>
+                                               <input type="text" name="ref" value="{$ref}">
                                        </td>
                                </tr>
                        </table>
@@ -25,7 +25,7 @@
                                        <td>{t}Comment{/t}
                                        </td>
                                        <td>
-                                               <textarea name="comments" {$commentsACL} style="width:100%;">{$comments}</textarea>     
+                                               <textarea name="comments" style="width:100%;">{$comments}</textarea>    
                                        </td>
                                </tr>
                        </table>
@@ -37,20 +37,20 @@
                     <td>{t}Type{/t}
                     </td>
                     <td>
-                                               <select name="type" {$typeACL}>
+                                               <select name="type" >
                             {html_options values=$typeKeys output=$types selected=$type}
                         </select>
-                        <input type="submit" value="{t}edit{/t}" name="edit_type_cartridge" {$typeACL}>
+                        <input type="submit" value="{t}edit{/t}" name="edit_type_cartridge">
                     </td>
                        </tr>
                 <tr>
                     <td>{t}Manufacturer{/t}
                     </td>
                     <td>
-                                               <select name="FK_glpi_enterprise" {$FK_glpi_enterpriseACL}>
+                                               <select name="FK_glpi_enterprise">
                             {html_options values=$ManufacturerKeys output=$Manufacturers selected=$FK_glpi_enterprise}
                         </select>
-                        <input type="submit" value="{t}edit{/t}" name="edit_manufacturer_cartridges" {$FK_glpi_enterpriseACL}>
+                        <input type="submit" value="{t}edit{/t}" name="edit_manufacturer_cartridges">
                     </td>
                        </tr>
                                <tr>
@@ -58,7 +58,7 @@
                     </td>
                     <td>
                         <i>{$tech_num}&nbsp; </i>&nbsp;
-                        <input type="submit" value="{t}Choose{/t}" name="SelectCartridgeTechPerson" {$tech_numACL}>
+                        <input type="submit" value="{t}Choose{/t}" name="SelectCartridgeTechPerson">
                     </td>
                 </tr>
                        </table>

diff --git a/plugins/admin/systems/goFonServer.tpl b/plugins/admin/systems/goFonServer.tpl
index 84a2571f0931ca566e07bc0c8e1e50539989e339..6300052246013b08d9f0d2bdc3c6145d41560a00 100644 (file)
--- a/plugins/admin/systems/goFonServer.tpl
+++ b/plugins/admin/systems/goFonServer.tpl
@@ -4,7 +4,7 @@
      <td>{t}Asterisk DB user{/t}{$must}</td>
      <td>
 {render acl=$goFonAdminACL}
-      <input name="goFonAdmin" size=30 maxlength=60 id="goFonAdmin" {$goFonAdminACL} value="{$goFonAdmin}">
+      <input name="goFonAdmin" size=30 maxlength=60 id="goFonAdmin" value="{$goFonAdmin}">
 {/render}
      </td>
     </tr>
@@ -12,7 +12,7 @@
      <td>{t}Password{/t}{$must}</td>
      <td>
 {render acl=$goFonPasswordACL}
-      <input type=password name="goFonPassword" id="goFonPassword" size=30 maxlength=60 {$goFonPasswordACL}   value="{$goFonPassword}">
+      <input type=password name="goFonPassword" id="goFonPassword" size=30 maxlength=60 value="{$goFonPassword}">
 {/render}
      </td>
     </tr>
@@ -20,7 +20,7 @@
      <td>{t}Country dial prefix{/t}{$must}</td>
      <td>
 {render acl=$goFonCountryCodeACL}
-      <input name="goFonCountryCode" size=10 maxlength=30 id="goFonCountryCode" {$goFonCountryCodeACL}   value="{$goFonCountryCode}">
+      <input name="goFonCountryCode" size=10 maxlength=30 id="goFonCountryCode" value="{$goFonCountryCode}">
 {/render}
      </td>
     </tr>
@@ -28,7 +28,7 @@
      <td>{t}Local dial prefix{/t}{$must}</td>
      <td>
 {render acl=$goFonAreaCodeACL}
-      <input name="goFonAreaCode" size=10 maxlength=30 id="goFonAreaCode" {$goFonAreaCodeACL}   value="{$goFonAreaCode}">
+      <input name="goFonAreaCode" size=10 maxlength=30 id="goFonAreaCode" value="{$goFonAreaCode}">
 {/render}
      </td>
     </tr>

diff --git a/plugins/admin/systems/goImapServer.tpl b/plugins/admin/systems/goImapServer.tpl
index 958fecf61b4b8a39e5ce0512960c7e33827438e2..34e9374dab70590658f0acdf1593c5632ba728d0 100644 (file)
--- a/plugins/admin/systems/goImapServer.tpl
+++ b/plugins/admin/systems/goImapServer.tpl
@@ -55,7 +55,7 @@
                                <tr>
                                        <td>
 {render acl=$cyrusImapACL}
-                                               <input type='checkbox' name='cyrusImap' value=1 {if $cyrusImap} checked {/if} {$cyrusImapACL}> 
+                                               <input type='checkbox' name='cyrusImap' value=1 {if $cyrusImap} checked {/if} > 
 {/render}
                                        </td>
                                        <td>{t}Start IMAP service{/t}
@@ -64,7 +64,7 @@
                                <tr>
                                        <td>
 {render acl=$cyrusImapSSLACL}
-                                               <input type='checkbox' name='cyrusImapSSL' value=1 {if $cyrusImapSSL} checked {/if} {$cyrusImapSSLACL}> 
+                                               <input type='checkbox' name='cyrusImapSSL' value=1 {if $cyrusImapSSL} checked {/if}> 
 {/render}
                                        </td>
                                        <td>{t}Start IMAP SSL service{/t}
@@ -73,7 +73,7 @@
                                <tr>
                                        <td>
 {render acl=$cyrusPop3ACL}
-                                               <input type='checkbox' name='cyrusPop3' value=1 {if $cyrusPop3} checked {/if} {$cyrusPop3ACL}> 
+                                               <input type='checkbox' name='cyrusPop3' value=1 {if $cyrusPop3} checked {/if} > 
 {/render}
                                        </td>
                                        <td>{t}Start POP3 service{/t}
@@ -82,7 +82,7 @@
                                <tr>
                                        <td>
 {render acl=$cyrusPop3SSLACL}
-                                               <input type='checkbox' name='cyrusPop3SSL' value=1 {if $cyrusPop3SSL} checked {/if} {$cyrusPop3SSLACL}> 
+                                               <input type='checkbox' name='cyrusPop3SSL' value=1 {if $cyrusPop3SSL} checked {/if} > 
 {/render}
                                        </td>
                                        <td>{t}Start POP3 SSL service{/t}

diff --git a/plugins/admin/systems/goTerminalServer.tpl b/plugins/admin/systems/goTerminalServer.tpl
index 524640f6c0d38a76e3ee65d0fd42bcdd00503820..0a8807fe47dc2af479a0683b53ef61d13c7027c3 100644 (file)
--- a/plugins/admin/systems/goTerminalServer.tpl
+++ b/plugins/admin/systems/goTerminalServer.tpl
@@ -12,7 +12,7 @@
      <td>{t}Font path{/t}</td>
      <td> 
 {render acl=$goXdmcpIsEnabledACL}
-      <input type="text" value="{$goFontPath}" name="goFontPath" {$goXdmcpIsEnabledACL}  id="FontPathId">
+      <input type="text" value="{$goFontPath}" name="goFontPath" id="FontPathId">
 {/render}
      </td>
     </tr>

diff --git a/plugins/admin/systems/network.tpl b/plugins/admin/systems/network.tpl
index 7a1bd8fa184de24a6cd816718466cdb5eb32fa0d..eeac9230cefed11185f2dc8eaf278f146387c80d 100644 (file)
--- a/plugins/admin/systems/network.tpl
+++ b/plugins/admin/systems/network.tpl
@@ -37,7 +37,7 @@
                <td     style="width:50%;vertical-align:top;border-left:1px solid #b0b0b0;" valign="top">
       <input type="checkbox" name="enableDNS" value="1" 
 
-        {if !$accountACL}
+        {if !$accountACL}  <!-- render as disabled if we have no permissions -->
           disabled
         {/if}
 

diff --git a/plugins/admin/systems/servnfs.tpl b/plugins/admin/systems/servnfs.tpl
index c749639ddd8a70a87f3e0f2bdbbdb7bb909b595f..9fb70a5f49520e77149b06577cde228b40a21e99 100644 (file)
--- a/plugins/admin/systems/servnfs.tpl
+++ b/plugins/admin/systems/servnfs.tpl
@@ -10,7 +10,7 @@
                                        </td>
                                        <td>
 {render acl=$nameACL}
-                                               <input type="text" name="name" value="{$name}" {$nameACL}>
+                                               <input type="text" name="name" value="{$name}" >
 {/render}
                                        </td>
                                </tr>
@@ -64,7 +64,7 @@
                                                {if $allow_mounts == TRUE}
                                                <br><br>
 {render acl=$netatalkmountACL}
-                                               <input type="checkbox" name="netatalk_mount" id="netatalk_mount" {$mount_checked} {$appleMountsACL}/>
+                                               <input type="checkbox" name="netatalk_mount" id="netatalk_mount" {$mount_checked} />
 {/render}
                                                <label for="netatalk_mount">{t}Auto-mount share on Apple systems{/t}</label>
                                                        <br>

diff --git a/plugins/admin/systems/terminal.tpl b/plugins/admin/systems/terminal.tpl
index 794a27ed84ac857820a9db8b2492dd26f607bb4a..fde61c6bb1717011c2ff9bf4b7e9dd75ee24120c 100644 (file)
--- a/plugins/admin/systems/terminal.tpl
+++ b/plugins/admin/systems/terminal.tpl
@@ -114,11 +114,11 @@
       </select>
 {/render}
 {render acl=$gotoNtpServerACL}
-               <input type="submit" name="addNtpServer" value="{t}Add{/t}"             id="addNtpServer" {$gotoNtpServerACL}
+               <input type="submit" name="addNtpServer" value="{t}Add{/t}"             id="addNtpServer"
                 {if $inheritTimeServer} disabled {/if}>
 {/render}
 {render acl=$gotoNtpServerACL}
-               <input type="submit" name="delNtpServer" value="{t}Delete{/t}"  id="delNtpServer" {$gotoNtpServerACL}
+               <input type="submit" name="delNtpServer" value="{t}Delete{/t}"  id="delNtpServer" 
                 {if $inheritTimeServer} disabled {/if}>
 {/render}
      </td>