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 a527a0d8b7103fe0e12b18395c0e4fe64ba1bfb0..69c763fb951ff01cfe813193f4f58b922f7454fc 100644 (file)
--- 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 4a1495b191028fc68ff40f8152f25ab0b58e0a78..0ccd189388cc6cb7cfd2a0ce979dc5e112ccf487 100644 (file)
--- 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 5a8c914396cffb23b99def1669bb74c3fe6f053c..3aceb0616064fd1ce4c398a0c85b5c0415766737 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 gosa (2.4) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release 
 
- --  Cajus Pollmeier <cajus@debian.org>  Thu, 16 Jun 2005 15:31:28 +0200
+ -- Cajus Pollmeier <cajus@debian.org>  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 337c398a79f7c8e408ce1eda0d19776690a9b692..79e9526793437484a4699054ac3248f1a205e749 100644 (file)
--- 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 caccbd39f5f2ad7825be16996ccb6d2abc5508f8..9ac2e630c5927e1975c04e6f1fd6703dc0e1c9e9 100644 (file)
--- 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 e3950547193d81332833c462af33438a48360f46..b652106d37112511088548344850011e21d732cf 100644 (file)
--- 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 53d6b3d8790aa0b21b816c8fdea154a622eef09f..402404c8b47e5ed2027d0fa28cb8bb5536776d97 100644 (file)
--- 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 179ed29ec798a1f4a9111aeaa9e0ab679879d977..aa9c511eef5ace5a1413f9d20ecde2bb52c0c110 100644 (file)
--- a/plugins/admin/fai/faiPackageConfiguration.tpl
+++ b/plugins/admin/fai/faiPackageConfiguration.tpl
@@ -1,6 +1,7 @@
 <h1><img alt="" src="images/forward.png" align="middle" title="{t}Package{/t}">&nbsp;{$headline}</h1>
-<p class="seperator">&nbsp;</p>
 {$Config}
+<p class="seperator">&nbsp;</p>
+<br>
 <div align="right" style="align:right;">
     <input name="SaveObjectConfig" value="{t}Apply{/t}" type="submit">
     <input name="CancelObjectConfig" value="{t}Cancel{/t}" type="submit">

diff --git a/plugins/admin/fai/headpage.tpl b/plugins/admin/fai/headpage.tpl
index 38b38a0a2d4e3c943eec6aa2082bbaade3997aee..75d2bd5e50f832af78ff139df7e81a74533cdd1d 100644 (file)
--- a/plugins/admin/fai/headpage.tpl
+++ b/plugins/admin/fai/headpage.tpl
@@ -3,7 +3,7 @@
   <td style="vertical-align:top;width:600px">
   <div class="contentboxh">
     <p class="contentboxh">
-     {t}List of FAI classes{/t}
+     {t}List of FAI classes{/t} {$hint}
     </p>
   </div>
   <div class="contentboxb">

diff --git a/plugins/personal/posix/posix_groups.tpl b/plugins/personal/posix/posix_groups.tpl
index 394ea838144c5caae43dfea1c15be512eed04b7a..f7e3207f17a84c1a1539c25ae1c9093d17fce2a2 100644 (file)
--- a/plugins/personal/posix/posix_groups.tpl
+++ b/plugins/personal/posix/posix_groups.tpl
@@ -1,12 +1,12 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
 <tr>
   <td style="vertical-align:top;">
-   <div class="contentboxh" style="height:20px;">
+   <div class="contentboxh" style="width:610px; height:20px;">
     <p class="contentboxh" style="font-size:12px">
      <b>{t}Select groups to add{/t} {$hint}</b>
     </p>
    </div>
-   <div class="contentboxb">
+   <div class="contentboxb" style="width:610px;">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
      <select style="width:600px; height:450px; margin-top:4px;" name="groups[]" size="15" multiple>
        {html_options options=$groups}