Qual: Removed codesniffer errors

Dolibarr · Sep 20, 2011 · 38cdb89 · 38cdb89
1 parent 7b6b77d
commit 38cdb89
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
@@ -234,8 +234,9 @@ function create($user)
 		$this->db->begin();
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'import_model (';
-		$sql.= 'label, type, field)';
-		$sql.= " VALUES ('".$this->db->escape($this->model_name)."', '".$this->datatoimport."', '".$this->hexa."')";
+		$sql.= 'fk_user, label, type, field';
+		$sql.= ')';
+		$sql.= " VALUES (".($user->id > 0 ? $user->id : 0).", '".$this->db->escape($this->model_name)."', '".$this->datatoimport."', '".$this->hexa."')";
 
 		dol_syslog("Import::create sql=".$sql, LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -318,15 +319,12 @@ function delete($user, $notrigger=0)
 		{
 			if (! $notrigger)
 			{
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
-
-				//// Call triggers
-				//include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-				//$interface=new Interfaces($this->db);
-				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				//// End call triggers
+				// Call triggers
+				include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+				$interface=new Interfaces($this->db);
+				$result=$interface->run_triggers('IMPORT_DELETE',$this,$user,$langs,$conf);
+				if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				// End call triggers
 			}
 		}
 

diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
@@ -27,8 +27,9 @@
 $datatoimport=isset($_GET["datatoimport"])? $_GET["datatoimport"] : (isset($_POST["datatoimport"])?$_POST["datatoimport"]:'');
 $format=isset($_GET["format"])? $_GET["format"] : (isset($_POST["format"])?$_POST["format"]:'');
 
-// C'est un wrapper, donc header vierge
+// This file is a wrapper, so empty header
 function llxHeader() { print '<html><title>Build an import example file</title><body>'; }
+// This file is a wrapper, so empty footer
 function llxFooter() { print '</body></html>'; }
 
 require("../main.inc.php");

diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
@@ -1641,8 +1641,8 @@ function show_elem($fieldssource,$pos,$key,$var,$nostyle='')
 /**
  * Return not used field number
  *
- * @param 	array	$fieldssource
- * @param	array	$listofkey
+ * @param 	array	&$fieldssource	Array of field source
+ * @param	array	&$listofkey		Array of keys
  * @return	void
  */
 function getnewkey(&$fieldssource,&$listofkey)