Changeset 294:5d67ddc42592

Timestamp:

05/18/11 11:47:37 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

2.3

Message:

Fix full flat import : detecting existing prefs (will be not overwritten)

File:

• plugins/importExport/inc/flat/class.dc.import.php (modified) (2 diffs)

plugins/importExport/inc/flat/class.dc.import.php

@@ -371 +371 @@
      private function insertPref($pref)
      {
+          if ($this->prefExists($pref->pref_ws,$pref->pref_id,$pref->user_id)) {
+               return;
+          }
+          
           $this->cur_pref->clean();
           
@@ -751 +755 @@
           $this->stack['users'][$user_id] = !$rs->isEmpty();
           return $this->stack['users'][$user_id];
+     }
+     
+     private function prefExists($pref_id,$pref_ws,$user_id)
+     {
+          $strReq = 'SELECT pref_id,pref_ws,user_id '.
+                    'FROM '.$this->prefix.'pref '.
+                    "WHERE pref_id = '".$this->con->escape($pref_id)."' ".
+                    "AND pref_ws = '".$this->con->escape($pref_ws)."' ";
+          if (!$user_id) {
+               $strReq .= "AND user_id IS NULL ";
+          } else {
+               $strReq .= "AND user_id = '".$this->con->escape($user_id)."' ";
+          }
+          
+          $rs = $this->con->select($strReq);
+          
+          return !$rs->isEmpty();
      }