From bd326bed0f1854a2d4890f504c2b0e977a3694bb Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 6 Jul 2007 13:08:34 +0000 Subject: [PATCH] * Updated spelling * Added workaround for gidNumber git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@6761 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/applications/class_divListApplication.inc | 2 +- plugins/admin/departments/class_divListDepartment.inc | 2 +- plugins/admin/fai/class_divListFai.inc | 2 +- plugins/admin/groups/class_divListGroup.inc | 2 +- plugins/admin/mimetypes/class_divListMimeTypes.inc | 2 +- plugins/admin/ogroups/class_divListOGroup.inc | 2 +- plugins/admin/ogroups/ogroup_objects.tpl | 2 +- plugins/admin/users/class_divListUsers.inc | 2 +- plugins/gofax/blocklists/class_divListBlocklists.inc | 2 +- plugins/gofon/conference/class_divListConferences.inc | 2 +- plugins/gofon/macro/class_divListMacros.inc | 2 +- plugins/personal/environment/selectPrinterDialog.tpl | 2 +- plugins/personal/posix/class_posixAccount.inc | 3 +++ plugins/personal/posix/posix_groups.tpl | 2 +- 14 files changed, 16 insertions(+), 13 deletions(-) diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc index c6e339eb3..182044c7e 100755 --- 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 04898971f..077e14df4 100755 --- 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 0a51b32d8..41dd8dcdf 100644 --- 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 567cfecb5..2114313da 100644 --- 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 6adc6a9e6..92427c02f 100755 --- 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 52693207f..7dccc31ac 100755 --- 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 fc5f158a1..663b60274 100644 --- a/plugins/admin/ogroups/ogroup_objects.tpl +++ b/plugins/admin/ogroups/ogroup_objects.tpl @@ -35,7 +35,7 @@ {t}Show phones{/t}

- {t}Ignore subtrees{/t}
+ {t}Search in subtrees{/t}

  diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc index 9a07368e2..7e749f15f 100644 --- 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 745d9b50e..870e3ceb1 100755 --- 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 22f0061dc..c5804e62e 100755 --- 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 99c40678f..19c29af47 100755 --- 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 e58f71465..95af082ec 100644 --- a/plugins/personal/environment/selectPrinterDialog.tpl +++ b/plugins/personal/environment/selectPrinterDialog.tpl @@ -39,7 +39,7 @@
- {t}Ignore subtrees{/t} + {t}Search in subtrees{/t}
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc index 40a525fc7..1578b8592 100644 --- 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 ca3ae3ec5..3a487274e 100644 --- a/plugins/personal/posix/posix_groups.tpl +++ b/plugins/personal/posix/posix_groups.tpl @@ -43,7 +43,7 @@
- {t}Ignore subtrees{/t} + {t}Search in subtrees{/t}
-- 2.30.2