[debian-edu-commits] debian-edu/pkg-team/ 20/32: Imported Debian patch 2.7.4-4.3

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit 1db1190a1d7866c9b27f3b2c80a8d84237acdd0a
Author: Michael Banck <mbanck at debian.org>
Date:   Fri Jun 14 10:59:37 2013 +0200

    Imported Debian patch 2.7.4-4.3
---
 debian/changelog                         |  8 ++++++
 debian/patches/fix-mass-ldapimport.patch | 48 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 70f25a4..713d7e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gosa (2.7.4-4.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/fix-mass-ldapimport.patch: New patch, fixes LDAP mass
+    import, by Giorgio Pioda and Petter Reinholdtsen. (Closes: #698840)
+
+ -- Michael Banck <mbanck at debian.org>  Fri, 14 Jun 2013 10:59:37 +0200
+
 gosa (2.7.4-4.2) unstable; urgency=low
 
   [ Jonathan Wiltshire ]
diff --git a/debian/patches/fix-mass-ldapimport.patch b/debian/patches/fix-mass-ldapimport.patch
new file mode 100644
index 0000000..9574dae
--- /dev/null
+++ b/debian/patches/fix-mass-ldapimport.patch
@@ -0,0 +1,48 @@
+Index: addons/ldapmanager/class_csvimport.inc
+===================================================================
+--- gosa/ldapmanager/addons/ldapmanager/class_csvimport.inc      (revisjon 21231)
++++ gosa/ldapmanager/addons/ldapmanager/class_csvimport.inc      (arbeidskopi)
+@@ -175,17 +175,25 @@
+ 
+ 
+             /* Set all submitted vars  */
+-            if(is_array($keys))
++            if(is_array($keys)){
+               foreach($keys as $key) {
+                 if($key != "status"){
+                   $this->usertab->$key = $dat[$key];
++                  foreach($this->usertab->by_object as $pname => $plugin){
++                    if(isset($this->usertab->by_object[$pname]->$key)){
++                      $this->usertab->by_object[$pname]->$key = $dat[$key];
++                    }
++                  }
+                 }
+               }
++            }
+ 
+             /* Initialize template */
+             if($this->csvinfo['tplid']!=0){
+-              $this->usertab->adapt_from_template($this->csvinfo['arrtempls'][$this->csvinfo['tplid']]['dn']);
+-              $this->usertab->save_object();
++              $tpl_dn = $this->csvinfo['arrtempls'][$this->csvinfo['tplid']]['dn'];
++              $this->usertab->adapt_from_template($tpl_dn,array("uid","cn","givenName","sn"));
++              $tpl_base  = preg_replace("/^[^,]+,".preg_quote(get_people_ou(), '/i')."/", '', $tpl_dn);
++              $this->usertab->by_object['user']->base= $tpl_base;
+             } else {
+ 
+               /* Reset vars */
+Index: addons/ldapmanager/contentcsv.tpl
+===================================================================
+--- gosa/ldapmanager/addons/ldapmanager/contentcsv.tpl   (revisjon 21231)
++++ gosa/ldapmanager/addons/ldapmanager/contentcsv.tpl   (arbeidskopi)
+@@ -1,5 +1,3 @@
+-<font color='red'>Temporary disabled</font>
+-<!--
+ <p>
+   {t}The CSV import plug-in provides methods to generate user accounts from a file containing Comma Separated Values. The administrator can decide which columns should be transfered to which attribute. Note that you must have at least the UID, GIVENNAME and SURNAME set.{/t}
+ </p>
+@@ -122,4 +120,3 @@
+   {/if}
+ </div>
+ <input type="hidden" name="ignore">
+--->
diff --git a/debian/patches/series b/debian/patches/series
index 661e56f..8aa9428 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ style-robustness.patch
 03_fix_class_mapping.patch
 04_fix_locale_location.patch
 no-image-warning.patch
+fix-mass-ldapimport.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git