Skip to content
Snippets Groups Projects
Commit 38cdb896 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Qual: Removed codesniffer errors

parent 7b6b77dd
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/imports/class/import.class.php
+ 9
− 11
View file @ 38cdb896
......@@ -234,8 +234,9 @@ class Import
$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 @@ class Import
{
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
}
}
......
htdocs/imports/emptyexample.php
+ 2
− 1
View file @ 38cdb896
......@@ -27,8 +27,9 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
$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");
......
htdocs/imports/import.php
+ 2
− 2
View file @ 38cdb896
......@@ -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)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment