tutos-commits Mailing List for TUTOS (Page 21)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 815
          http://tutos.svn.sourceforge.net/tutos/?rev=815&view=rev
Author:   gokohnert
Date:     2012-10-09 11:43:30 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
fix ldap import

Modified Paths:
--------------
    trunk/php/department.pinc
    trunk/php/ldap/ldap.pinc
    trunk/php/location.pinc

Modified: trunk/php/department.pinc
===================================================================

--- trunk/php/department.pinc	2012-10-07 17:50:15 UTC (rev 814)
+++ trunk/php/department.pinc	2012-10-09 11:43:30 UTC (rev 815)
@@ -254,10 +254,10 @@
         $this->read_locs_data();
         $info = '';
         $info .= '<table class="popupinfo">';
-        $info .= '<tr><th colspan="2">'. $fn .'</th></tr>';
-        $info .= '<tr><td valign="top">'. $lang['Phone'] .':</font></td><td>';
+        $info .= '<tr><th colspan="2">'. myentities($this->company->getFullName()) .'<br />'. myentities($this->name) .'</th></tr>';
 
-        if ( isset($this->location) ) {
+        if ( isset($this->location) && count($this->location) ) {
+            $info .= '<tr><td valign="top">'. $lang['Phone'] .':</font></td><td>';
             $pre = '';
             foreach($this->location as $i => $f) {
                 if ( $f->phone_1 != "" ) {
@@ -269,8 +269,8 @@
                     $pre = "<br />";
                 }
             }
+            $info .= '&nbsp;</td></tr>';
         }
-        $info .= '&nbsp;</td></tr>';
         $info .= $this->custom_popup_content();
         $info .= '</table>';
         return $info;
@@ -434,7 +434,9 @@
             $r .= " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
             $pre = "";
             foreach($obj->list[usedepartment] as $i => $f) {
-                $r .= $pre . $obj->list[usedepartment][$i]->getLink($obj->list[usedepartment][$i]->name) ."\n";
+                $obj->list[usedepartment][$i]->read_members();
+                $r .= $pre . $obj->list[usedepartment][$i]->getLink($obj->list[usedepartment][$i]->name);
+                $r .= '&nbsp;('.count($obj->list[usedepartment][$i]->member).')'."\n";
                 $pre = "<br />\n";
             }
             $r .= " </td>\n";
@@ -525,4 +527,4 @@
     }
   }
 $tutos['classes'][usedepartment] = 'department';
-?>
\ No newline at end of file
+?>

Modified: trunk/php/ldap/ldap.pinc
===================================================================
--- trunk/php/ldap/ldap.pinc	2012-10-07 17:50:15 UTC (rev 814)
+++ trunk/php/ldap/ldap.pinc	2012-10-09 11:43:30 UTC (rev 815)
@@ -159,7 +159,7 @@
      * Import/Update the given key to/in TUTOS
      */
     function import($key) {
-        global $lang,$tutos,$msg;
+        global $lang,$tutos,$msg,$info,$table;
 
         if (isset($tutos['ldap:'. $this->host .":". $this->port]['uniquekey']) ) {
             $ukey = $tutos['ldap:'. $this->host .":". $this->port]['uniquekey'];
@@ -364,33 +364,59 @@
             if (isset($tutos['ldap:'. $this->host .":". $this->port]['company']) ) {
                 $v = strtolower($tutos['ldap:'. $this->host .":". $this->port]['company']);
                 if (isset($import[$c][$v][0]) ) {
-                    $loc[$c]->company = check_field($import[$c][$v][0],"company","cl","c");
-                    // Create Company on demand
-                    if ( !is_object($loc[$c]->company) ) {
+                    $q = 'SELECT * from '. $this->dbconn->prefix.$table['company'][name].' where name ='.$this->dbconn->String(trim($import[$c][$v][0]));
+                    $r = $this->dbconn->Exec($q);
+                    $n = $r->numrows();
+                    if ($n == 1) {
                         $comp = new company($this->dbconn);
-                        $comp->setName($import[$c][$v][0]);
+                        $comp->read_result($r,0);
+                        $loc[$c]->company = &$comp;
+                        unset($comp);
+                    } else if ($n == 0) {
+                        $info = addLine($info,$lang['CompanyCreateInfo'] .':'. $import[$c][$v][0]);
+                        $comp = new company($this->dbconn);
+                        $comp->setName(trim($import[$c][$v][0]));
                         $comp->save();
                         $loc[$c]->company = &$comp;
+                        unset($comp);
                     }
+                    $r->free();
                 }
             }
             if (isset($tutos['ldap:'. $this->host .":". $this->port]['department']) ) {
                 $v = strtolower($tutos['ldap:'. $this->host .":". $this->port]['department']);
                 if (isset($import[$c][$v][0]) ) {
-                    $loc[$c]->department = check_field($import[$c][$v][0],"department","dl","d");
+                    if (is_object($loc[$c]->company)) {
+                        $q = 'SELECT * from '. $this->dbconn->prefix.$table['department'][name].' where name ='.$this->dbconn->String(trim($import[$c][$v][0]));
+                        $q .= ' AND c_id = '.$loc[$c]->company->id;
+                        $r = $this->dbconn->Exec($q);
+                        $n = $r->numrows();
+                        if ($n == 1) {
+                            $dep = new department($this->dbconn);
+                            $dep->read_result($r,0);
+                            $loc[$c]->department = &$dep;
+                            unset($dep);
+                        } else if ($n == 0) {
+                            $info = addLine($info,$lang['DepCreateInfo'] .':'. $import[$c][$v][0]);
+                            $dep = new department($this->dbconn);
+                            $dep->setName(trim($import[$c][$v][0]));
+                            $dep->setCompany($loc[$c]->company->id);
+                            $dep->save();
+                            $loc[$c]->department = &$dep;
+                            unset($dep);
+                        }
+                        $r->free();
+                    }
                 }
             }
-
         }
-#    if (isset($tutos['ldap:'. $this->host .":". $this->port]['uniquekey']) ) {
-        #      $ukey = $tutos['ldap:'. $this->host .":". $this->port]['uniquekey'];
-        #    }
+        // if (isset($tutos['ldap:'. $this->host .":". $this->port]['uniquekey']) ) {
+        //   $ukey = $tutos['ldap:'. $this->host .":". $this->port]['uniquekey'];
+        // }
 
         if (isset($import[0][$ukey])) {
             $key = $ukey.'='.$import[0][$ukey][0];
         }
-#    echo $key.' '.$ukey.' '.$import[0][$ukey][0];
-#    die();
         $msg .= $adr->save();
         if ($savefile) {
             $adr->pic_file->link_id = $adr->id;

Modified: trunk/php/location.pinc
===================================================================
--- trunk/php/location.pinc	2012-10-07 17:50:15 UTC (rev 814)
+++ trunk/php/location.pinc	2012-10-09 11:43:30 UTC (rev 815)
@@ -566,6 +566,7 @@
                     $c[0] = $_POST['d_id'];
                     $c[1] = -1;
                 }
+                $this->department = new Department($this->dbconn);
                 $this->SetDepartment($this->department->read($c[0],$this->department));
                 $gotourl= addUrlParameter($gotourl,"dl[]=". $this->department->id,true);
                 $locid = $c[1];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2001	Jan	Feb	Mar	Apr	May	Jun	Jul (13)	Aug (214)	Sep (144)	Oct (22)	Nov (22)	Dec (93)
2002	Jan (25)	Feb (31)	Mar (92)	Apr (70)	May (103)	Jun (130)	Jul (265)	Aug (325)	Sep (233)	Oct (244)	Nov (261)	Dec (157)
2003	Jan (101)	Feb (135)	Mar (148)	Apr (164)	May (53)	Jun (116)	Jul (149)	Aug (126)	Sep (45)	Oct (109)	Nov (36)	Dec (61)
2004	Jan (131)	Feb (236)	Mar (278)	Apr (259)	May (92)	Jun (110)	Jul (150)	Aug (64)	Sep (141)	Oct (141)	Nov (146)	Dec (65)
2005	Jan (70)	Feb (77)	Mar (129)	Apr (153)	May (161)	Jun (63)	Jul (42)	Aug (16)	Sep (30)	Oct (3)	Nov (8)	Dec (40)
2006	Jan (114)	Feb (16)	Mar (12)	Apr (15)	May (4)	Jun (9)	Jul (69)	Aug (27)	Sep (12)	Oct (80)	Nov (62)	Dec (41)
2007	Jan (34)	Feb (2)	Mar (38)	Apr (82)	May (61)	Jun (37)	Jul (16)	Aug (64)	Sep (7)	Oct (52)	Nov (18)	Dec (28)
2008	Jan (168)	Feb (26)	Mar (27)	Apr (19)	May (10)	Jun (58)	Jul (58)	Aug (91)	Sep (14)	Oct (23)	Nov (56)	Dec (38)
2009	Jan (58)	Feb (90)	Mar (204)	Apr (90)	May (27)	Jun (177)	Jul (116)	Aug (53)	Sep (42)	Oct (120)	Nov (51)	Dec (58)
2010	Jan (117)	Feb (231)	Mar (163)	Apr (90)	May (40)	Jun (139)	Jul (49)	Aug (118)	Sep (25)	Oct (80)	Nov (102)	Dec (99)
2011	Jan (176)	Feb (42)	Mar (60)	Apr (52)	May (30)	Jun (29)	Jul (27)	Aug (16)	Sep (51)	Oct (70)	Nov (63)	Dec (58)
2012	Jan (28)	Feb (26)	Mar (7)	Apr (12)	May (41)	Jun (61)	Jul (59)	Aug (38)	Sep (30)	Oct (28)	Nov (14)	Dec (31)
2013	Jan (24)	Feb (54)	Mar (45)	Apr (22)	May (35)	Jun (8)	Jul (18)	Aug (38)	Sep (11)	Oct (8)	Nov (19)	Dec (20)
2014	Jan (20)	Feb (22)	Mar (4)	Apr (6)	May (13)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec (6)
2015	Jan	Feb (1)	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (1)
2016	Jan (4)	Feb	Mar	Apr (1)	May	Jun	Jul (2)	Aug (4)	Sep (1)	Oct (1)	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (8)	Aug (13)	Sep (12)	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2020	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2021	Jan	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

tutos-commits Mailing List for TUTOS (Page 21)

Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory

tutos-commits — SVN commits