Changeset 515 for trunk/phpbms/include

Timestamp:

05/05/09 12:26:06 (3 years ago)

Author:

nate

Message:

• removed widget's default import
• For new tabledefs, the import command is disabled by default
• Products should now use the general import page.

Location:

trunk/phpbms/include

Files:

• imports.php (modified) (4 diffs)
• session.php (modified) (1 diff)
• tables.php (modified) (2 diffs)

trunk/phpbms/include/imports.php

@@ -16 +16 @@
                 var $pageType = "main";
 
+
                 function phpbmsImport($table, $importType = "csv"){
 
@@ -31 +32 @@
                         //Won't display db errors, just log them.
                         $this->table->db->showError = false;
-                        if(isset($_POST["pageType"]))
-                                $this->pageType = $_POST["pageType"];
-
-                        if(isset($_POST["tempFileID"]))
-                                $this->tempFileID = ((int)$_POST["tempFileID"]);
 
                 }//end method --imports--
@@ -258 +254 @@
                                                         $verify = $this->table->verifyVariables($trimmedRowData);
                                                         if(!count($verify))
-                                                                $theid = $this->table->insertRecord($trimmedRowData);
+                                                                $theid = $this->table->insertRecord($trimmedRowData, NULL, true);
                                                 }else
                                                         $this->error .= '<li> incorrect amount of fields for line number '.$rowNum.'.</li>';
@@ -332 +328 @@
                         $this->table->getTableInfo();
 
+                        if(isset($_POST["pageType"]))
+                                $this->pageType = $_POST["pageType"];
+
+                        if(isset($_POST["tempFileID"]))
+                                $this->tempFileID = ((int)$_POST["tempFileID"]);
+
                         if(!isset($_POST["command"])){
 

trunk/phpbms/include/session.php

@@ -515 +515 @@
                         $error = new appError(-353,"You must remove the install directory and all modules' install directories before phpBMS can run.","Main Install Directory Present",true,true,true,$errorFormat);
 
-                $thedir= @ opendir("modules");
-
-                while($entry = readdir($thedir)){
-
-                        if($entry != "." && $entry != ".." && $entry != "base" && $entry != "sample" && is_dir("modules/".$entry)){
-
-                                if(file_exists("modules/".$entry."/install") && is_dir("modules/".$entry."/install")){
-
-                                        $error = new appError(-354,"You must remove the install directory and all modules' install directories before phpBMS can run.","Module '".$entry."' Install Directory Present",true,true,true,$errorFormat);
+                if(file_exists("modules") && is_dir("modules")){
+
+                        $thedir = @ opendir("modules");
+
+                        while($entry = readdir($thedir)){
+
+                                if($entry != "." && $entry != ".." && $entry != "base" && $entry != "sample" && is_dir("modules/".$entry)){
+
+                                        if(file_exists("modules/".$entry."/install") && is_dir("modules/".$entry."/install")){
+
+                                                $error = new appError(-354,"You must remove the install directory and all modules' install directories before phpBMS can run.","Module '".$entry."' Install Directory Present",true,true,true,$errorFormat);
+
+                                        }//endif
 
                                 }//endif
 
-                        }//endif
+                        }//end while
 
                 }//end if

trunk/phpbms/include/tables.php

@@ -345 +345 @@
 
 
-                function insertRecord($variables,$createdby = NULL, $overrideID = false){
+                function insertRecord($variables,$createdby = NULL, $overrideID = false, $replace = false){
 
                         if($createdby === NULL)
@@ -396 +396 @@
                         $insertvalues = substr($insertvalues, 0, strlen($insertvalues)-2);
 
-                        $insertstatement = "INSERT INTO ".$this->maintable." (".$fieldlist.") VALUES (".$insertvalues.")";
+                        if($replace)
+                                $insertstatement = "REPLACE";
+                        else
+                                $insertstatement = "INSERT";
+
+                        $insertstatement .= " INTO ".$this->maintable." (".$fieldlist.") VALUES (".$insertvalues.")";
                         $insertresult = $this->db->query($insertstatement);