Dolibarr / dolibarr

htdocs/api/class/api.class.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Luracast\Restler\Restler;
 use Luracast\Restler\RestException;
 use Luracast\Restler\Defaults;
-use Luracast\Restler\Format\UploadFormat;
 
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 

Indentation +186 added lines, -186 removed lines

@@ -29,52 +29,52 @@ 
 class DolibarrApi
 {
 
-    /**
-     * @var DoliDb        $db Database object
-     */
-    static protected $db;
-
-    /**
-     * @var Restler     $r	Restler object
-     */
-    var $r;
-
-    /**
-     * Constructor
-     *
-     * @param	DoliDb	$db		        Database handler
-     * @param   string  $cachedir       Cache dir
-     * @param   boolean $refreshCache   Update cache
-     */
-    function __construct($db, $cachedir='', $refreshCache=false)
-    {
-        global $conf, $dolibarr_main_url_root;
+	/**
+	 * @var DoliDb        $db Database object
+	 */
+	static protected $db;
+
+	/**
+	 * @var Restler     $r	Restler object
+	 */
+	var $r;
+
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDb	$db		        Database handler
+	 * @param   string  $cachedir       Cache dir
+	 * @param   boolean $refreshCache   Update cache
+	 */
+	function __construct($db, $cachedir='', $refreshCache=false)
+	{
+		global $conf, $dolibarr_main_url_root;
 
-        if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
-        Defaults::$cacheDirectory = $cachedir;
+		if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
+		Defaults::$cacheDirectory = $cachedir;
 
-        $this->db = $db;
-        $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
-        $this->r = new Restler($production_mode, $refreshCache);
+		$this->db = $db;
+		$production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
+		$this->r = new Restler($production_mode, $refreshCache);
 
-        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 
-        $urlwithouturlrootautodetect=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim(DOL_MAIN_URL_ROOT));
-        $urlwithrootautodetect=$urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
+		$urlwithouturlrootautodetect=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim(DOL_MAIN_URL_ROOT));
+		$urlwithrootautodetect=$urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
 
-        $this->r->setBaseUrls($urlwithouturlroot, $urlwithouturlrootautodetect);
-        $this->r->setAPIVersion(1);
-    }
+		$this->r->setBaseUrls($urlwithouturlroot, $urlwithouturlrootautodetect);
+		$this->r->setAPIVersion(1);
+	}
 
-    /**
-     * Executed method when API is called without parameter
-     *
-     * Display a short message an return a http code 200
-     *
-     * @return array
-     */
-    /* Disabled, most APIs does not share same signature for method index
+	/**
+	 * Executed method when API is called without parameter
+	 *
+	 * Display a short message an return a http code 200
+	 *
+	 * @return array
+	 */
+	/* Disabled, most APIs does not share same signature for method index
     function index()
     {
         return array(
@@ -86,124 +86,124 @@ 
     }*/
 
 
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object	Object to clean
-     * @return	array	Array of cleaned object properties
-     */
-    function _cleanObjectDatas($object) {
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object	Object to clean
+	 * @return	array	Array of cleaned object properties
+	 */
+	function _cleanObjectDatas($object) {
 
-        // Remove $db object property for object
-        unset($object->db);
+		// Remove $db object property for object
+		unset($object->db);
 		unset($object->ismultientitymanaged);
 		unset($object->restrictiononfksoc);
 
-        // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
-        unset($object->linkedObjects);
-
-        unset($object->lignes); // we don't want lignes, we want only ->lines
-
-        unset($object->fields);
-        unset($object->oldline);
-
-        unset($object->error);
-        unset($object->errors);
-
-        unset($object->ref_previous);
-        unset($object->ref_next);
-        unset($object->ref_int);
-
-        unset($object->projet);     // Should be fk_project
-        unset($object->project);    // Should be fk_project
-        unset($object->author);     // Should be fk_user_author
-        unset($object->timespent_old_duration);
-        unset($object->timespent_id);
-        unset($object->timespent_duration);
-        unset($object->timespent_date);
-        unset($object->timespent_datehour);
-        unset($object->timespent_withhour);
-        unset($object->timespent_fk_user);
-        unset($object->timespent_note);
-
-        unset($object->statuts);
-        unset($object->statuts_short);
-        unset($object->statuts_logo);
-        unset($object->statuts_long);
-        unset($object->labelstatut);
-        unset($object->labelstatut_short);
-
-        unset($object->element);
-        unset($object->fk_element);
-        unset($object->table_element);
-        unset($object->table_element_line);
-        unset($object->class_element_line);
-        unset($object->picto);
-
-        unset($object->facturee);		// Replace with billed
-        unset($object->fieldsforcombobox);
+		// Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
+		unset($object->linkedObjects);
+
+		unset($object->lignes); // we don't want lignes, we want only ->lines
+
+		unset($object->fields);
+		unset($object->oldline);
+
+		unset($object->error);
+		unset($object->errors);
+
+		unset($object->ref_previous);
+		unset($object->ref_next);
+		unset($object->ref_int);
+
+		unset($object->projet);     // Should be fk_project
+		unset($object->project);    // Should be fk_project
+		unset($object->author);     // Should be fk_user_author
+		unset($object->timespent_old_duration);
+		unset($object->timespent_id);
+		unset($object->timespent_duration);
+		unset($object->timespent_date);
+		unset($object->timespent_datehour);
+		unset($object->timespent_withhour);
+		unset($object->timespent_fk_user);
+		unset($object->timespent_note);
+
+		unset($object->statuts);
+		unset($object->statuts_short);
+		unset($object->statuts_logo);
+		unset($object->statuts_long);
+		unset($object->labelstatut);
+		unset($object->labelstatut_short);
+
+		unset($object->element);
+		unset($object->fk_element);
+		unset($object->table_element);
+		unset($object->table_element_line);
+		unset($object->class_element_line);
+		unset($object->picto);
+
+		unset($object->facturee);		// Replace with billed
+		unset($object->fieldsforcombobox);
 		unset($object->comments);
 
-        unset($object->skip_update_total);
-        unset($object->context);
-
-        // Remove the $oldcopy property because it is not supported by the JSON
-        // encoder. The following error is generated when trying to serialize
-        // it: "Error encoding/decoding JSON: Type is not supported"
-        // Note: Event if this property was correctly handled by the JSON
-        // encoder, it should be ignored because keeping it would let the API
-        // have a very strange behavior: calling PUT and then GET on the same
-        // resource would give different results:
-        // PUT /objects/{id} -> returns object with oldcopy = previous version of the object
-        // GET /objects/{id} -> returns object with oldcopy empty
-        unset($object->oldcopy);
-
-        // If object has lines, remove $db property
-        if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0)  {
-            $nboflines = count($object->lines);
-        	for ($i=0; $i < $nboflines; $i++)
-            {
-                $this->_cleanObjectDatas($object->lines[$i]);
-
-                unset($object->lines[$i]->contact);
-                unset($object->lines[$i]->contact_id);
-                unset($object->lines[$i]->country);
-                unset($object->lines[$i]->country_id);
-                unset($object->lines[$i]->country_code);
-                unset($object->lines[$i]->mode_reglement_id);
-                unset($object->lines[$i]->mode_reglement_code);
-                unset($object->lines[$i]->mode_reglement);
-                unset($object->lines[$i]->cond_reglement_id);
-                unset($object->lines[$i]->cond_reglement_code);
-                unset($object->lines[$i]->cond_reglement);
-                unset($object->lines[$i]->fk_delivery_address);
-                unset($object->lines[$i]->fk_projet);
-                unset($object->lines[$i]->thirdparty);
-                unset($object->lines[$i]->user);
-                unset($object->lines[$i]->model_pdf);
-                unset($object->lines[$i]->modelpdf);
-                unset($object->lines[$i]->note_public);
-                unset($object->lines[$i]->note_private);
-                unset($object->lines[$i]->fk_incoterms);
-                unset($object->lines[$i]->libelle_incoterms);
-                unset($object->lines[$i]->location_incoterms);
-                unset($object->lines[$i]->name);
-                unset($object->lines[$i]->lastname);
-                unset($object->lines[$i]->firstname);
-                unset($object->lines[$i]->civility_id);
-                unset($object->lines[$i]->fk_multicurrency);
-                unset($object->lines[$i]->multicurrency_code);
-                unset($object->lines[$i]->shipping_method_id);
-            }
-        }
-
-        if (! empty($object->thirdparty) && is_object($object->thirdparty))
-        {
-        	$this->_cleanObjectDatas($object->thirdparty);
-        }
+		unset($object->skip_update_total);
+		unset($object->context);
+
+		// Remove the $oldcopy property because it is not supported by the JSON
+		// encoder. The following error is generated when trying to serialize
+		// it: "Error encoding/decoding JSON: Type is not supported"
+		// Note: Event if this property was correctly handled by the JSON
+		// encoder, it should be ignored because keeping it would let the API
+		// have a very strange behavior: calling PUT and then GET on the same
+		// resource would give different results:
+		// PUT /objects/{id} -> returns object with oldcopy = previous version of the object
+		// GET /objects/{id} -> returns object with oldcopy empty
+		unset($object->oldcopy);
+
+		// If object has lines, remove $db property
+		if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0)  {
+			$nboflines = count($object->lines);
+			for ($i=0; $i < $nboflines; $i++)
+			{
+				$this->_cleanObjectDatas($object->lines[$i]);
+
+				unset($object->lines[$i]->contact);
+				unset($object->lines[$i]->contact_id);
+				unset($object->lines[$i]->country);
+				unset($object->lines[$i]->country_id);
+				unset($object->lines[$i]->country_code);
+				unset($object->lines[$i]->mode_reglement_id);
+				unset($object->lines[$i]->mode_reglement_code);
+				unset($object->lines[$i]->mode_reglement);
+				unset($object->lines[$i]->cond_reglement_id);
+				unset($object->lines[$i]->cond_reglement_code);
+				unset($object->lines[$i]->cond_reglement);
+				unset($object->lines[$i]->fk_delivery_address);
+				unset($object->lines[$i]->fk_projet);
+				unset($object->lines[$i]->thirdparty);
+				unset($object->lines[$i]->user);
+				unset($object->lines[$i]->model_pdf);
+				unset($object->lines[$i]->modelpdf);
+				unset($object->lines[$i]->note_public);
+				unset($object->lines[$i]->note_private);
+				unset($object->lines[$i]->fk_incoterms);
+				unset($object->lines[$i]->libelle_incoterms);
+				unset($object->lines[$i]->location_incoterms);
+				unset($object->lines[$i]->name);
+				unset($object->lines[$i]->lastname);
+				unset($object->lines[$i]->firstname);
+				unset($object->lines[$i]->civility_id);
+				unset($object->lines[$i]->fk_multicurrency);
+				unset($object->lines[$i]->multicurrency_code);
+				unset($object->lines[$i]->shipping_method_id);
+			}
+		}
+
+		if (! empty($object->thirdparty) && is_object($object->thirdparty))
+		{
+			$this->_cleanObjectDatas($object->thirdparty);
+		}
 
 		return $object;
-    }
+	}
 
 	/**
 	 * Check user access to a resource
@@ -245,25 +245,25 @@ 
 	 */
 	function _checkFilters($sqlfilters)
 	{
-	    //$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-	    //$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
-	    $tmp=$sqlfilters;
-	    $ok=0;
-	    $i=0; $nb=count($tmp);
-	    $counter=0;
-	    while ($i < $nb)
-	    {
-	        if ($tmp[$i]=='(') $counter++;
-	        if ($tmp[$i]==')') $counter--;
-            if ($counter < 0)
-            {
-	           $error="Bad sqlfilters=".$sqlfilters;
-	           dol_syslog($error, LOG_WARNING);
-	           return false;
-            }
-            $i++;
-	    }
-	    return true;
+		//$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+		//$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
+		$tmp=$sqlfilters;
+		$ok=0;
+		$i=0; $nb=count($tmp);
+		$counter=0;
+		while ($i < $nb)
+		{
+			if ($tmp[$i]=='(') $counter++;
+			if ($tmp[$i]==')') $counter--;
+			if ($counter < 0)
+			{
+			   $error="Bad sqlfilters=".$sqlfilters;
+			   dol_syslog($error, LOG_WARNING);
+			   return false;
+			}
+			$i++;
+		}
+		return true;
 	}
 
 	/**
@@ -274,22 +274,22 @@ 
 	 */
 	static function _forge_criteria_callback($matches)
 	{
-	    global $db;
-
-	    //dol_syslog("Convert matches ".$matches[1]);
-	    if (empty($matches[1])) return '';
-	    $tmp=explode(':',$matches[1]);
-        if (count($tmp) < 3) return '';
-
-	    $tmpescaped=$tmp[2];
-	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
-	    {
-	        $tmpescaped = "'".$db->escape($regbis[1])."'";
-	    }
-	    else
-	    {
-	        $tmpescaped = $db->escape($tmpescaped);
-	    }
-	    return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
+		global $db;
+
+		//dol_syslog("Convert matches ".$matches[1]);
+		if (empty($matches[1])) return '';
+		$tmp=explode(':',$matches[1]);
+		if (count($tmp) < 3) return '';
+
+		$tmpescaped=$tmp[2];
+		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
+		{
+			$tmpescaped = "'".$db->escape($regbis[1])."'";
+		}
+		else
+		{
+			$tmpescaped = $db->escape($tmpescaped);
+		}
+		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
 	}
 }

htdocs/api/class/api_documents.class.php

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  */
 
 use Luracast\Restler\RestException;
-use Luracast\Restler\Format\UploadFormat;
 
 
 require_once DOL_DOCUMENT_ROOT.'/main.inc.php';

htdocs/public/agenda/agendaexport.php

Indentation +7 added lines, -7 removed lines

@@ -108,12 +108,12 @@ 
 // Complete long filename
 foreach ($filters as $key => $value)
 {
-    //if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
+	//if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
 	if ($key == 'year')            $filename.='-year'.$value;
-    if ($key == 'id')              $filename.='-id'.$value;
-    if ($key == 'idfrom')          $filename.='-idfrom'.$value;
-    if ($key == 'idto')            $filename.='-idto'.$value;
-    if ($key == 'project')         $filename.='-project'.$value;
+	if ($key == 'id')              $filename.='-id'.$value;
+	if ($key == 'idfrom')          $filename.='-idfrom'.$value;
+	if ($key == 'idto')            $filename.='-idto'.$value;
+	if ($key == 'project')         $filename.='-project'.$value;
 	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
 	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
 }
@@ -127,7 +127,7 @@ 
 	$langs->load("main");
 	$langs->load("errors");
 	llxHeaderVierge();
-    print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
+	print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
 	llxFooterVierge();
 	exit;
 }
@@ -162,7 +162,7 @@ 
 		$result=readfile($outputfile);
 		if (! $result) print 'File '.$outputfile.' was empty.';
 
-	    //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
+		//header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
 	}
 	else

htdocs/public/members/public_card.php

Indentation +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
 */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
 	print "</body>\n";
 	print "</html>\n";

htdocs/public/members/public_list.php

Indentation +6 added lines, -6 removed lines

@@ -58,10 +58,10 @@ 
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
 	print "<html>\n";
-    print "<head>\n";
-    print "<title>".$title."</title>\n";
-    if ($head) print $head."\n";
-    print "</head>\n";
+	print "<head>\n";
+	print "<title>".$title."</title>\n";
+	if ($head) print $head."\n";
+	print "</head>\n";
 	print '<body class="public_body">'."\n";
 }
 
@@ -72,9 +72,9 @@ 
  */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
-    print "</body>\n";
+	print "</body>\n";
 	print "</html>\n";
 }
 

htdocs/public/emailing/mailing-read.php

Indentation +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 
 	$resql=$db->query($sql);
 
-    //Update status communication of contact prospect
+	//Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG);
 

htdocs/public/emailing/mailing-unsubscribe.php

Indentation +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 	$resql=$db->query($sql);
 	if (! $resql) dol_print_error($db);
 
-    // Update status communication of contact prospect
+	// Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)";
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG);
 

htdocs/public/paybox/paymentok.php

Indentation +7 added lines, -7 removed lines

@@ -140,12 +140,12 @@ 
 	$appli=constant('DOL_APPLICATION_TITLE');
 	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
 	{
-	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-	    if (preg_match('/\d\.\d/', $appli))
-	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    }
-	    else $appli.=" ".DOL_VERSION;
+		$appli=$conf->global->MAIN_APPLICATION_TITLE;
+		if (preg_match('/\d\.\d/', $appli))
+		{
+			if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+		}
+		else $appli.=" ".DOL_VERSION;
 	}
 	else $appli.=" ".DOL_VERSION;
 	
@@ -167,7 +167,7 @@ 
 	}
 	$content.="<br>\n";
 	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-    $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
 	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
 	$content.="tag=".$fulltag."<br>\n";
 

htdocs/public/opensurvey/studs.php

Indentation +5 added lines, -5 removed lines

@@ -245,13 +245,13 @@
 
 if (empty($object->ref))     // For survey, id is a hex string
 {
-    $langs->load("errors");
-    print $langs->trans("ErrorRecordNotFound");
+	$langs->load("errors");
+	print $langs->trans("ErrorRecordNotFound");
 
-    llxFooterSurvey();
+	llxFooterSurvey();
 
-    $db->close();
-    exit();
+	$db->close();
+	exit();
 }
 
 // Define format of choices