[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c0802a2)
* Updated spelling
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 6 Jul 2007 13:08:34 +0000 (13:08 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 6 Jul 2007 13:08:34 +0000 (13:08 +0000)
* Added workaround for gidNumber

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

14 files changed:
plugins/admin/applications/class_divListApplication.inc patch | blob | history
plugins/admin/departments/class_divListDepartment.inc patch | blob | history
plugins/admin/fai/class_divListFai.inc patch | blob | history
plugins/admin/groups/class_divListGroup.inc patch | blob | history
plugins/admin/mimetypes/class_divListMimeTypes.inc patch | blob | history
plugins/admin/ogroups/class_divListOGroup.inc patch | blob | history
plugins/admin/ogroups/ogroup_objects.tpl patch | blob | history
plugins/admin/users/class_divListUsers.inc patch | blob | history
plugins/gofax/blocklists/class_divListBlocklists.inc patch | blob | history
plugins/gofon/conference/class_divListConferences.inc patch | blob | history
plugins/gofon/macro/class_divListMacros.inc patch | blob | history
plugins/personal/environment/selectPrinterDialog.tpl patch | blob | history
plugins/personal/posix/class_posixAccount.inc patch | blob | history
plugins/personal/posix/posix_groups.tpl patch | blob | history

diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc
index c6e339eb3cdd57654b2d72886d3a0577ce2f4e93..182044c7e0de70f0c4ce907d8b94e21dc4d0653a 100755 (executable)
--- a/plugins/admin/applications/class_divListApplication.inc
+++ b/plugins/admin/applications/class_divListApplication.inc
@@ -45,7 +45,7 @@ class divListApplication extends MultiSelectWindow
     $this->AddHeader(array("string" => _("Actions"),            "attach" => "style='width:80px;border-right:0px;text-align:right;'"));
 
     /* Add SubSearch checkbox */
-    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Search in subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Display users matching"),"*" , true);
diff --git a/plugins/admin/departments/class_divListDepartment.inc b/plugins/admin/departments/class_divListDepartment.inc
index 04898971f3815e1d906952bf5053cb0d43628766..077e14df42faa0073080f0af3f013fae0c8dcfcb 100755 (executable)
--- a/plugins/admin/departments/class_divListDepartment.inc
+++ b/plugins/admin/departments/class_divListDepartment.inc
@@ -43,7 +43,7 @@ class divListDepartment extends MultiSelectWindow
 
 
     /* Add SubSearch checkbox */    
-    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Search in subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Regular expression for matching group names"), "*" , true);
diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc
index 0a51b32d8f0f7a21a36c4e1edb9074d497252133..41dd8dcdfbcd1a3473483cdee56662488aa2ca47 100644 (file)
--- a/plugins/admin/fai/class_divListFai.inc
+++ b/plugins/admin/fai/class_divListFai.inc
@@ -69,7 +69,7 @@ class divListFai extends MultiSelectWindow
 
     /* Add SubSearch checkbox */
     //$this->AddCheckBox(SEPERATOR);
-    //$this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    //$this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Search in subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Display users matching"),"*" , true);
diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc
index 567cfecb58cc582ec72e47988aa1ea87371f6f93..2114313da59ee6e365c363277097054315974b0e 100644 (file)
--- a/plugins/admin/groups/class_divListGroup.inc
+++ b/plugins/admin/groups/class_divListGroup.inc
@@ -59,7 +59,7 @@ class divListGroup extends MultiSelectWindow
     $this->AddCheckBox(SEPERATOR);
 
     /* Add SubSearch checkbox */    
-    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Search in subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Regular expression for matching group names"), "*" , true);
diff --git a/plugins/admin/mimetypes/class_divListMimeTypes.inc b/plugins/admin/mimetypes/class_divListMimeTypes.inc
index 6adc6a9e649150cc23daca4510d63bbbade9e67f..92427c02f8ce5b147599371da7faa922de1e241b 100755 (executable)
--- a/plugins/admin/mimetypes/class_divListMimeTypes.inc
+++ b/plugins/admin/mimetypes/class_divListMimeTypes.inc
@@ -57,7 +57,7 @@ class divListMimeTypes extends MultiSelectWindow
     $this->AddHeader(array("string" => _("Actions"),            "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"));
 
     /* Add SubSearch checkbox */
-    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Search in subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Display mime types matching"),"*" , true);
diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc
index 52693207f04586c6c1f5db4b2419021b72049821..7dccc31ac9b71fc09e68b29232c7eb712a819cea 100755 (executable)
--- a/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/plugins/admin/ogroups/class_divListOGroup.inc
@@ -66,7 +66,7 @@ class divListOGroup extends MultiSelectWindow
 
     /* Add SubSearch checkbox */    
     $this->AddCheckBox(SEPERATOR);
-    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Search in subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Regular expression for matching group names"), "*" , true);
diff --git a/plugins/admin/ogroups/ogroup_objects.tpl b/plugins/admin/ogroups/ogroup_objects.tpl
index fc5f158a16e062611d8246e40592af7b3c581f42..663b602746760ed01c8286f12cfcf05de5296b6d 100644 (file)
--- a/plugins/admin/ogroups/ogroup_objects.tpl
+++ b/plugins/admin/ogroups/ogroup_objects.tpl
@@ -35,7 +35,7 @@
     <input type=checkbox name="phones" value="1" {$phones} onClick="mainform.submit()" title="{t}Select to see phones{/t}">{t}Show phones{/t}<br>
  </p>
  <p class="contentboxb" style="border-top:1px solid #B0B0B0; background-color:#F8F8F8">
-    <input type=checkbox name="subtrees" value="1" {$subtrees} onClick="mainform.submit()" title="{t}Select to search within subtrees{/t}">{t}Ignore subtrees{/t}<br>
+    <input type=checkbox name="subtrees" value="1" {$subtrees} onClick="mainform.submit()" title="{t}Select to search within subtrees{/t}">{t}Search in subtrees{/t}<br>
  </p>
 
     <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}" align=middle title="{t}Display objects of department{/t}">&nbsp;
diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc
index 9a07368e24075b63010584c5b8c4395b8aa2e37d..7e749f15f84c8d41139667df07a8a61647fda42e 100644 (file)
--- a/plugins/admin/users/class_divListUsers.inc
+++ b/plugins/admin/users/class_divListUsers.inc
@@ -60,7 +60,7 @@ class divListUsers extends MultiSelectWindow
 
     /* Add SubSearch checkbox */
     $this->AddCheckBox(SEPERATOR);
-    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Search in subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Display users matching"),"*" , true);
diff --git a/plugins/gofax/blocklists/class_divListBlocklists.inc b/plugins/gofax/blocklists/class_divListBlocklists.inc
index 745d9b50e691b242bf929947a7364da7b69c2ed1..870e3ceb1a9ad3fe653c795122f3c6f53842b3c0 100755 (executable)
--- a/plugins/gofax/blocklists/class_divListBlocklists.inc
+++ b/plugins/gofax/blocklists/class_divListBlocklists.inc
@@ -51,7 +51,7 @@ class divListBlocklist extends MultiSelectWindow
     $this->AddCheckBox("ShowReceiveBlocklists" , _("Select to see receive blocklists"), _("Show receive blocklists"),true);
   
     $this->AddCheckBox(SEPERATOR);
-    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Search in subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Regular expression for matching list names"),"*" , true);
diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc
index 22f0061dc41cc337faf8b8a1bb5c7b8ab6a363c0..c5804e62ee759788ce659a93b9cef0090cd35d27 100755 (executable)
--- a/plugins/gofon/conference/class_divListConferences.inc
+++ b/plugins/gofon/conference/class_divListConferences.inc
@@ -49,7 +49,7 @@ class divListConference extends MultiSelectWindow
     $this->AddHeader(array("string" =>_("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'"));
 
     /* Add Checkboxes / SubSearch checkbox */
-    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Search in subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",      _("Regular expression for matching conference names"),"*" , true);
diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc
index 99c40678fac8bebd1649aad5bb703b4710bc92ea..19c29af473e13b4a5707433e9125ff69788a64f5 100755 (executable)
--- a/plugins/gofon/macro/class_divListMacros.inc
+++ b/plugins/gofon/macro/class_divListMacros.inc
@@ -48,7 +48,7 @@ class divListMacro extends MultiSelectWindow
     $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'" ));
 
     /* Add Checkboxes / SubSearch checkbox */
-    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Search in subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Regular expression for matching macro names"),"*" , true);
diff --git a/plugins/personal/environment/selectPrinterDialog.tpl b/plugins/personal/environment/selectPrinterDialog.tpl
index e58f71465fbe0b378e6c48ab165f6451f1b53408..95af082eceee7bb60b8cd643e8c6e5f815e2e300 100644 (file)
--- a/plugins/personal/environment/selectPrinterDialog.tpl
+++ b/plugins/personal/environment/selectPrinterDialog.tpl
@@ -39,7 +39,7 @@
                                </table>
                                <table summary="" style="width:100%;border-top:1px solid #B0B0B0;background-color:#F8F8F8">
                                <tr><td>
-                               <input type=checkbox name="subtrees" value="1" {$subtrees} onClick="mainform.submit()" title="{t}Select to search within subtrees{/t}">{t}Ignore subtrees{/t}
+                               <input type=checkbox name="subtrees" value="1" {$subtrees} onClick="mainform.submit()" title="{t}Select to search within subtrees{/t}">{t}Search in subtrees{/t}
                                </tr></td>
                                </table>
                                        <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 40a525fc7c3c7e1e6e3b50211ac811988719b3f9..1578b8592c672000b8acb815e56c1a41c2ef60dd 100644 (file)
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -646,6 +646,9 @@ class posixAccount extends plugin
           $this->is_modified= TRUE;
         }
         $this->primaryGroup= $_POST['primaryGroup'];
+        if ($this->primaryGroup != 0){
+          $this->gidNumber= $this->primaryGroup;
+        }
       }
 
       /* Save pwmode dependent attributes, curently hardcoded because there're
diff --git a/plugins/personal/posix/posix_groups.tpl b/plugins/personal/posix/posix_groups.tpl
index ca3ae3ec5825979e2ced3e347b68fc9074a6cb6d..3a487274e7495afe8a150b894a6bcbabee8ba762 100644 (file)
--- a/plugins/personal/posix/posix_groups.tpl
+++ b/plugins/personal/posix/posix_groups.tpl
@@ -43,7 +43,7 @@
                                                <td>
                                                        <input type="checkbox" name="SubSearch" value="1" {$SubSearchCHK}
                                                                onClick="mainform.submit();">
-                                                       {t}Ignore subtrees{/t}
+                                                       {t}Search in subtrees{/t}
                                                </td>
                                        </tr>
                 </table>
GONICUS system administrator (SVN clone)