Updated remaining attributes

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

diff --git a/gosa-core/FAQ b/gosa-core/FAQ
index fde2a3a8fee4cdd0958f8b37e8fb0bc321813129..b662504fd824038b18ef223615274c4c3fb55fb0 100644 (file)
--- a/gosa-core/FAQ
+++ b/gosa-core/FAQ
@@ -415,7 +415,7 @@ A: You can set a nesting limit which ensures that the user names will not be
 Q: I want to disable the "Is the configuration file up to date?" check when logging in.
    How can I disable this check?
 
-A: Just set the config_version attribute to an empty value:
+A: Just set the configVersion attribute to an empty value:
    <conf configVersion="" >
 
 

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index bd92ebcef1a7f6ac538f1b9100683a2846a437a0..f846184d09597653cdbc7184427ff0782dddae4e 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -35,7 +35,7 @@
     <section name="My account">
       <plugin acl="users/user:self" class="user" />
       <plugin acl="users/posixAccount:self"  class="posixAccount" />
-      <plugin acl="users/environment:self" class="environment" {if $cv.optional.kioskpath_active} kioskpath="{$cv.optional.kioskpath}"{/if} />
+      <plugin acl="users/environment:self" class="environment" {if $cv.optional.kioskpath_active} kioskPath="{$cv.optional.kioskpath}"{/if} />
       <plugin acl="users/mailAccount:self" class="mailAccount" />
       <plugin acl="users/sambaAccount:self" class="sambaAccount" />
 {if $cv.use_netatalk}
@@ -65,9 +65,9 @@
 {/if}
       <plugin acl="devices" class="deviceManagement" />
       <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric" class="systems" />
-      <!-- Use 'lock_dn'      for dn
-        'lock_name'    for name
-        'lock_type'    for branch/freeze -->
+      <!-- Use 'lockDn'      for dn
+               'lockName'    for name
+               'lockType'    for branch/freeze -->
 {if $cv.enableFAI_management}
       <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile" class="faiManagement" />
 {else}
@@ -184,7 +184,7 @@
      <tab class="termstartup" name="Startup" />
      <tab class="termservice" name="Devices" />
      <tab class="printgeneric" name="Printer" />
-     <tab class="terminfo" name="Information" snmpcommunity="{$cv.optional.snmpcommunity}" />
+     <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <!--<tab class="glpiAccount" name="Inventory" /> -->
   </termtabs>
 
@@ -199,7 +199,7 @@
      <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
      <!-- <tab class="goto_log_view" name="Installation logs" /> -->
 {/if}
-     <tab class="terminfo" name="Information" snmpcommunity="{$cv.optional.snmpcommunity}" />
+     <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </servtabs>
 
@@ -208,7 +208,7 @@
      <tab class="workstartup" name="Startup" />
      <tab class="workservice" name="Devices" />
      <tab class="printgeneric" name="Printer" />
-     <tab class="terminfo" name="Information" snmpcommunity="{$cv.optional.snmpcommunity}" />
+     <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
 {if $cv.enableFAI_management}
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="goto_log_view" name="Installation logs" />
@@ -311,11 +311,11 @@
       username="OGo"
       password=""
       database="OGo"
-      datahost="localhost" />
+      databaseServer="localhost" />
     -->
     <tab class="pptpAccount" /> 
     <tab class="phpscheduleitAccount" /> 
-        <tab class="oxchangeAccount" />
+    <tab class="oxchangeAccount" />
   </connectivity>
 
   <ldiftab>
@@ -421,9 +421,9 @@
         passwordHook="{$cv.pwd_rules.externalpwdhook}"
 {/if}
 {if $cv.errorlvl}
-        displayerrors="true"
+        displayErrors="true"
 {else}
-        displayerrors="false"
+        displayErrors="false"
 {/if}
 {if $cv.enable_schema_check}
         schemaCheck="true"
@@ -431,94 +431,94 @@
         schemaCheck="false"
 {/if}
 {if $cv.generic_settings.enableCopyPaste}
-        enableCopyPaste="true"
+        copyPaste="true"
 {else}
-        enableCopyPaste="false"
+        copyPaste="false"
 {/if}
 {if $cv.optional.forceglobals}
-        forceglobals="true"
+        forceGlobals="true"
 {else}
-        forceglobals="false"
+        forceGlobals="false"
 {/if}
 {if $cv.optional.forcessl}
-        forcessl="true"
+        forceSSL="true"
 {else}
-        forcessl="false"
+        forceSSL="false"
 {/if}
 {if $cv.optional.ldapstats}
-        ldapstats="true"
+        ldapStats="true"
 {else}
-        ldapstats="false"
+        ldapStats="false"
 {/if}
 {if $cv.optional.warnssl}
-        warnssl="true"
+        warnSSL="true"
 {else}
-        warnssl="false"
+        warnSSL="false"
 {/if}
 {if $cv.optional.ppd_path_active}
-       ppd_path="{$cv.optional.ppd_path}"
+       ppdPath="{$cv.optional.ppd_path}"
 {/if}
 {if $cv.optional.max_ldap_query_time_active}  
-       max_ldap_query_time="{$cv.optional.max_ldap_query_time}"
+       ldapMaxQueryTime="{$cv.optional.max_ldap_query_time}"
 {/if}
 {if $cv.optional.noprimarygroup}
-       noprimarygroup="true"
+       primaryGroupFilter="true"
 {/if}
 {if $cv.optional.mailQueueScriptPath_active}
        mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
 {/if}
 {if $cv.optional.user_filter_cookie}
-       save_filter="true"
+       storeFilterSettings="true"
 {else}
-       save_filter="false"
+       storeFilterSettings="false"
 {/if}
 {if $cv.compressed}
-       compressed="true"
+       sendCompressedOutput="true"
 {else}
-       compressed="false"
+       sendCompressedOutput="false"
 {/if}
 {if $cv.optional.uniq_identifier_active }
-       uniq_identifier="{$cv.optional.uniq_identifier}"
+       modificationDetectionAttribute="{$cv.optional.uniq_identifier}"
 {else}
-       uniq_identifier=""
+       modificationDetectionAttribute=""
 {/if}
-       lang="{$cv.lang_selected}"
+       language="{$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}'
+       sessionLifetime="{$cv.optional.session_lifetime}"
+       templateCompileDirectory="{$cv.optional.compile}"
+       debugLevel="{$cv.optional.debuglevel}"
+       sambaHashHook='{$cv.samba_settings.smbhash}'
     >
 
     <!-- Location definition -->
     <location name="{$cv.location}"
-              hash="{$cv.encryption}"
-              dnmode="{$cv.peopledn}"
-              people="{$cv.peopleou}"
-              groups="{$cv.groupou}"
-              gidbase="{$cv.uidbase}"
-              uidbase="{$cv.uidbase}"
+              passwordDefaultHash="{$cv.encryption}"
+              accountPrimaryAttribute="{$cv.peopledn}"
+              userSubtree="{$cv.peopleou}"
+              groupSubtree="{$cv.groupou}"
+              gidNumberBase="{$cv.uidbase}"
+              uidNumberBase="{$cv.uidbase}"
               logging="{$cv.generic_settings.logging}"
 {if $cv.optional.sudoou_active}
-              sudoou="{$cv.optional.sudoou}"
+              sudoSubtree="{$cv.optional.sudoou}"
 {/if}
 {if $cv.optional.login_attribute}
-              login_attribute="{$cv.optional.login_attribute}"
+              loginAttribute="{$cv.optional.login_attribute}"
 {else}
-              login_attribute="uid"
+              loginAttribute="uid"
 {/if}
 {if $cv.timezone}
               timezone="{$cv.timezone}"
 {/if}
 {if $cv.optional.strict_units}
-              strict_units="true"
+              honourUnitTags="true"
 {else}
-              strict_units="false"
+              honourUnitTags="false"
 {/if}
 {if $cv.krbsasl}
-              krbsasl="true"
+              useSaslForKerberos="true"
 {else}
-              krbsasl="false"
+              useSaslForKerberos="false"
 {/if}
 {if $cv.rfc2307bis}
               rfc2307bis="true"
@@ -526,23 +526,23 @@
               rfc2307bis="false"
 {/if}
 {if $cv.include_personal_title}
-              include_personal_title="true"
+              personalTitleInDN="true"
 {else}
-              include_personal_title="false"
+              personalTitleInDN="false"
 {/if}
 {if $cv.base_hook_active}
-              base_hook="{$cv.base_hook}"
+              nextIdHook="{$cv.base_hook}"
 {/if}
 {if $cv.generic_settings.wws_ou_active}
-              winstations="{$cv.generic_settings.wws_ou}"
+              sambaMachineAccountBase="{$cv.generic_settings.wws_ou}"
 {/if}
 {if $cv.id_settings.idgen_active}
-              idgen="{$cv.id_settings.idgen}"
+              idGenerator="{$cv.id_settings.idgen}"
 {/if}
 {if $cv.strict}
-              strict="yes"
+              strictNamingRules="true"
 {else}
-              strict="no"
+              strictNamingRules="false"
 {/if}
 {if $cv.id_settings.minid_active}
               minid="{$cv.id_settings.minid}"
@@ -550,60 +550,60 @@
 {if $cv.mail != "disabled"}
               mailMethod="{$cv.mail}"
 {if $cv.cyrusunixstyle}
-              cyrusunixstyle="true"
+              cyrusUseSlashes="true"
 {else}
-              cyrusunixstyle="false"
+              cyrusUseSlashes="false"
 {/if}
-              mail_attrib="{$cv.mail_attrib}"
+              mailAttribute="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
-              vacationdir="{$cv.mail_settings.vacationdir}"
+              vacationTemplateDirectory="{$cv.mail_settings.vacationdir}"
 {/if}
 {/if}
 {if $cv.tls}
-              tls="true"
+              ldapTLS="true"
 {/if}
 {if $cv.governmentmode}
-              governmentmode="true"
+              honourIvbbAttributes="true"
 {else}
-              governmentmode="false"
+              honourIvbbAttributes="false"
 {/if}
 {if $cv.sambaidmapping}
-              sambaidmapping="true"
+              sambaIdMapping="true"
 {/if}
 {if $cv.account_expiration}
-              account_expiration="true"
+              handleExpiredAccounts="true"
 {/if}
 {if $cv.samba_settings.samba_sid_active}
-              SID="{$cv.samba_settings.samba_sid}"
+              sambaSID="{$cv.samba_settings.samba_sid}"
 {/if}
 {if $cv.samba_settings.samba_rid_active}
-              RIDBASE="{$cv.samba_settings.samba_rid_active}"
+              sambaRidBase="{$cv.samba_settings.samba_rid_active}"
 {/if}
 {if $cv.generic_settings.snapshot_active}  
-              enable_snapshot="true"
+              enableSnapshots="true"
 {if $cv.generic_settings.snapshot_base != ""}
-              snapshot_base="{$cv.generic_settings.snapshot_base}"
+              snapshotBase="{$cv.generic_settings.snapshot_base}"
 {/if}
 {if $cv.generic_settings.snapshot_user != ""}
-              snapshot_user="{$cv.generic_settings.snapshot_user}"
+              snapshotAdminDn="{$cv.generic_settings.snapshot_user}"
 {/if}
 {if $cv.generic_settings.snapshot_password != ""}
-              snapshot_password="{$cv.generic_settings.snapshot_password}"
+              snapshotAdminPassword="{$cv.generic_settings.snapshot_password}"
 {/if}
 {if $cv.generic_settings.snapshot_server != ""}
-              snapshot_server="{$cv.generic_settings.snapshot_server}"
+              snapshotURI="{$cv.generic_settings.snapshot_server}"
 {/if}
 {/if}
 {if $cv.samba_version != 0}
-              sambaversion="{$cv.samba_version}"
+              sambaVersion="{$cv.samba_version}"
 {else}
-              sambaversion="3"
+              sambaVersion="3"
 {/if}
-              config="ou=gosa,ou=configs,ou=systems,{$cv.base}">
+              configBase="ou=gosa,ou=configs,ou=systems,{$cv.base}">
 
-              <referral url="{$cv.connection}/{$cv.base}"
-                       admin="{$cv.admin}"
-                       password="{$cv.password}" />
+              <referral URI="{$cv.connection}/{$cv.base}"
+                        adminDn="{$cv.admin}"
+                        adminPassword="{$cv.password}" />
 
     </location>
   </main>

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index 75724ba78226ca2e02335c6b8f46295547824931..c6cd24ee2f8e56aa77fe7f3b83f4a86820469496 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -263,11 +263,11 @@ or
 .I both.
 .PP
 
-.B enableCopyPaste
+.B copyPaste
 .I bool
 .PP
 The
-.I enableCopyPaste
+.I copyPaste
 statement enables copy and paste for LDAP entries managed with GOsa.
 .PP
 
@@ -423,7 +423,7 @@ can be used if you want to use i.e. kerberos to authenticate the users.
 .PP
 
 .B gosa_si
-.I bool
+.I URI
 .PP
 The
 .I gosa_si

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 342d9a3b7295fa70cb7bfac835705b139023074e..6f0b1699f14b17136ef4a1d5d00c24081f3544e6 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -61,7 +61,7 @@ function displayLogin()
 
   if(!$config->check_session_lifetime()){
     $smarty->assign ("lifetime", _("Warning").": ".
-                                 _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
+        _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
   }else{
     $smarty->assign ("lifetime", "");
   }
@@ -161,7 +161,7 @@ $smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa');
 /* Check for compile directory */
 if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
   msg_dialog::display(_("Smarty error"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
-    $smarty->compile_dir),FATAL_ERROR_DIALOG);
+        $smarty->compile_dir),FATAL_ERROR_DIALOG);
   exit();
 }
 
@@ -256,8 +256,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
 
   /* Check for schema file presence */
   #TODO: these three lines should go to the class_config.inc, shouldn't they?
-  if(!isset($config->data['MAIN']['SCHEMA_CHECK'])){
-    $config->data['MAIN']['SCHEMA_CHECK'] = "true";
+  if(!isset($config->data['MAIN']['SCHEMACHECK'])){
+    $config->data['MAIN']['SCHEMACHECK'] = "true";
   }
   if ($config->get_cfg_value("schemaCheck") == "true"){
     $recursive = ($config->get_cfg_value("recursive") == "true");
@@ -306,7 +306,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
       $ok= false;
     }
   }
-  
+
   if ($ok) {
 
     /* Login as user, initialize user ACL's */
@@ -454,7 +454,7 @@ if (session::is_set('errors') && session::get('errors') != ""){
 $smarty->assign("focus", $focus);
 displayLogin();
 
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+// vim:tabstop=2:expandtab:shiftwidth=2:softtabstop=2:filetype=php:syntax:ruler:
 ?>
 
 </body>

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index d997499044573ea5ae6be8f7aa8282cb38d28703..9b789f7d304de1b0e285d3597b3bd0c2ea8c11a2 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -137,7 +137,7 @@ class config  {
     /* Trigger on CONF section */
     if ($tag == 'CONF'){
       $this->config_found= TRUE;
-      if(isset($attrs['CONFIG_VERSION'])){
+      if(isset($attrs['CONFIGVERSION'])){
         $this->config_version = $attrs['CONFIGVERSION'];
       }
     }

diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc
index 0b87aefd0503152a42ea09bcbbd811f70ceb4b4a..09483d2c42da11fdd6f9fa2452690bebca838fe1 100644 (file)
--- a/gosa-core/plugins/admin/acl/class_aclManagement.inc
+++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc
@@ -45,7 +45,7 @@ class aclManagement extends plugin
     $this->ui     = &$ui;
 
     /* Copy & Paste enabled ?*/
-    if ($this->config->get_cfg_value("enablecopypaste") == "true"){
+    if ($this->config->get_cfg_value("copyPaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
 

diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc
index decaf8053f424d7a02b1408e1bb2e57313201c46..58db24e8ded83f06cc1c2f4eebcd566b5ea2bcd0 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupManagement.inc
+++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc
@@ -44,7 +44,7 @@ class groupManagement extends plugin
     $this->ui     = &$ui;
 
     /* Copy & Paste enabled ?*/
-    if($this->config->get_cfg_value("enablecopypaste") == "true"){
+    if($this->config->get_cfg_value("copyPaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
     

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index 6a5801781932d8242c3b84416bfbd47694f1b61c..77e5c65344a4fb20816ef9dbeddf700304150c76 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -47,7 +47,7 @@ class ogroupManagement extends plugin
 
     /* Copy & Paste enabled ?
      */
-    if ($this->config->get_cfg_value("enablecopypaste") == "true"){
+    if ($this->config->get_cfg_value("copyPaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
 

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 8114ef094fcf2b04fc257f32903bf181a9a3256b..bd26203f9d195d6b7c7dc88eace62a36484640f3 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -50,7 +50,7 @@ class userManagement extends plugin
     $this->ui= &$ui;
 
     /* Copy & Paste handler */
-    if ($this->config->boolValueIsTrue("main", "enableCopyPaste")){
+    if ($this->config->boolValueIsTrue("main", "copyPaste")){
       $this->CopyPasteHandler= new CopyPasteHandler($this->config);
     }
 

diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
index 2a4eb0b42ba34b6ec916301cb6f60bfd6bdca9ff..6f39cfdb1521fa9d0dbbca1c926678d1108c7b44 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
@@ -77,7 +77,7 @@ class faiManagement extends plugin
     $this->DivListFai = new divListFai($this->config,$this);
 
     /* Copy & Paste handler */
-    if ($this->config->boolValueIsTrue("main", "enableCopyPaste")){
+    if ($this->config->boolValueIsTrue("main", "copyPaste")){
       $this->CopyPasteHandler= new CopyPasteHandler($this->config);
     }
 

diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
index 5903800e9021b620b6718922725ff37a08b7904b..d7265abe95aa4d31fc6dee2648f54489b32d9efd 100644 (file)
--- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
@@ -23,7 +23,7 @@ class blocklist extends plugin
     $this->DivListBlocklist = new divListBlocklist($this->config,$this);
 
     /* Initialize copy&paste queue */
-    if ($this->config->boolValueIsTrue("main", "enableCopyPaste")){
+    if ($this->config->boolValueIsTrue("main", "copyPaste")){
       $this->CopyPasteHandler= new CopyPasteHandler($this->config);
     }
   }

diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
index a723ed5b49f44c791c60d68a46c25b2ca28af82b..685c6c580c794a1648bf0c7d30417b1171ea66b7 100644 (file)
--- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
@@ -49,7 +49,7 @@ class phoneConferenceManagment extends plugin
     $this->DivListConference = new divListConference($this->config,$this);
 
     /* Copy & Paste enabled ?*/
-    if ($this->config->get_cfg_value("enablecopypaste") == "true"){
+    if ($this->config->get_cfg_value("copyPaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
   }

diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
index 44b95fa001a8b2fb76b09a8242f4b86a7a81e14e..04a665f7c54f8935c23c6c17557953528a8cdf0b 100644 (file)
--- a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
+++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
@@ -48,7 +48,7 @@ class goFonMacro extends plugin
     $this->DivListMacro = new divListMacro($this->config,$this);
 
     /* Copy & Paste enabled ?*/
-    if ($this->config->get_cfg_value("enablecopypaste") == "true"){
+    if ($this->config->get_cfg_value("copyPaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
   }

diff --git a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
index b3cce2714d6758782a92f3142bbd75291551ec11..bf332fed67a4135eee35fc88da6a97963f8fc740 100644 (file)
--- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
+++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
@@ -58,7 +58,7 @@ class applicationManagement extends plugin
     $this->ui       = &$ui;
 
     /* Check if copy & paste is activated */
-    if($this->config->boolValueIsTrue("MAIN","ENABLECOPYPASTE")){
+    if($this->config->boolValueIsTrue("MAIN","COPYPASTE")){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
 

diff --git a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
index bad85579630b913a56f01cc123720df89aed3c73..08921f09ce7a6fa40fff49dbc417cc0d7beba68e 100644 (file)
--- a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
+++ b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
@@ -27,7 +27,7 @@ class deviceManagement extends plugin
     $this->ui = get_userinfo();  
 
     /* Check if copy & paste is activated */
-    if($this->config->get_cfg_value("enablecopypaste") == "true"){
+    if($this->config->get_cfg_value("copyPaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
 

diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
index 989e276a00757540f38b0c2c804796d9bbbc46c7..1621ce3b3f7c1544817bf128d71ab626c1f61b2c 100644 (file)
--- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
+++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
@@ -57,7 +57,7 @@ class mimetypeManagement extends plugin
     $this->ui       = &$ui;
 
     /* Check if copy & paste is activated */
-    if($this->config->get_cfg_value("enablecopypaste")){
+    if($this->config->get_cfg_value("copyPaste")){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
 

diff --git a/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc b/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc
index 85e59850e53b9b2472b4d6fe8122bc9d37f2dd50..1ae560bc45f4012123dce13a72b4d677f67a572e 100644 (file)
--- a/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc
+++ b/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc
@@ -49,7 +49,7 @@ class sudoManagement extends plugin
     $this->base   = sudo::get_sudoers_ou($this->config);
 
     /* Copy & Paste enabled ?*/
-    if ($this->config->get_cfg_value("enablecopypaste") == "true"){
+    if ($this->config->get_cfg_value("copyPaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }
 

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index 265ea4ab023d9bd8e276cedd999c971ce24f93c9..61e2f725df32cc3bb24328fe9b183fcd1af53562 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -66,7 +66,7 @@ class systems extends plugin
     $this->DivListSystem = new divListSystem($this->config,$this);
 
     /* Copy & Paste enabled ?*/
-    if ($this->config->get_cfg_value("enablecopypaste") == "true"){
+    if ($this->config->get_cfg_value("copyPaste") == "true"){
       $this->CopyPasteHandler = new CopyPasteHandler($this->config);
     }