From: cajus Date: Sat, 3 Dec 2005 12:19:39 +0000 (+0000) Subject: Applied fixes X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=46d7e9f177450b6eafd745b90b3c7766c8e66aae;p=gosa.git Applied fixes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2216 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/Changelog b/Changelog index a527a0d8b..69c763fb9 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,17 @@ GOsa2 changelog =============== +* gosa 2.4 + - Updated layout to work cleanly with IE6+, Firefox 1.0.4+, khtml 3.4+ + - Added FAI (Fully Automatted Installation) support + - Added mail queue management + - Added many missing acl informations + - Added help browser + - Fixed templating for samba and unix users + - Applied hundreds of smaller bugfixes + - Improved speed by switching to directory style dialogs and performing + sub searches. + * gosa 2.4beta3 - Updated layout - Fixed application removal diff --git a/TODO b/TODO index 4a1495b19..0ccd18938 100644 --- a/TODO +++ b/TODO @@ -4,12 +4,6 @@ Things to fix before 2.4: Showed up by a small review. Since we've time until the doc is ready, face these: -* Fix problem with non-existing entries in the package list - -* please check what happened to sizelimit buttons after moving to another list box - -* Can't assign rights on primary groups, or something like that ... - * When selecting who can manage printers the list of the windows pc is show with the users * In system, server nfs export the text is still in german "Freigabe bearbeiten" and the icon is a phone diff --git a/debian/changelog b/debian/changelog index 5a8c91439..3aceb0616 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ gosa (2.4) unstable; urgency=low - * New upstream release + * New upstream release - -- Cajus Pollmeier Thu, 16 Jun 2005 15:31:28 +0200 + -- Cajus Pollmeier Fri, 2 Dec 2005 14:52:18 +0100 gosa (2.4beta1-1) unstable; urgency=high diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc index 337c398a7..79e952679 100644 --- a/include/class_userinfo.inc +++ b/include/class_userinfo.inc @@ -24,6 +24,8 @@ class userinfo var $ip; var $username; var $cn; + var $gidNumber= -1; + var $language= ""; var $config; var $subtreeACL= array(); @@ -40,6 +42,14 @@ class userinfo } else { $this->cn= $attrs['uid'][0]; } + if (isset($attrs['gidNumber'][0])){ + $this->gidNumber= $attrs['gidNumber'][0]; + } + + /* Assign user language */ + if (isset($attrs['preferredLanguage'][0])){ + $this->language= $attrs['preferredLanguage'][0]; + } $this->dn= $userdn; $this->ip= $_SERVER['REMOTE_ADDR']; @@ -53,8 +63,13 @@ class userinfo /* Load ACL's from all groups we're in */ $this->subtreeACL= array(); $ldap->cd($this->config->current['BASE']); - $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)". - "(|(memberUid=$this->username)(cn=$this->username)))"); + if ($this->gidNumber == -1){ + $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)". + "(memberUid=$this->username))"); + } else { + $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)". + "(|(memberUid=$this->username)(gidNumber=$this->gidNumber)))"); + } while($attrs = $ldap->fetch()){ $base= preg_replace('/^[^,]+,ou=[^,]+,/i', "",$ldap->getDN()); diff --git a/include/functions.inc b/include/functions.inc index caccbd39f..9ac2e630c 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -143,6 +143,14 @@ function get_browser_language() { global $BASE_DIR; + /* Try to use users primary language */ + $ui= get_userinfo(); + if ($ui != NULL){ + if ($ui->language != ""){ + return ($ui->language); + } + } + /* Get list of languages */ if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])){ $lang= preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_LANGUAGE']); diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc index e39505471..b652106d3 100644 --- a/plugins/admin/fai/class_faiManagement.inc +++ b/plugins/admin/fai/class_faiManagement.inc @@ -25,7 +25,6 @@ require "tabsScript.inc"; require "tabsProfile.inc"; require "tabsPackage.inc"; - class faiManagement extends plugin { /* Definitions */ @@ -606,6 +605,7 @@ class faiManagement extends plugin $smarty->assign("alphabet" , generate_alphabet()); $smarty->assign("apply" , apply_filter()); $smarty->assign("search_image" , get_template_path('images/search.png')); + $smarty->assign("hint", print_sizelimit_warning()); $display = $smarty->fetch(get_template_path('headpage.tpl', TRUE, dirname(__FILE__))); return ($display); diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc index 53d6b3d87..402404c8b 100644 --- a/plugins/admin/fai/class_faiPackage.inc +++ b/plugins/admin/fai/class_faiPackage.inc @@ -86,16 +86,18 @@ class faiPackage extends plugin $tmp['Name'] = $attr['FAIvariable'][0]; $tmp['Type'] = $attr['FAIvariableType'][0]; - if(!in_array($attr['FAIvariableType'],array("multiselect"))){ - $tmp['Value'] = $attr['FAIvariableContent'][0]; - }else{ - $content = array(); - unset($attr['FAIvariableContent']['count']); - foreach($attr['FAIvariableContent'] as $attr){ - $tmp['Value'][] = $attr; + if (isset($attrs['FAIvariableContent'][0])){ + if(!in_array($attr['FAIvariableType'],array("multiselect"))){ + $tmp['Value'] = $attr['FAIvariableContent'][0]; + }else{ + $content = array(); + unset($attr['FAIvariableContent']['count']); + foreach($attr['FAIvariableContent'] as $attr){ + $tmp['Value'][] = $attr; + } } + $this->ConfiguredPackages[$attr['FAIpackage'][0]][$attr['FAIvariable'][0]]=$tmp; } - $this->ConfiguredPackages[$attr['FAIpackage'][0]][$attr['FAIvariable'][0]]=$tmp; } } diff --git a/plugins/admin/fai/faiPackageConfiguration.tpl b/plugins/admin/fai/faiPackageConfiguration.tpl index 179ed29ec..aa9c511ee 100644 --- a/plugins/admin/fai/faiPackageConfiguration.tpl +++ b/plugins/admin/fai/faiPackageConfiguration.tpl @@ -1,6 +1,7 @@

 {$headline}

-

 

{$Config} +

 

+
diff --git a/plugins/admin/fai/headpage.tpl b/plugins/admin/fai/headpage.tpl index 38b38a0a2..75d2bd5e5 100644 --- a/plugins/admin/fai/headpage.tpl +++ b/plugins/admin/fai/headpage.tpl @@ -3,7 +3,7 @@

- {t}List of FAI classes{/t} + {t}List of FAI classes{/t} {$hint}

diff --git a/plugins/personal/posix/posix_groups.tpl b/plugins/personal/posix/posix_groups.tpl index 394ea8381..f7e3207f1 100644 --- a/plugins/personal/posix/posix_groups.tpl +++ b/plugins/personal/posix/posix_groups.tpl @@ -1,12 +1,12 @@
-
+

{t}Select groups to add{/t} {$hint}

-
+