removed _ from acls names

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

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 86ec869e64ccb72973a34d0713d51a1accb3aa4c..d8de502df30c4b128b1d5c14340466ca06c41a37 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -26,11 +26,11 @@ class environment extends plugin
   var $gotoProfileServer  = "";     // Specifies the selected profile server
   var $gotoProfileServers = array();// Specifies all available and selectable servers
   var $gotoProfileFlags   = "";     // Flags enabled  ? only used to set ACL and save 
-  var $gotoProfileFlag_C  = "";     // Flag is set to C if we have the profile caching fucntion enabled 
+  var $gotoProfileFlagC  = "";     // Flag is set to C if we have the profile caching fucntion enabled 
   
   var $gotoXResolution    = "auto";     // The selected resolution eg: 1024x768
   var $gotoXResolutions   = array();// Contains all available resolutions for this account
-  var $gotoProfileFlag_L  = "";     // Flag is set to L to enable runtime resolution change 
+  var $gotoProfileFlagL  = "";     // Flag is set to L to enable runtime resolution change 
   var $gotoProfileQuota   = "";     // User Quota Settings
 
   /* Logon script section*/
@@ -61,7 +61,7 @@ class environment extends plugin
   /* general settings */
   // Sets the attributes which will kept on page reload, which will be saved, ...
 
-  var $CopyPasteVars      = array("gotoHotplugDevices","newKioskProfiles","gotoAvailableShares","gotoShareSelections","gotoPrinterSel","gotoProfileFlag_L","gotoXResolutions","gotoProfileFlag_C","gotoProfileServers","useProfile","is_group","in_dialog","OrigCn");
+  var $CopyPasteVars      = array("gotoHotplugDevices","newKioskProfiles","gotoAvailableShares","gotoShareSelections","gotoPrinterSel","gotoProfileFlagL","gotoXResolutions","gotoProfileFlagC","gotoProfileServers","useProfile","is_group","in_dialog","OrigCn");
 
   var $attributes         = array("uid","gotoProfileServer","gotoProfileFlags",
                                     "gotoXResolution","gotoProfileQuota",
@@ -186,11 +186,11 @@ class environment extends plugin
 
     for($i = 0 ; $i < strlen($this->gotoProfileFlags) ; $i ++){
       $chr = $this->gotoProfileFlags[$i];
-      $name = "gotoProfileFlag_".$chr;
+      $name = "gotoProfileFlag".$chr;
       $this->$name=$chr;
     }
 
-    if((!empty($this->gotoProfileServer))||($this->gotoProfileFlag_C=="C")){
+    if((!empty($this->gotoProfileServer))||($this->gotoProfileFlagC=="C")){
       $this->useProfile = true;
     }else{
       $this->useProfile = false;
@@ -401,10 +401,10 @@ class environment extends plugin
     $smarty->assign("useProfileACL","");
     if($this->acl != "#none#"){
       $smarty->assign("useProfileACL","");
-      $smarty->assign("gotoProfileFlag_CACL"," ");
+      $smarty->assign("gotoProfileFlagCACL"," ");
       $smarty->assign("gotoProfileQuotaACL"," ");
     }else{
-      $smarty->assign("gotoProfileFlag_CACL"," disabled ");
+      $smarty->assign("gotoProfileFlagCACL"," disabled ");
       $smarty->assign("useProfileACL","disabled");
       $smarty->assign("gotoProfileServer"," disabled ");
       $smarty->assign("gotoProfileQuotaACL"," disabled ");
@@ -417,16 +417,16 @@ class environment extends plugin
      * Assign this all to Smarty 
      */
 
-    if(empty($this->gotoProfileFlag_L)){
-      $smarty->assign("gotoProfileFlag_LCHK"," ");
+    if(empty($this->gotoProfileFlagL)){
+      $smarty->assign("gotoProfileFlagLCHK"," ");
     }else{
-      $smarty->assign("gotoProfileFlag_LCHK"," checked ");
+      $smarty->assign("gotoProfileFlagLCHK"," checked ");
     }
 
-    if(empty($this->gotoProfileFlag_C)){
-      $smarty->assign("gotoProfileFlag_CCHK"," ");
+    if(empty($this->gotoProfileFlagC)){
+      $smarty->assign("gotoProfileFlagCCHK"," ");
     }else{
-      $smarty->assign("gotoProfileFlag_CCHK"," checked ");
+      $smarty->assign("gotoProfileFlagCCHK"," checked ");
     }
 
 
@@ -792,13 +792,13 @@ class environment extends plugin
     if($this->acl != "#none#"){
       $smarty->assign("useProfileACL","");
     }else{
-      $smarty->assign("gotoProfileFlag_CACL"," disabled ");
+      $smarty->assign("gotoProfileFlagCACL"," disabled ");
       $smarty->assign("gotoProfileServerACL"," disabled ");
       $smarty->assign("gotoProfileQuotaACL"," disabled ");
     }
 
     if(!$this->useProfile){
-      $smarty->assign("gotoProfileFlag_CACL"," disabled ");
+      $smarty->assign("gotoProfileFlagCACL"," disabled ");
       $smarty->assign("gotoProfileServerACL"," disabled ");
       $smarty->assign("gotoProfileQuotaACL"," disabled ");
     }
@@ -855,15 +855,15 @@ class environment extends plugin
       }else{
         $this->useProfile = false;
       }
-      if(isset($_POST['gotoProfileFlag_C'])){
-        $this->gotoProfileFlag_C = $_POST['gotoProfileFlag_C'];
+      if(isset($_POST['gotoProfileFlagC'])){
+        $this->gotoProfileFlagC = $_POST['gotoProfileFlagC'];
       }else{
-        $this->gotoProfileFlag_C = false;
+        $this->gotoProfileFlagC = false;
       }
-      if(isset($_POST['gotoProfileFlag_L'])){
-        $this->gotoProfileFlag_L = $_POST['gotoProfileFlag_L'];
+      if(isset($_POST['gotoProfileFlagL'])){
+        $this->gotoProfileFlagL = $_POST['gotoProfileFlagL'];
       }else{
-        $this->gotoProfileFlag_L = false;
+        $this->gotoProfileFlagL = false;
       }
 
       $tmp= $this->gosaDefaultPrinter;
@@ -1046,7 +1046,7 @@ class environment extends plugin
     }
  
     /* Prepare Flags */
-    $this->attrs['gotoProfileFlags'] = array($this->gotoProfileFlag_C.$this->gotoProfileFlag_L);
+    $this->attrs['gotoProfileFlags'] = array($this->gotoProfileFlagC.$this->gotoProfileFlagL);
     if(empty($this->attrs['gotoProfileFlags'][0])){
       $this->attrs['gotoProfileFlags']=array();
       }
@@ -1164,8 +1164,8 @@ function printOutHotPlugDevices()
 
                   "plProvidedAcls"  => array(
                     "gotoProfileServer"   => _("Profile server") ,
-                    "gotoProfileFlag_L"   => _("Resolution changeable during session") ,
-                    "gotoProfileFlag_C"   => _("Cache profile localy") ,
+                    "gotoProfileFlagL"    => _("Resolution changeable during session") ,
+                    "gotoProfileFlagC"    => _("Cache profile localy") ,
                     "gotoXResolution"     => _("Resolution") ,
                     "gotoProfileQuota"    => _("Profile quota") ,
                     "gotoLogonScripts"    => _("Logon script") ,

diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl
index 98cb43bebfe15595d1df9f9c0045f82c39c18b1e..45d68fef187c630e4e980f79fbb439b8e98df384 100644 (file)
--- a/plugins/personal/environment/environment.tpl
+++ b/plugins/personal/environment/environment.tpl
@@ -12,7 +12,7 @@
                                <tr>
                                        <td style="vertical-align:top">
                                                <input class="center" type="checkbox" value="1" {$useProfileCHK} name="useProfile" {$useProfileACL} id="useProfile"
-                                                                       onclick="changeState('gotoProfileServer');changeState('gotoProfileFlag_C');changeState('gotoProfileQuota');">
+                                                                       onclick="changeState('gotoProfileServer');changeState('gotoProfileFlagC');changeState('gotoProfileQuota');">
                                        </td>
                                        <td style="vertical-align:middle;">
                                                <label for="useProfile">{t}Use profile managment{/t}</label>
@@ -49,9 +49,9 @@
                                                        </tr>
                                                        <tr>
                                                                <td colspan=2>  
-                                                                       <input class="center" type="checkbox" name="gotoProfileFlag_C" value="C" {$gotoProfileFlag_CCHK}
-                                                                               id="gotoProfileFlag_C" {$gotoProfileFlag_CACL}>&nbsp;
-                                                                       <label for="gotoProfileFlag_C">{t}Cache profile localy{/t}</label>
+                                                                       <input class="center" type="checkbox" name="gotoProfileFlagC" value="C" {$gotoProfileFlagCCHK}
+                                                                               id="gotoProfileFlagC" {$gotoProfileFlagCACL}>&nbsp;
+                                                                       <label for="gotoProfileFlagC">{t}Cache profile localy{/t}</label>
                                                                </td>
                                                        </tr>
                                                </table>
@@ -75,11 +75,11 @@
                                <tr>
                                        <td colspan=2>
                                                <br>
-                                               <input type="checkbox" name="gotoProfileFlag_L" id="gotoProfileFlag_L" value="L"  {$gotoProfileFlag_LCHK}
+                                               <input type="checkbox" name="gotoProfileFlagL" id="gotoProfileFlagL" value="L"  {$gotoProfileFlagLCHK}
                                                        {if $gotoProfileFlagsACL=="disabled"}
                                                                disabled 
                                                        {/if}>
-                                               <label for="gotoProfileFlag_L">{t}Resolution changeable during session{/t}</label>
+                                               <label for="gotoProfileFlagL">{t}Resolution changeable during session{/t}</label>
                                        </td>
                                </tr>
                                <tr>