alxarafe / alixar

dolibarr/htdocs/api/class/api_login.class.php

Indentation +100 added lines, -100 removed lines

@@ -31,110 +31,110 @@
      */
     function __construct()
     {
-		global $db;
-		$this->db = $db;
-	}
-
-	/**
-	 * Login
-	 *
-	 * Request the API token for a couple username / password.
-	 * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
-	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API key (DOLAPIKEY) can be found/set on the user page.
-	 *
-	 * @param   string  $login			User login
-	 * @param   string  $password		User password
-	 * @param   string  $entity			Entity (when multicompany module is used). '' means 1=first company.
-	 * @param   int     $reset          Reset token (0=get current token, 1=ask a new token and canceled old token. This means access using current existing API token of user will fails: new token will be required for new access)
+        global $db;
+        $this->db = $db;
+    }
+
+    /**
+     * Login
+     *
+     * Request the API token for a couple username / password.
+     * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
+     * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API key (DOLAPIKEY) can be found/set on the user page.
+     *
+     * @param   string  $login			User login
+     * @param   string  $password		User password
+     * @param   string  $entity			Entity (when multicompany module is used). '' means 1=first company.
+     * @param   int     $reset          Reset token (0=get current token, 1=ask a new token and canceled old token. This means access using current existing API token of user will fails: new token will be required for new access)
      * @return  array                   Response status and user token
      *
-	 * @throws 200
-	 * @throws 403
-	 * @throws 500
-	 *
-	 * @url GET /
-	 * @url POST /
-	 */
+     * @throws 200
+     * @throws 403
+     * @throws 500
+     *
+     * @url GET /
+     * @url POST /
+     */
     public function index($login, $password, $entity='', $reset=0)
     {
 
-	    global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
-
-		// Authentication mode
-		if (empty($dolibarr_main_authentication))
-			$dolibarr_main_authentication = 'http,dolibarr';
-		// Authentication mode: forceuser
-		if ($dolibarr_main_authentication == 'forceuser')
-		{
-			if (empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
-			if ($dolibarr_auto_user != $login)
-			{
-				dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
-				throw new RestException(403, "Your instance is set to use the automatic login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
-			}
-		}
-		// Set authmode
-		$authmode = explode(',', $dolibarr_main_authentication);
-
-		if ($entity != '' && ! is_numeric($entity))
-		{
-			throw new RestException(403, "Bad value for entity, must be the numeric ID of company.");
-		}
-		if ($entity == '') $entity=1;
-
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
-		$login = checkLoginPassEntity($login, $password, $entity, $authmode);
-		if (empty($login))
-		{
-			throw new RestException(403, 'Access denied');
-		}
-
-		$token = 'failedtogenerateorgettoken';
-
-		$tmpuser=new User($this->db);
-		$tmpuser->fetch(0, $login, 0, 0, $entity);
-		if (empty($tmpuser->id))
-		{
-			throw new RestException(500, 'Failed to load user');
-		}
-
-		// Renew the hash
-		if (empty($tmpuser->api_key) || $reset)
-		{
-			$tmpuser->getrights();
-			if (empty($tmpuser->rights->user->self->creer))
-			{
-				throw new RestException(403, 'User need write permission on itself to reset its API token');
-			}
-
-    		// Generate token for user
-    		$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY,1);
-
-    		// We store API token into database
-    		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
-    		$sql.= " SET api_key = '".$this->db->escape($token)."'";
-    		$sql.= " WHERE login = '".$this->db->escape($login)."'";
-
-    		dol_syslog(get_class($this)."::login", LOG_DEBUG);	// No log
-    		$result = $this->db->query($sql);
-    		if (!$result)
-    		{
-    			throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
-    		}
-		}
-		else
-		{
+        global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
+
+        // Authentication mode
+        if (empty($dolibarr_main_authentication))
+            $dolibarr_main_authentication = 'http,dolibarr';
+        // Authentication mode: forceuser
+        if ($dolibarr_main_authentication == 'forceuser')
+        {
+            if (empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+            if ($dolibarr_auto_user != $login)
+            {
+                dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
+                throw new RestException(403, "Your instance is set to use the automatic login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
+            }
+        }
+        // Set authmode
+        $authmode = explode(',', $dolibarr_main_authentication);
+
+        if ($entity != '' && ! is_numeric($entity))
+        {
+            throw new RestException(403, "Bad value for entity, must be the numeric ID of company.");
+        }
+        if ($entity == '') $entity=1;
+
+        include_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+        $login = checkLoginPassEntity($login, $password, $entity, $authmode);
+        if (empty($login))
+        {
+            throw new RestException(403, 'Access denied');
+        }
+
+        $token = 'failedtogenerateorgettoken';
+
+        $tmpuser=new User($this->db);
+        $tmpuser->fetch(0, $login, 0, 0, $entity);
+        if (empty($tmpuser->id))
+        {
+            throw new RestException(500, 'Failed to load user');
+        }
+
+        // Renew the hash
+        if (empty($tmpuser->api_key) || $reset)
+        {
+            $tmpuser->getrights();
+            if (empty($tmpuser->rights->user->self->creer))
+            {
+                throw new RestException(403, 'User need write permission on itself to reset its API token');
+            }
+
+            // Generate token for user
+            $token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY,1);
+
+            // We store API token into database
+            $sql = "UPDATE ".MAIN_DB_PREFIX."user";
+            $sql.= " SET api_key = '".$this->db->escape($token)."'";
+            $sql.= " WHERE login = '".$this->db->escape($login)."'";
+
+            dol_syslog(get_class($this)."::login", LOG_DEBUG);	// No log
+            $result = $this->db->query($sql);
+            if (!$result)
+            {
+                throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
+            }
+        }
+        else
+        {
             $token = $tmpuser->api_key;
-		}
-
-		//return token
-		return array(
-			'success' => array(
-				'code' => 200,
-				'token' => $token,
-			    'entity' => $tmpuser->entity,
-			    'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
-			)
-		);
-	}
+        }
+
+        //return token
+        return array(
+            'success' => array(
+                'code' => 200,
+                'token' => $token,
+                'entity' => $tmpuser->entity,
+                'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
+            )
+        );
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -55,7 +55,7 @@ 
 	 * @url GET /
 	 * @url POST /
 	 */
-    public function index($login, $password, $entity='', $reset=0)
+    public function index($login, $password, $entity = '', $reset = 0)
     {
 
 	    global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
@@ -66,7 +66,7 @@ 
 		// Authentication mode: forceuser
 		if ($dolibarr_main_authentication == 'forceuser')
 		{
-			if (empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+			if (empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
 			if ($dolibarr_auto_user != $login)
 			{
 				dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
@@ -76,13 +76,13 @@ 
 		// Set authmode
 		$authmode = explode(',', $dolibarr_main_authentication);
 
-		if ($entity != '' && ! is_numeric($entity))
+		if ($entity != '' && !is_numeric($entity))
 		{
 			throw new RestException(403, "Bad value for entity, must be the numeric ID of company.");
 		}
-		if ($entity == '') $entity=1;
+		if ($entity == '') $entity = 1;
 
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		$login = checkLoginPassEntity($login, $password, $entity, $authmode);
 		if (empty($login))
 		{
@@ -91,7 +91,7 @@ 
 
 		$token = 'failedtogenerateorgettoken';
 
-		$tmpuser=new User($this->db);
+		$tmpuser = new User($this->db);
 		$tmpuser->fetch(0, $login, 0, 0, $entity);
 		if (empty($tmpuser->id))
 		{
@@ -108,14 +108,14 @@ 
 			}
 
     		// Generate token for user
-    		$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY,1);
+    		$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY, 1);
 
     		// We store API token into database
     		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
-    		$sql.= " SET api_key = '".$this->db->escape($token)."'";
-    		$sql.= " WHERE login = '".$this->db->escape($login)."'";
+    		$sql .= " SET api_key = '".$this->db->escape($token)."'";
+    		$sql .= " WHERE login = '".$this->db->escape($login)."'";
 
-    		dol_syslog(get_class($this)."::login", LOG_DEBUG);	// No log
+    		dol_syslog(get_class($this)."::login", LOG_DEBUG); // No log
     		$result = $this->db->query($sql);
     		if (!$result)
     		{
@@ -133,7 +133,7 @@ 
 				'code' => 200,
 				'token' => $token,
 			    'entity' => $tmpuser->entity,
-			    'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
+			    'message' => 'Welcome '.$login.($reset ? ' - Token is new' : ' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
 			)
 		);
 	}

Braces +10 added lines, -6 removed lines

@@ -61,12 +61,15 @@ 
 	    global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
 
 		// Authentication mode
-		if (empty($dolibarr_main_authentication))
-			$dolibarr_main_authentication = 'http,dolibarr';
+		if (empty($dolibarr_main_authentication)) {
+					$dolibarr_main_authentication = 'http,dolibarr';
+		}
 		// Authentication mode: forceuser
 		if ($dolibarr_main_authentication == 'forceuser')
 		{
-			if (empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+			if (empty($dolibarr_auto_user)) {
+			    $dolibarr_auto_user='auto';
+			}
 			if ($dolibarr_auto_user != $login)
 			{
 				dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
@@ -80,7 +83,9 @@ 
 		{
 			throw new RestException(403, "Bad value for entity, must be the numeric ID of company.");
 		}
-		if ($entity == '') $entity=1;
+		if ($entity == '') {
+		    $entity=1;
+		}
 
 		include_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
 		$login = checkLoginPassEntity($login, $password, $entity, $authmode);
@@ -121,8 +126,7 @@ 
     		{
     			throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
     		}
-		}
-		else
+		} else
 		{
             $token = $tmpuser->api_key;
 		}

dolibarr/htdocs/api/class/api.class.php

Indentation +83 added lines, -83 removed lines

@@ -100,8 +100,8 @@ 
         // Remove $db object property for object
         unset($object->db);
         unset($object->isextrafieldmanaged);
-		unset($object->ismultientitymanaged);
-		unset($object->restrictiononfksoc);
+        unset($object->ismultientitymanaged);
+        unset($object->restrictiononfksoc);
 
         // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
         unset($object->linkedObjects);
@@ -145,7 +145,7 @@ 
         unset($object->picto);
 
         unset($object->fieldsforcombobox);
-		unset($object->comments);
+        unset($object->comments);
 
         unset($object->skip_update_total);
         unset($object->context);
@@ -164,7 +164,7 @@ 
         // 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++)
+            for ($i=0; $i < $nboflines; $i++)
             {
                 $this->_cleanObjectDatas($object->lines[$i]);
 
@@ -202,101 +202,101 @@ 
 
         if (! empty($object->thirdparty) && is_object($object->thirdparty))
         {
-        	$this->_cleanObjectDatas($object->thirdparty);
+            $this->_cleanObjectDatas($object->thirdparty);
         }
 
-		return $object;
+        return $object;
     }
 
-	/**
-	 * Check user access to a resource
-	 *
-	 * Check access by user to a given resource
-	 *
-	 * @param string	$resource		element to check
-	 * @param int		$resource_id	Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
-	 * @param type		$dbtablename	'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity. Not used if objectid is null (optional)
-	 * @param string	$feature2		Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
-	 * @param string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
-	 * @param string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
+    /**
+     * Check user access to a resource
+     *
+     * Check access by user to a given resource
+     *
+     * @param string	$resource		element to check
+     * @param int		$resource_id	Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
+     * @param type		$dbtablename	'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity. Not used if objectid is null (optional)
+     * @param string	$feature2		Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
+     * @param string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
+     * @param string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
      * @return bool
-	 * @throws RestException
-	 */
+     * @throws RestException
+     */
     static function _checkAccessToResource($resource, $resource_id=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
     {
 
-		// Features/modules to check
-		$featuresarray = array($resource);
-		if (preg_match('/&/', $resource)) {
-			$featuresarray = explode("&", $resource);
-		}
-		else if (preg_match('/\|/', $resource)) {
-			$featuresarray = explode("|", $resource);
-		}
-
-		// More subfeatures to check
-		if (! empty($feature2)) {
-			$feature2 = explode("|", $feature2);
-		}
-
-		return checkUserAccessToObject(DolibarrApiAccess::$user, $featuresarray, $resource_id, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
-	}
-
-	/**
-	 * Return if a $sqlfilters parameter is valid
-	 *
-	 * @param  string   $sqlfilters     sqlfilter string
-	 * @return boolean                  True if valid, False if not valid
-	 */
-	function _checkFilters($sqlfilters)
-	{
-	    //$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-	    //$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
-	    $tmp=$sqlfilters;
-	    $ok=0;
-	    $i=0; $nb=strlen($tmp);
-	    $counter=0;
-	    while ($i < $nb)
-	    {
-	        if ($tmp[$i]=='(') $counter++;
-	        if ($tmp[$i]==')') $counter--;
+        // Features/modules to check
+        $featuresarray = array($resource);
+        if (preg_match('/&/', $resource)) {
+            $featuresarray = explode("&", $resource);
+        }
+        else if (preg_match('/\|/', $resource)) {
+            $featuresarray = explode("|", $resource);
+        }
+
+        // More subfeatures to check
+        if (! empty($feature2)) {
+            $feature2 = explode("|", $feature2);
+        }
+
+        return checkUserAccessToObject(DolibarrApiAccess::$user, $featuresarray, $resource_id, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
+    }
+
+    /**
+     * Return if a $sqlfilters parameter is valid
+     *
+     * @param  string   $sqlfilters     sqlfilter string
+     * @return boolean                  True if valid, False if not valid
+     */
+    function _checkFilters($sqlfilters)
+    {
+        //$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+        //$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
+        $tmp=$sqlfilters;
+        $ok=0;
+        $i=0; $nb=strlen($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;
+                $error="Bad sqlfilters=".$sqlfilters;
+                dol_syslog($error, LOG_WARNING);
+                return false;
             }
             $i++;
-	    }
-	    return true;
-	}
+        }
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Function to forge a SQL criteria
-	 *
-	 * @param  array    $matches       Array of found string by regex search
-	 * @return string                  Forged criteria. Example: "t.field like 'abc%'"
-	 */
-	static function _forge_criteria_callback($matches)
-	{
+    /**
+     * Function to forge a SQL criteria
+     *
+     * @param  array    $matches       Array of found string by regex search
+     * @return string                  Forged criteria. Example: "t.field like 'abc%'"
+     */
+    static function _forge_criteria_callback($matches)
+    {
         // phpcs:enable
-	    global $db;
+        global $db;
 
-	    //dol_syslog("Convert matches ".$matches[1]);
-	    if (empty($matches[1])) return '';
-	    $tmp=explode(':',$matches[1]);
+        //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;
-	}
+        $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;
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -46,7 +46,7 @@ 
      * @param   string  $cachedir       Cache dir
      * @param   boolean $refreshCache   Update cache
      */
-    function __construct($db, $cachedir='', $refreshCache=false)
+    function __construct($db, $cachedir = '', $refreshCache = false)
     {
         global $conf, $dolibarr_main_url_root;
 
@@ -54,14 +54,14 @@ 
         Defaults::$cacheDirectory = $cachedir;
 
         $this->db = $db;
-        $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
+        $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);
@@ -118,9 +118,9 @@ 
         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->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);
@@ -162,9 +162,9 @@ 
         unset($object->oldcopy);
 
         // If object has lines, remove $db property
-        if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0)  {
+        if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
             $nboflines = count($object->lines);
-        	for ($i=0; $i < $nboflines; $i++)
+        	for ($i = 0; $i < $nboflines; $i++)
             {
                 $this->_cleanObjectDatas($object->lines[$i]);
 
@@ -200,7 +200,7 @@ 
             }
         }
 
-        if (! empty($object->thirdparty) && is_object($object->thirdparty))
+        if (!empty($object->thirdparty) && is_object($object->thirdparty))
         {
         	$this->_cleanObjectDatas($object->thirdparty);
         }
@@ -222,7 +222,7 @@ 
      * @return bool
 	 * @throws RestException
 	 */
-    static function _checkAccessToResource($resource, $resource_id=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
+    static function _checkAccessToResource($resource, $resource_id = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
     {
 
 		// Features/modules to check
@@ -235,7 +235,7 @@ 
 		}
 
 		// More subfeatures to check
-		if (! empty($feature2)) {
+		if (!empty($feature2)) {
 			$feature2 = explode("|", $feature2);
 		}
 
@@ -252,17 +252,17 @@ 
 	{
 	    //$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
 	    //$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
-	    $tmp=$sqlfilters;
-	    $ok=0;
-	    $i=0; $nb=strlen($tmp);
-	    $counter=0;
+	    $tmp = $sqlfilters;
+	    $ok = 0;
+	    $i = 0; $nb = strlen($tmp);
+	    $counter = 0;
 	    while ($i < $nb)
 	    {
-	        if ($tmp[$i]=='(') $counter++;
-	        if ($tmp[$i]==')') $counter--;
+	        if ($tmp[$i] == '(') $counter++;
+	        if ($tmp[$i] == ')') $counter--;
             if ($counter < 0)
             {
-	           $error="Bad sqlfilters=".$sqlfilters;
+	           $error = "Bad sqlfilters=".$sqlfilters;
 	           dol_syslog($error, LOG_WARNING);
 	           return false;
             }
@@ -285,10 +285,10 @@ 
 
 	    //dol_syslog("Convert matches ".$matches[1]);
 	    if (empty($matches[1])) return '';
-	    $tmp=explode(':',$matches[1]);
+	    $tmp = explode(':', $matches[1]);
         if (count($tmp) < 3) return '';
 
-	    $tmpescaped=$tmp[2];
+	    $tmpescaped = $tmp[2];
 	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 	    {
 	        $tmpescaped = "'".$db->escape($regbis[1])."'";

Braces +17 added lines, -9 removed lines

@@ -50,7 +50,9 @@ 
     {
         global $conf, $dolibarr_main_url_root;
 
-        if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
+        if (empty($cachedir)) {
+            $cachedir = $conf->api->dir_temp;
+        }
         Defaults::$cacheDirectory = $cachedir;
 
         $this->db = $db;
@@ -229,8 +231,7 @@ 
 		$featuresarray = array($resource);
 		if (preg_match('/&/', $resource)) {
 			$featuresarray = explode("&", $resource);
-		}
-		else if (preg_match('/\|/', $resource)) {
+		} else if (preg_match('/\|/', $resource)) {
 			$featuresarray = explode("|", $resource);
 		}
 
@@ -258,8 +259,12 @@ 
 	    $counter=0;
 	    while ($i < $nb)
 	    {
-	        if ($tmp[$i]=='(') $counter++;
-	        if ($tmp[$i]==')') $counter--;
+	        if ($tmp[$i]=='(') {
+	            $counter++;
+	        }
+	        if ($tmp[$i]==')') {
+	            $counter--;
+	        }
             if ($counter < 0)
             {
 	           $error="Bad sqlfilters=".$sqlfilters;
@@ -284,16 +289,19 @@ 
 	    global $db;
 
 	    //dol_syslog("Convert matches ".$matches[1]);
-	    if (empty($matches[1])) return '';
+	    if (empty($matches[1])) {
+	        return '';
+	    }
 	    $tmp=explode(':',$matches[1]);
-        if (count($tmp) < 3) return '';
+        if (count($tmp) < 3) {
+            return '';
+        }
 
 	    $tmpescaped=$tmp[2];
 	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 	    {
 	        $tmpescaped = "'".$db->escape($regbis[1])."'";
-	    }
-	    else
+	    } else
 	    {
 	        $tmpescaped = $db->escape($tmpescaped);
 	    }

dolibarr/htdocs/api/class/api_access.class.php

Indentation +121 added lines, -121 removed lines

@@ -42,151 +42,151 @@
  */
 class DolibarrApiAccess implements iAuthenticate
 {
-	const REALM = 'Restricted Dolibarr API';
+    const REALM = 'Restricted Dolibarr API';
 
-	/**
-	 * @var array $requires	role required by API method		user / external / admin
-	 */
-	public static $requires = array('user','external','admin');
+    /**
+     * @var array $requires	role required by API method		user / external / admin
+     */
+    public static $requires = array('user','external','admin');
 
-	/**
-	 * @var string $role		user role
-	 */
+    /**
+     * @var string $role		user role
+     */
     public static $role = 'user';
 
-	/**
-	 * @var User		$user	Loggued user
-	 */
-	public static $user = '';
+    /**
+     * @var User		$user	Loggued user
+     */
+    public static $user = '';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName
-	/**
-	 * Check access
-	 *
-	 * @return bool
-	 * @throws RestException
-	 */
-	public function __isAllowed()
-	{
+    /**
+     * Check access
+     *
+     * @return bool
+     * @throws RestException
+     */
+    public function __isAllowed()
+    {
         // phpcs:enable
-		global $conf, $db;
+        global $conf, $db;
 
-		$login = '';
-		$stored_key = '';
+        $login = '';
+        $stored_key = '';
 
-		$userClass = Defaults::$userIdentifierClass;
+        $userClass = Defaults::$userIdentifierClass;
 
-		/*foreach ($_SERVER as $key => $val)
+        /*foreach ($_SERVER as $key => $val)
 		{
 		    dol_syslog($key.' - '.$val);
 		}*/
 
-		// api key can be provided in url with parameter api_key=xxx or ni header with header DOLAPIKEY:xxx
-		$api_key = '';
-		if (isset($_GET['api_key']))	// For backward compatibility
-		{
-		    // TODO Add option to disable use of api key on url. Return errors if used.
-		    $api_key = $_GET['api_key'];
-		}
-		if (isset($_GET['DOLAPIKEY']))
-		{
-		    // TODO Add option to disable use of api key on url. Return errors if used.
-		    $api_key = $_GET['DOLAPIKEY'];                     // With GET method
-		}
-		if (isset($_SERVER['HTTP_DOLAPIKEY']))         // Param DOLAPIKEY in header can be read with HTTP_DOLAPIKEY
-		{
-		    $api_key = $_SERVER['HTTP_DOLAPIKEY'];     // With header method (recommanded)
-		}
+        // api key can be provided in url with parameter api_key=xxx or ni header with header DOLAPIKEY:xxx
+        $api_key = '';
+        if (isset($_GET['api_key']))	// For backward compatibility
+        {
+            // TODO Add option to disable use of api key on url. Return errors if used.
+            $api_key = $_GET['api_key'];
+        }
+        if (isset($_GET['DOLAPIKEY']))
+        {
+            // TODO Add option to disable use of api key on url. Return errors if used.
+            $api_key = $_GET['DOLAPIKEY'];                     // With GET method
+        }
+        if (isset($_SERVER['HTTP_DOLAPIKEY']))         // Param DOLAPIKEY in header can be read with HTTP_DOLAPIKEY
+        {
+            $api_key = $_SERVER['HTTP_DOLAPIKEY'];     // With header method (recommanded)
+        }
 
-		if ($api_key)
-		{
-			$userentity = 0;
-
-			$sql = "SELECT u.login, u.datec, u.api_key, ";
-			$sql.= " u.tms as date_modification, u.entity";
-			$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-			$sql.= " WHERE u.api_key = '".$db->escape($api_key)."'";
-			// TODO Check if 2 users has same API key.
-
-			$result = $db->query($sql);
-			if ($result)
-			{
-				if ($db->num_rows($result))
-				{
-					$obj = $db->fetch_object($result);
-					$login = $obj->login;
-					$stored_key = $obj->api_key;
-					$userentity = $obj->entity;
-
-					if (! defined("DOLENTITY") && $conf->entity != ($obj->entity?$obj->entity:1))		// If API was not forced with HTTP_DOLENTITY, and user is on another entity, so we reset entity to entity of user
-					{
-						$conf->entity = ($obj->entity?$obj->entity:1);
-						// We must also reload global conf to get params from the entity
-						dol_syslog("Entity was not set on http header with HTTP_DOLAPIENTITY (recommanded for performance purpose), so we switch now on entity of user (".$conf->entity .") and we have to reload configuration.", LOG_WARNING);
-						$conf->setValues($db);
-					}
-				}
-			}
-			else {
-				throw new RestException(503, 'Error when fetching user api_key :'.$db->error_msg);
-			}
-
-			if ($stored_key != $api_key) {		// This should not happen since we did a search on api_key
-				$userClass::setCacheIdentifier($api_key);
-				return false;
-			}
-
-			if (! $login)
-			{
-			    throw new RestException(503, 'Error when searching login user from api key');
-			}
-			$fuser = new User($db);
-			$result = $fuser->fetch('', $login, '', 0, (empty($userentity) ? -1 : $conf->entity));	// If user is not entity 0, we search in working entity $conf->entity  (that may have been forced to a different value than user entity)
-			if ($result <= 0) {
-				throw new RestException(503, 'Error when fetching user :'.$fuser->error.' (conf->entity='.$conf->entity.')');
-			}
-			$fuser->getrights();
-			static::$user = $fuser;
-
-			if($fuser->societe_id)
-				static::$role = 'external';
-
-			if($fuser->admin)
-				static::$role = 'admin';
+        if ($api_key)
+        {
+            $userentity = 0;
+
+            $sql = "SELECT u.login, u.datec, u.api_key, ";
+            $sql.= " u.tms as date_modification, u.entity";
+            $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+            $sql.= " WHERE u.api_key = '".$db->escape($api_key)."'";
+            // TODO Check if 2 users has same API key.
+
+            $result = $db->query($sql);
+            if ($result)
+            {
+                if ($db->num_rows($result))
+                {
+                    $obj = $db->fetch_object($result);
+                    $login = $obj->login;
+                    $stored_key = $obj->api_key;
+                    $userentity = $obj->entity;
+
+                    if (! defined("DOLENTITY") && $conf->entity != ($obj->entity?$obj->entity:1))		// If API was not forced with HTTP_DOLENTITY, and user is on another entity, so we reset entity to entity of user
+                    {
+                        $conf->entity = ($obj->entity?$obj->entity:1);
+                        // We must also reload global conf to get params from the entity
+                        dol_syslog("Entity was not set on http header with HTTP_DOLAPIENTITY (recommanded for performance purpose), so we switch now on entity of user (".$conf->entity .") and we have to reload configuration.", LOG_WARNING);
+                        $conf->setValues($db);
+                    }
+                }
+            }
+            else {
+                throw new RestException(503, 'Error when fetching user api_key :'.$db->error_msg);
+            }
+
+            if ($stored_key != $api_key) {		// This should not happen since we did a search on api_key
+                $userClass::setCacheIdentifier($api_key);
+                return false;
+            }
+
+            if (! $login)
+            {
+                throw new RestException(503, 'Error when searching login user from api key');
+            }
+            $fuser = new User($db);
+            $result = $fuser->fetch('', $login, '', 0, (empty($userentity) ? -1 : $conf->entity));	// If user is not entity 0, we search in working entity $conf->entity  (that may have been forced to a different value than user entity)
+            if ($result <= 0) {
+                throw new RestException(503, 'Error when fetching user :'.$fuser->error.' (conf->entity='.$conf->entity.')');
+            }
+            $fuser->getrights();
+            static::$user = $fuser;
+
+            if($fuser->societe_id)
+                static::$role = 'external';
+
+            if($fuser->admin)
+                static::$role = 'admin';
+        }
+        else
+        {
+            throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
         }
-		else
-		{
-		    throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
-		}
 
-	    $userClass::setCacheIdentifier(static::$role);
-	    Resources::$accessControlFunction = 'DolibarrApiAccess::verifyAccess';
-	    $requirefortest = static::$requires;
-	    if (! is_array($requirefortest)) $requirefortest=explode(',',$requirefortest);
-	    return in_array(static::$role, (array) $requirefortest) || static::$role == 'admin';
-	}
+        $userClass::setCacheIdentifier(static::$role);
+        Resources::$accessControlFunction = 'DolibarrApiAccess::verifyAccess';
+        $requirefortest = static::$requires;
+        if (! is_array($requirefortest)) $requirefortest=explode(',',$requirefortest);
+        return in_array(static::$role, (array) $requirefortest) || static::$role == 'admin';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName
-	/**
-	 * @return string string to be used with WWW-Authenticate header
-	 * @example Basic
-	 * @example Digest
-	 * @example OAuth
-	 */
-	public function __getWWWAuthenticateString()
+    /**
+     * @return string string to be used with WWW-Authenticate header
+     * @example Basic
+     * @example Digest
+     * @example OAuth
+     */
+    public function __getWWWAuthenticateString()
     {
         // phpcs:enable
         return '';
     }
 
-	/**
-	 * Verify access
-	 *
-	 * @param   array $m Properties of method
-	 *
-	 * @access private
-	 * @return bool
-	 */
+    /**
+     * Verify access
+     *
+     * @param   array $m Properties of method
+     *
+     * @access private
+     * @return bool
+     */
     public static function verifyAccess(array $m)
     {
         $requires = isset($m['class']['DolibarrApiAccess']['properties']['requires'])

Spacing +15 added lines, -15 removed lines

@@ -18,7 +18,7 @@ 
 
 // Create the autoloader for Luracast
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
-call_user_func(function () {
+call_user_func(function() {
     $loader = Luracast\Restler\AutoLoader::instance();
     spl_autoload_register($loader);
     return $loader;
@@ -47,7 +47,7 @@ 
 	/**
 	 * @var array $requires	role required by API method		user / external / admin
 	 */
-	public static $requires = array('user','external','admin');
+	public static $requires = array('user', 'external', 'admin');
 
 	/**
 	 * @var string $role		user role
@@ -91,11 +91,11 @@ 
 		if (isset($_GET['DOLAPIKEY']))
 		{
 		    // TODO Add option to disable use of api key on url. Return errors if used.
-		    $api_key = $_GET['DOLAPIKEY'];                     // With GET method
+		    $api_key = $_GET['DOLAPIKEY']; // With GET method
 		}
 		if (isset($_SERVER['HTTP_DOLAPIKEY']))         // Param DOLAPIKEY in header can be read with HTTP_DOLAPIKEY
 		{
-		    $api_key = $_SERVER['HTTP_DOLAPIKEY'];     // With header method (recommanded)
+		    $api_key = $_SERVER['HTTP_DOLAPIKEY']; // With header method (recommanded)
 		}
 
 		if ($api_key)
@@ -103,9 +103,9 @@ 
 			$userentity = 0;
 
 			$sql = "SELECT u.login, u.datec, u.api_key, ";
-			$sql.= " u.tms as date_modification, u.entity";
-			$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-			$sql.= " WHERE u.api_key = '".$db->escape($api_key)."'";
+			$sql .= " u.tms as date_modification, u.entity";
+			$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+			$sql .= " WHERE u.api_key = '".$db->escape($api_key)."'";
 			// TODO Check if 2 users has same API key.
 
 			$result = $db->query($sql);
@@ -118,11 +118,11 @@ 
 					$stored_key = $obj->api_key;
 					$userentity = $obj->entity;
 
-					if (! defined("DOLENTITY") && $conf->entity != ($obj->entity?$obj->entity:1))		// If API was not forced with HTTP_DOLENTITY, and user is on another entity, so we reset entity to entity of user
+					if (!defined("DOLENTITY") && $conf->entity != ($obj->entity ? $obj->entity : 1))		// If API was not forced with HTTP_DOLENTITY, and user is on another entity, so we reset entity to entity of user
 					{
-						$conf->entity = ($obj->entity?$obj->entity:1);
+						$conf->entity = ($obj->entity ? $obj->entity : 1);
 						// We must also reload global conf to get params from the entity
-						dol_syslog("Entity was not set on http header with HTTP_DOLAPIENTITY (recommanded for performance purpose), so we switch now on entity of user (".$conf->entity .") and we have to reload configuration.", LOG_WARNING);
+						dol_syslog("Entity was not set on http header with HTTP_DOLAPIENTITY (recommanded for performance purpose), so we switch now on entity of user (".$conf->entity.") and we have to reload configuration.", LOG_WARNING);
 						$conf->setValues($db);
 					}
 				}
@@ -136,22 +136,22 @@ 
 				return false;
 			}
 
-			if (! $login)
+			if (!$login)
 			{
 			    throw new RestException(503, 'Error when searching login user from api key');
 			}
 			$fuser = new User($db);
-			$result = $fuser->fetch('', $login, '', 0, (empty($userentity) ? -1 : $conf->entity));	// If user is not entity 0, we search in working entity $conf->entity  (that may have been forced to a different value than user entity)
+			$result = $fuser->fetch('', $login, '', 0, (empty($userentity) ? -1 : $conf->entity)); // If user is not entity 0, we search in working entity $conf->entity  (that may have been forced to a different value than user entity)
 			if ($result <= 0) {
 				throw new RestException(503, 'Error when fetching user :'.$fuser->error.' (conf->entity='.$conf->entity.')');
 			}
 			$fuser->getrights();
 			static::$user = $fuser;
 
-			if($fuser->societe_id)
+			if ($fuser->societe_id)
 				static::$role = 'external';
 
-			if($fuser->admin)
+			if ($fuser->admin)
 				static::$role = 'admin';
         }
 		else
@@ -162,7 +162,7 @@ 
 	    $userClass::setCacheIdentifier(static::$role);
 	    Resources::$accessControlFunction = 'DolibarrApiAccess::verifyAccess';
 	    $requirefortest = static::$requires;
-	    if (! is_array($requirefortest)) $requirefortest=explode(',',$requirefortest);
+	    if (!is_array($requirefortest)) $requirefortest = explode(',', $requirefortest);
 	    return in_array(static::$role, (array) $requirefortest) || static::$role == 'admin';
 	}
 

Braces +22 added lines, -13 removed lines

@@ -83,19 +83,24 @@ 
 
 		// api key can be provided in url with parameter api_key=xxx or ni header with header DOLAPIKEY:xxx
 		$api_key = '';
-		if (isset($_GET['api_key']))	// For backward compatibility
+		if (isset($_GET['api_key'])) {
+		    // For backward compatibility
 		{
 		    // TODO Add option to disable use of api key on url. Return errors if used.
 		    $api_key = $_GET['api_key'];
 		}
+		}
 		if (isset($_GET['DOLAPIKEY']))
 		{
 		    // TODO Add option to disable use of api key on url. Return errors if used.
 		    $api_key = $_GET['DOLAPIKEY'];                     // With GET method
 		}
-		if (isset($_SERVER['HTTP_DOLAPIKEY']))         // Param DOLAPIKEY in header can be read with HTTP_DOLAPIKEY
+		if (isset($_SERVER['HTTP_DOLAPIKEY'])) {
+		    // Param DOLAPIKEY in header can be read with HTTP_DOLAPIKEY
 		{
-		    $api_key = $_SERVER['HTTP_DOLAPIKEY'];     // With header method (recommanded)
+		    $api_key = $_SERVER['HTTP_DOLAPIKEY'];
+		}
+		// With header method (recommanded)
 		}
 
 		if ($api_key)
@@ -118,16 +123,17 @@ 
 					$stored_key = $obj->api_key;
 					$userentity = $obj->entity;
 
-					if (! defined("DOLENTITY") && $conf->entity != ($obj->entity?$obj->entity:1))		// If API was not forced with HTTP_DOLENTITY, and user is on another entity, so we reset entity to entity of user
+					if (! defined("DOLENTITY") && $conf->entity != ($obj->entity?$obj->entity:1)) {
+					    // If API was not forced with HTTP_DOLENTITY, and user is on another entity, so we reset entity to entity of user
 					{
 						$conf->entity = ($obj->entity?$obj->entity:1);
+					}
 						// We must also reload global conf to get params from the entity
 						dol_syslog("Entity was not set on http header with HTTP_DOLAPIENTITY (recommanded for performance purpose), so we switch now on entity of user (".$conf->entity .") and we have to reload configuration.", LOG_WARNING);
 						$conf->setValues($db);
 					}
 				}
-			}
-			else {
+			} else {
 				throw new RestException(503, 'Error when fetching user api_key :'.$db->error_msg);
 			}
 
@@ -148,13 +154,14 @@ 
 			$fuser->getrights();
 			static::$user = $fuser;
 
-			if($fuser->societe_id)
-				static::$role = 'external';
+			if($fuser->societe_id) {
+							static::$role = 'external';
+			}
 
-			if($fuser->admin)
-				static::$role = 'admin';
-        }
-		else
+			if($fuser->admin) {
+							static::$role = 'admin';
+			}
+        } else
 		{
 		    throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
 		}
@@ -162,7 +169,9 @@ 
 	    $userClass::setCacheIdentifier(static::$role);
 	    Resources::$accessControlFunction = 'DolibarrApiAccess::verifyAccess';
 	    $requirefortest = static::$requires;
-	    if (! is_array($requirefortest)) $requirefortest=explode(',',$requirefortest);
+	    if (! is_array($requirefortest)) {
+	        $requirefortest=explode(',',$requirefortest);
+	    }
 	    return in_array(static::$role, (array) $requirefortest) || static::$role == 'admin';
 	}
 

dolibarr/htdocs/api/class/api_setup.class.php

Indentation +495 added lines, -495 removed lines

@@ -76,7 +76,7 @@ 
             {
                 throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
             }
-	          $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+                $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -143,7 +143,7 @@ 
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -242,7 +242,7 @@ 
             {
                 throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
             }
-                  $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+                    $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -349,7 +349,7 @@ 
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -410,7 +410,7 @@ 
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -468,12 +468,12 @@ 
         // Add sql filters
         if ($sqlfilters)
         {
-        	if (! DolibarrApi::_checkFilters($sqlfilters))
-        	{
-        		throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-        	}
-        	$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-        	$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
         $sql.= $this->db->order($sortfield, $sortorder);
@@ -481,26 +481,26 @@ 
         $resql=$this->db->query($sql);
         if ($resql)
         {
-        	if ($this->db->num_rows($resql))
-        	{
-        		while ($tab = $this->db->fetch_object($resql))
-        		{
-        			// New usage
-        			$list[$tab->elementtype][$tab->name]['type']=$tab->type;
-        			$list[$tab->elementtype][$tab->name]['label']=$tab->label;
-        			$list[$tab->elementtype][$tab->name]['size']=$tab->size;
-        			$list[$tab->elementtype][$tab->name]['elementtype']=$tab->elementtype;
-        			$list[$tab->elementtype][$tab->name]['default']=$tab->fielddefault;
-        			$list[$tab->elementtype][$tab->name]['computed']=$tab->fieldcomputed;
-        			$list[$tab->elementtype][$tab->name]['unique']=$tab->fieldunique;
-        			$list[$tab->elementtype][$tab->name]['required']=$tab->fieldrequired;
-        			$list[$tab->elementtype][$tab->name]['param']=($tab->param ? unserialize($tab->param) : '');
-        			$list[$tab->elementtype][$tab->name]['pos']=$tab->pos;
-        			$list[$tab->elementtype][$tab->name]['alwayseditable']=$tab->alwayseditable;
-        			$list[$tab->elementtype][$tab->name]['perms']=$tab->perms;
-        			$list[$tab->elementtype][$tab->name]['list']=$tab->list;
-        		}
-        	}
+            if ($this->db->num_rows($resql))
+            {
+                while ($tab = $this->db->fetch_object($resql))
+                {
+                    // New usage
+                    $list[$tab->elementtype][$tab->name]['type']=$tab->type;
+                    $list[$tab->elementtype][$tab->name]['label']=$tab->label;
+                    $list[$tab->elementtype][$tab->name]['size']=$tab->size;
+                    $list[$tab->elementtype][$tab->name]['elementtype']=$tab->elementtype;
+                    $list[$tab->elementtype][$tab->name]['default']=$tab->fielddefault;
+                    $list[$tab->elementtype][$tab->name]['computed']=$tab->fieldcomputed;
+                    $list[$tab->elementtype][$tab->name]['unique']=$tab->fieldunique;
+                    $list[$tab->elementtype][$tab->name]['required']=$tab->fieldrequired;
+                    $list[$tab->elementtype][$tab->name]['param']=($tab->param ? unserialize($tab->param) : '');
+                    $list[$tab->elementtype][$tab->name]['pos']=$tab->pos;
+                    $list[$tab->elementtype][$tab->name]['alwayseditable']=$tab->alwayseditable;
+                    $list[$tab->elementtype][$tab->name]['perms']=$tab->perms;
+                    $list[$tab->elementtype][$tab->name]['list']=$tab->list;
+                }
+            }
         }
         else
         {
@@ -509,7 +509,7 @@ 
 
         if (! count($list))
         {
-        	throw new RestException(404, 'No extrafield found');
+            throw new RestException(404, 'No extrafield found');
         }
 
         return $list;
@@ -548,7 +548,7 @@ 
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -642,63 +642,63 @@ 
         return $list;
     }
 
-     /**
-     * Get the list of tickets categories.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
-     *
-     * @url     GET dictionary/ticket_categories
-     *
-     * @throws RestException
-     */
+        /**
+         * Get the list of tickets categories.
+         *
+         * @param string    $sortfield  Sort field
+         * @param string    $sortorder  Sort order
+         * @param int       $limit      Number of items per page
+         * @param int       $page       Page number (starting from zero)
+         * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+         * @return List of events types
+         *
+         * @url     GET dictionary/ticket_categories
+         *
+         * @throws RestException
+         */
     function getTicketsCategories($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
     {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
-    	$sql.= " WHERE t.active = 1";
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (! DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql.= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket categories : '.$this->db->lasterror());
-    	}
-
-    	return $list;
+        $list = array();
+
+        $sql = "SELECT rowid, code, pos,  label, use_default, description";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
+        $sql.= " WHERE t.active = 1";
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(503, 'Error when retrieving list of ticket categories : '.$this->db->lasterror());
+        }
+
+        return $list;
     }
 
     /**
@@ -717,47 +717,47 @@ 
      */
     function getTicketsSeverities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
     {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, color, description";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
-    	$sql.= " WHERE t.active = 1";
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (! DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql.= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket severities : '.$this->db->lasterror());
-    	}
-
-    	return $list;
+        $list = array();
+
+        $sql = "SELECT rowid, code, pos,  label, use_default, color, description";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
+        $sql.= " WHERE t.active = 1";
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(503, 'Error when retrieving list of ticket severities : '.$this->db->lasterror());
+        }
+
+        return $list;
     }
 
     /**
@@ -776,49 +776,49 @@ 
      */
     function getTicketsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
     {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
-    	$sql.= " WHERE t.active = 1";
-    	if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
-    	if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (! DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql.= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket types : '.$this->db->lasterror());
-    	}
-
-    	return $list;
+        $list = array();
+
+        $sql = "SELECT rowid, code, pos,  label, use_default, description";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
+        $sql.= " WHERE t.active = 1";
+        if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
+        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(503, 'Error when retrieving list of ticket types : '.$this->db->lasterror());
+        }
+
+        return $list;
     }
 
 
@@ -834,328 +834,328 @@ 
      */
     function getCheckIntegrity($target)
     {
-    	global $langs, $conf;
-
-    	if (! DolibarrApiAccess::$user->admin
-    		&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
-    	{
-    		throw new RestException(503, 'Error API open to admin users only or to login user defined with constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
-    	}
-
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-
-    	$langs->load("admin");
-
-    	$outexpectedchecksum = '';
-    	$outcurrentchecksum = '';
-
-    	// Modified or missing files
-    	$file_list = array('missing' => array(), 'updated' => array());
-
-    	// Local file to compare to
-    	$xmlshortfile = GETPOST('xmlshortfile')?GETPOST('xmlshortfile'):'/install/filelist-'.DOL_VERSION.'.xml';
-    	$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
-    	// Remote file to compare to
-    	$xmlremote = ($target == 'default' ? '' : $target);
-    	if (empty($xmlremote) && ! empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
-    	$param='MAIN_FILECHECK_URL_'.DOL_VERSION;
-    	if (empty($xmlremote) && ! empty($conf->global->$param)) $xmlremote = $conf->global->$param;
-    	if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
-
-    	if ($target == 'local')
-    	{
-    		if (dol_is_file($xmlfile))
-    		{
-    			$xml = simplexml_load_file($xmlfile);
-    		}
-    		else
-    		{
-    			throw new RestException(500, $langs->trans('XmlNotFound') . ': ' . $xmlfile);
-    		}
-    	}
-    	else
-    	{
-    		$xmlarray = getURLContent($xmlremote);
-
-    		// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
-    		if (! $xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
-    		{
-    			$xmlfile = $xmlarray['content'];
-    			//print "xmlfilestart".$xmlfile."endxmlfile";
-    			$xml = simplexml_load_string($xmlfile);
-    		}
-    		else
-    		{
-    			$errormsg=$langs->trans('XmlNotFound') . ': ' . $xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
-    			throw new RestException(500, $errormsg);
-    		}
-    	}
-
-
-
-    	if ($xml)
-    	{
-    		$checksumconcat = array();
-    		$file_list = array();
-    		$out = '';
-
-    		// Forced constants
-    		if (is_object($xml->dolibarr_constants[0]))
-    		{
-    			$out.=load_fiche_titre($langs->trans("ForcedConstants"));
-
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Constant") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedValue") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("Value") . '</td>';
-    			$out.='</tr>'."\n";
-
-    			$i = 0;
-    			foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
-    			{
-    				$constname=$constant['name'];
-    				$constvalue=(string) $constant;
-    				$constvalue = (empty($constvalue)?'0':$constvalue);
-    				// Value found
-    				$value='';
-    				if ($constname && $conf->global->$constname != '') $value=$conf->global->$constname;
-    				$valueforchecksum=(empty($value)?'0':$value);
-
-    				$checksumconcat[]=$valueforchecksum;
-
-    				$i++;
-    				$out.='<tr class="oddeven">';
-    				$out.='<td>'.$i.'</td>' . "\n";
-    				$out.='<td>'.$constname.'</td>' . "\n";
-    				$out.='<td align="center">'.$constvalue.'</td>' . "\n";
-    				$out.='<td align="center">'.$valueforchecksum.'</td>' . "\n";
-    				$out.="</tr>\n";
-    			}
-
-    			if ($i==0)
-    			{
-    				$out.='<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out.='</table>';
-    			$out.='</div>';
-
-    			$out.='<br>';
-    		}
-
-    		// Scan htdocs
-    		if (is_object($xml->dolibarr_htdocs_dir[0]))
-    		{
-    			//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
-    			$includecustom=(empty($xml->dolibarr_htdocs_dir[0]['includecustom'])?0:$xml->dolibarr_htdocs_dir[0]['includecustom']);
-
-    			// Defined qualified files (must be same than into generate_filelist_xml.php)
-    			$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-    			$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
-    			$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
-
-    			// Fill file_list with files in signature, new files, modified files
-    			$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat, $scanfiles);		// Fill array $file_list
-    			// Complete with list of new files
-    			foreach ($scanfiles as $keyfile => $valfile)
-    			{
-    				$tmprelativefilename=preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT,'/').'/','', $valfile['fullname']);
-    				if (! in_array($tmprelativefilename, $file_list['insignature']))
-    				{
-    					$md5newfile=@md5_file($valfile['fullname']);    // Can fails if we don't have permission to open/read file
-    					$file_list['added'][]=array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
-    				}
-    			}
-
-    			// Files missings
-    			$out.=load_fiche_titre($langs->trans("FilesMissing"));
-
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Filename") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-    			$out.='</tr>'."\n";
-    			$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
-    			if (is_array($tmpfilelist) && count($tmpfilelist))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist as $file)
-    				{
-    					$i++;
-    					$out.='<tr class="oddeven">';
-    					$out.='<td>'.$i.'</td>' . "\n";
-    					$out.='<td>'.$file['filename'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-    					$out.="</tr>\n";
-    				}
-    			}
-    			else
-    			{
-    				$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out.='</table>';
-    			$out.='</div>';
-
-    			$out.='<br>';
-
-    			// Files modified
-    			$out.=load_fiche_titre($langs->trans("FilesModified"));
-
-    			$totalsize=0;
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Filename") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
-    			$out.='<td align="right">' . $langs->trans("Size") . '</td>';
-    			$out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
-    			$out.='</tr>'."\n";
-    			$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
-    			if (is_array($tmpfilelist2) && count($tmpfilelist2))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist2 as $file)
-    				{
-    					$i++;
-    					$out.='<tr class="oddeven">';
-    					$out.='<td>'.$i.'</td>' . "\n";
-    					$out.='<td>'.$file['filename'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['md5'].'</td>' . "\n";
-    					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-    					$totalsize += $size;
-    					$out.='<td align="right">'.dol_print_size($size).'</td>' . "\n";
-    					$out.='<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
-    					$out.="</tr>\n";
-    				}
-    				$out.='<tr class="liste_total">';
-    				$out.='<td></td>' . "\n";
-    				$out.='<td>'.$langs->trans("Total").'</td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
-    				$out.='<td align="right"></td>' . "\n";
-    				$out.="</tr>\n";
-    			}
-    			else
-    			{
-    				$out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out.='</table>';
-    			$out.='</div>';
-
-    			$out.='<br>';
-
-    			// Files added
-    			$out.=load_fiche_titre($langs->trans("FilesAdded"));
-
-    			$totalsize = 0;
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Filename") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
-    			$out.='<td align="right">' . $langs->trans("Size") . '</td>';
-    			$out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
-    			$out.='</tr>'."\n";
-    			$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
-    			if (is_array($tmpfilelist3) && count($tmpfilelist3))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist3 as $file)
-    				{
-    					$i++;
-    					$out.='<tr class="oddeven">';
-    					$out.='<td>'.$i.'</td>' . "\n";
-    					$out.='<td>'.$file['filename'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['md5'].'</td>' . "\n";
-    					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-    					$totalsize += $size;
-    					$out.='<td align="right">'.dol_print_size($size).'</td>' . "\n";
-    					$out.='<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
-    					$out.="</tr>\n";
-    				}
-    				$out.='<tr class="liste_total">';
-    				$out.='<td></td>' . "\n";
-    				$out.='<td>'.$langs->trans("Total").'</td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
-    				$out.='<td align="right"></td>' . "\n";
-    				$out.="</tr>\n";
-    			}
-    			else
-    			{
-    				$out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out.='</table>';
-    			$out.='</div>';
-
-
-    			// Show warning
-    			if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
-    			{
-    				//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-    			}
-    			else
-    			{
-    				//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
-    			}
-    		}
-    		else
-    		{
-    			throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
-    		}
-
-
-    		// Scan scripts
-
-
-    		asort($checksumconcat); // Sort list of checksum
-    		//var_dump($checksumconcat);
-    		$checksumget = md5(join(',',$checksumconcat));
-    		$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
-
-    		$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
-    		if ($checksumget == $checksumtoget)
-    		{
-    			if (count($file_list['added']))
-    			{
-    				$resultcode = 'warning';
-    				$resultcomment='FileIntegrityIsOkButFilesWereAdded';
-    				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    				$outcurrentchecksum =  $checksumget;
-    			}
-    			else
-    			{
-    				$resultcode = 'ok';
-    				$resultcomment='Success';
-    				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    				$outcurrentchecksum =  $checksumget;
-    			}
-    		}
-    		else
-    		{
-    			$resultcode = 'error';
-    			$resultcomment='Error';
-    			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    			$outcurrentchecksum =  $checksumget;
-    		}
-    	}
-    	else {
-    		throw new RestException(404, 'No signature file known');
-    	}
-
-    	return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
+        global $langs, $conf;
+
+        if (! DolibarrApiAccess::$user->admin
+            && (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
+        {
+            throw new RestException(503, 'Error API open to admin users only or to login user defined with constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
+        }
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
+        $langs->load("admin");
+
+        $outexpectedchecksum = '';
+        $outcurrentchecksum = '';
+
+        // Modified or missing files
+        $file_list = array('missing' => array(), 'updated' => array());
+
+        // Local file to compare to
+        $xmlshortfile = GETPOST('xmlshortfile')?GETPOST('xmlshortfile'):'/install/filelist-'.DOL_VERSION.'.xml';
+        $xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
+        // Remote file to compare to
+        $xmlremote = ($target == 'default' ? '' : $target);
+        if (empty($xmlremote) && ! empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+        $param='MAIN_FILECHECK_URL_'.DOL_VERSION;
+        if (empty($xmlremote) && ! empty($conf->global->$param)) $xmlremote = $conf->global->$param;
+        if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+
+        if ($target == 'local')
+        {
+            if (dol_is_file($xmlfile))
+            {
+                $xml = simplexml_load_file($xmlfile);
+            }
+            else
+            {
+                throw new RestException(500, $langs->trans('XmlNotFound') . ': ' . $xmlfile);
+            }
+        }
+        else
+        {
+            $xmlarray = getURLContent($xmlremote);
+
+            // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
+            if (! $xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
+            {
+                $xmlfile = $xmlarray['content'];
+                //print "xmlfilestart".$xmlfile."endxmlfile";
+                $xml = simplexml_load_string($xmlfile);
+            }
+            else
+            {
+                $errormsg=$langs->trans('XmlNotFound') . ': ' . $xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
+                throw new RestException(500, $errormsg);
+            }
+        }
+
+
+
+        if ($xml)
+        {
+            $checksumconcat = array();
+            $file_list = array();
+            $out = '';
+
+            // Forced constants
+            if (is_object($xml->dolibarr_constants[0]))
+            {
+                $out.=load_fiche_titre($langs->trans("ForcedConstants"));
+
+                $out.='<div class="div-table-responsive-no-min">';
+                $out.='<table class="noborder">';
+                $out.='<tr class="liste_titre">';
+                $out.='<td>#</td>';
+                $out.='<td>' . $langs->trans("Constant") . '</td>';
+                $out.='<td align="center">' . $langs->trans("ExpectedValue") . '</td>';
+                $out.='<td align="center">' . $langs->trans("Value") . '</td>';
+                $out.='</tr>'."\n";
+
+                $i = 0;
+                foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
+                {
+                    $constname=$constant['name'];
+                    $constvalue=(string) $constant;
+                    $constvalue = (empty($constvalue)?'0':$constvalue);
+                    // Value found
+                    $value='';
+                    if ($constname && $conf->global->$constname != '') $value=$conf->global->$constname;
+                    $valueforchecksum=(empty($value)?'0':$value);
+
+                    $checksumconcat[]=$valueforchecksum;
+
+                    $i++;
+                    $out.='<tr class="oddeven">';
+                    $out.='<td>'.$i.'</td>' . "\n";
+                    $out.='<td>'.$constname.'</td>' . "\n";
+                    $out.='<td align="center">'.$constvalue.'</td>' . "\n";
+                    $out.='<td align="center">'.$valueforchecksum.'</td>' . "\n";
+                    $out.="</tr>\n";
+                }
+
+                if ($i==0)
+                {
+                    $out.='<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+                }
+                $out.='</table>';
+                $out.='</div>';
+
+                $out.='<br>';
+            }
+
+            // Scan htdocs
+            if (is_object($xml->dolibarr_htdocs_dir[0]))
+            {
+                //var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
+                $includecustom=(empty($xml->dolibarr_htdocs_dir[0]['includecustom'])?0:$xml->dolibarr_htdocs_dir[0]['includecustom']);
+
+                // Defined qualified files (must be same than into generate_filelist_xml.php)
+                $regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+                $regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+                $scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
+
+                // Fill file_list with files in signature, new files, modified files
+                $ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat, $scanfiles);		// Fill array $file_list
+                // Complete with list of new files
+                foreach ($scanfiles as $keyfile => $valfile)
+                {
+                    $tmprelativefilename=preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT,'/').'/','', $valfile['fullname']);
+                    if (! in_array($tmprelativefilename, $file_list['insignature']))
+                    {
+                        $md5newfile=@md5_file($valfile['fullname']);    // Can fails if we don't have permission to open/read file
+                        $file_list['added'][]=array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
+                    }
+                }
+
+                // Files missings
+                $out.=load_fiche_titre($langs->trans("FilesMissing"));
+
+                $out.='<div class="div-table-responsive-no-min">';
+                $out.='<table class="noborder">';
+                $out.='<tr class="liste_titre">';
+                $out.='<td>#</td>';
+                $out.='<td>' . $langs->trans("Filename") . '</td>';
+                $out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
+                $out.='</tr>'."\n";
+                $tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
+                if (is_array($tmpfilelist) && count($tmpfilelist))
+                {
+                    $i = 0;
+                    foreach ($tmpfilelist as $file)
+                    {
+                        $i++;
+                        $out.='<tr class="oddeven">';
+                        $out.='<td>'.$i.'</td>' . "\n";
+                        $out.='<td>'.$file['filename'].'</td>' . "\n";
+                        $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
+                        $out.="</tr>\n";
+                    }
+                }
+                else
+                {
+                    $out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+                }
+                $out.='</table>';
+                $out.='</div>';
+
+                $out.='<br>';
+
+                // Files modified
+                $out.=load_fiche_titre($langs->trans("FilesModified"));
+
+                $totalsize=0;
+                $out.='<div class="div-table-responsive-no-min">';
+                $out.='<table class="noborder">';
+                $out.='<tr class="liste_titre">';
+                $out.='<td>#</td>';
+                $out.='<td>' . $langs->trans("Filename") . '</td>';
+                $out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
+                $out.='<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
+                $out.='<td align="right">' . $langs->trans("Size") . '</td>';
+                $out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
+                $out.='</tr>'."\n";
+                $tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
+                if (is_array($tmpfilelist2) && count($tmpfilelist2))
+                {
+                    $i = 0;
+                    foreach ($tmpfilelist2 as $file)
+                    {
+                        $i++;
+                        $out.='<tr class="oddeven">';
+                        $out.='<td>'.$i.'</td>' . "\n";
+                        $out.='<td>'.$file['filename'].'</td>' . "\n";
+                        $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
+                        $out.='<td align="center">'.$file['md5'].'</td>' . "\n";
+                        $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+                        $totalsize += $size;
+                        $out.='<td align="right">'.dol_print_size($size).'</td>' . "\n";
+                        $out.='<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
+                        $out.="</tr>\n";
+                    }
+                    $out.='<tr class="liste_total">';
+                    $out.='<td></td>' . "\n";
+                    $out.='<td>'.$langs->trans("Total").'</td>' . "\n";
+                    $out.='<td align="center"></td>' . "\n";
+                    $out.='<td align="center"></td>' . "\n";
+                    $out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
+                    $out.='<td align="right"></td>' . "\n";
+                    $out.="</tr>\n";
+                }
+                else
+                {
+                    $out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+                }
+                $out.='</table>';
+                $out.='</div>';
+
+                $out.='<br>';
+
+                // Files added
+                $out.=load_fiche_titre($langs->trans("FilesAdded"));
+
+                $totalsize = 0;
+                $out.='<div class="div-table-responsive-no-min">';
+                $out.='<table class="noborder">';
+                $out.='<tr class="liste_titre">';
+                $out.='<td>#</td>';
+                $out.='<td>' . $langs->trans("Filename") . '</td>';
+                $out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
+                $out.='<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
+                $out.='<td align="right">' . $langs->trans("Size") . '</td>';
+                $out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
+                $out.='</tr>'."\n";
+                $tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
+                if (is_array($tmpfilelist3) && count($tmpfilelist3))
+                {
+                    $i = 0;
+                    foreach ($tmpfilelist3 as $file)
+                    {
+                        $i++;
+                        $out.='<tr class="oddeven">';
+                        $out.='<td>'.$i.'</td>' . "\n";
+                        $out.='<td>'.$file['filename'].'</td>' . "\n";
+                        $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
+                        $out.='<td align="center">'.$file['md5'].'</td>' . "\n";
+                        $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+                        $totalsize += $size;
+                        $out.='<td align="right">'.dol_print_size($size).'</td>' . "\n";
+                        $out.='<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
+                        $out.="</tr>\n";
+                    }
+                    $out.='<tr class="liste_total">';
+                    $out.='<td></td>' . "\n";
+                    $out.='<td>'.$langs->trans("Total").'</td>' . "\n";
+                    $out.='<td align="center"></td>' . "\n";
+                    $out.='<td align="center"></td>' . "\n";
+                    $out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
+                    $out.='<td align="right"></td>' . "\n";
+                    $out.="</tr>\n";
+                }
+                else
+                {
+                    $out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+                }
+                $out.='</table>';
+                $out.='</div>';
+
+
+                // Show warning
+                if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
+                {
+                    //setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
+                }
+                else
+                {
+                    //setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
+                }
+            }
+            else
+            {
+                throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
+            }
+
+
+            // Scan scripts
+
+
+            asort($checksumconcat); // Sort list of checksum
+            //var_dump($checksumconcat);
+            $checksumget = md5(join(',',$checksumconcat));
+            $checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
+
+            $outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
+            if ($checksumget == $checksumtoget)
+            {
+                if (count($file_list['added']))
+                {
+                    $resultcode = 'warning';
+                    $resultcomment='FileIntegrityIsOkButFilesWereAdded';
+                    //$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
+                    $outcurrentchecksum =  $checksumget;
+                }
+                else
+                {
+                    $resultcode = 'ok';
+                    $resultcomment='Success';
+                    //$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+                    $outcurrentchecksum =  $checksumget;
+                }
+            }
+            else
+            {
+                $resultcode = 'error';
+                $resultcomment='Error';
+                //$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+                $outcurrentchecksum =  $checksumget;
+            }
+        }
+        else {
+            throw new RestException(404, 'No signature file known');
+        }
+
+        return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
     }
 }

Spacing +223 added lines, -223 removed lines

@@ -66,22 +66,22 @@ 
         $list = array();
 
         $sql = "SELECT id, code, type, libelle as label, module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
-        $sql.= " WHERE t.entity IN (".getEntity('c_paiement').")";
-        $sql.= " AND t.active = ".$active;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
+        $sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
+        $sql .= " AND t.active = ".$active;
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
             }
-	          $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	          $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -135,19 +135,19 @@ 
         // Note: The filter is not applied in the SQL request because it must
         // be applied to the translated names, not to the names in database.
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_country as t";
-        $sql.=" WHERE 1 = 1";
+        $sql .= " WHERE 1 = 1";
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -233,21 +233,21 @@ 
         $list = array();
 
         $sql = "SELECT rowid, code, label";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_availability as t";
-        $sql.= " WHERE t.active = ".$active;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_availability as t";
+        $sql .= " WHERE t.active = ".$active;
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
             }
-                  $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+                  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -338,23 +338,23 @@ 
         $list = array();
 
         $sql = "SELECT id, code, type, libelle as label, module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
-        $sql.= " WHERE t.active = 1";
-        if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
-        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
+        $sql .= " WHERE t.active = 1";
+        if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -400,22 +400,22 @@ 
         $list = array();
 
         $sql = "SELECT rowid, code, label, module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_civility as t";
-        $sql.= " WHERE t.active = 1";
-        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_civility as t";
+        $sql .= " WHERE t.active = 1";
+        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -458,27 +458,27 @@ 
     {
         $list = array();
 
-        if ($type == 'thirdparty') $type='societe';
-        if ($type == 'contact') $type='socpeople';
+        if ($type == 'thirdparty') $type = 'societe';
+        if ($type == 'contact') $type = 'socpeople';
 
         $sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
-        $sql.= " FROM ".MAIN_DB_PREFIX."extrafields as t";
-        $sql.= " WHERE t.entity IN (".getEntity('extrafields').")";
-        if (! empty($type)) $sql.= " AND t.elementtype = '".$this->db->escape($type)."'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."extrafields as t";
+        $sql .= " WHERE t.entity IN (".getEntity('extrafields').")";
+        if (!empty($type)) $sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
         // Add sql filters
         if ($sqlfilters)
         {
-        	if (! DolibarrApi::_checkFilters($sqlfilters))
+        	if (!DolibarrApi::_checkFilters($sqlfilters))
         	{
         		throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
         	}
-        	$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-        	$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        	$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+        	$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
         	if ($this->db->num_rows($resql))
@@ -486,19 +486,19 @@ 
         		while ($tab = $this->db->fetch_object($resql))
         		{
         			// New usage
-        			$list[$tab->elementtype][$tab->name]['type']=$tab->type;
-        			$list[$tab->elementtype][$tab->name]['label']=$tab->label;
-        			$list[$tab->elementtype][$tab->name]['size']=$tab->size;
-        			$list[$tab->elementtype][$tab->name]['elementtype']=$tab->elementtype;
-        			$list[$tab->elementtype][$tab->name]['default']=$tab->fielddefault;
-        			$list[$tab->elementtype][$tab->name]['computed']=$tab->fieldcomputed;
-        			$list[$tab->elementtype][$tab->name]['unique']=$tab->fieldunique;
-        			$list[$tab->elementtype][$tab->name]['required']=$tab->fieldrequired;
-        			$list[$tab->elementtype][$tab->name]['param']=($tab->param ? unserialize($tab->param) : '');
-        			$list[$tab->elementtype][$tab->name]['pos']=$tab->pos;
-        			$list[$tab->elementtype][$tab->name]['alwayseditable']=$tab->alwayseditable;
-        			$list[$tab->elementtype][$tab->name]['perms']=$tab->perms;
-        			$list[$tab->elementtype][$tab->name]['list']=$tab->list;
+        			$list[$tab->elementtype][$tab->name]['type'] = $tab->type;
+        			$list[$tab->elementtype][$tab->name]['label'] = $tab->label;
+        			$list[$tab->elementtype][$tab->name]['size'] = $tab->size;
+        			$list[$tab->elementtype][$tab->name]['elementtype'] = $tab->elementtype;
+        			$list[$tab->elementtype][$tab->name]['default'] = $tab->fielddefault;
+        			$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
+        			$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
+        			$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
+        			$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? unserialize($tab->param) : '');
+        			$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
+        			$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
+        			$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
+        			$list[$tab->elementtype][$tab->name]['list'] = $tab->list;
         		}
         	}
         }
@@ -507,7 +507,7 @@ 
             throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
         }
 
-        if (! count($list))
+        if (!count($list))
         {
         	throw new RestException(404, 'No extrafield found');
         }
@@ -537,23 +537,23 @@ 
         $list = array();
 
         $sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
-        $sql.= " WHERE t.active = 1";
-        if ($zipcode) $sql.=" AND t.zip LIKE '%" . $this->db->escape($zipcode) . "%'";
-        if ($town)    $sql.=" AND t.town LIKE '%" . $this->db->escape($town) . "%'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
+        $sql .= " WHERE t.active = 1";
+        if ($zipcode) $sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
+        if ($town)    $sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -601,22 +601,22 @@ 
         $list = array();
 
         $sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
-        $sql.= " WHERE t.entity IN (".getEntity('c_payment_term').")";
-        $sql.= " AND t.active = ".$active;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+        $sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
+        $sql .= " AND t.active = ".$active;
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-                $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+                $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -661,21 +661,21 @@ 
     	$list = array();
 
     	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
-    	$sql.= " WHERE t.active = 1";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
+    	$sql .= " WHERE t.active = 1";
     	// Add sql filters
     	if ($sqlfilters)
     	{
-    		if (! DolibarrApi::_checkFilters($sqlfilters))
+    		if (!DolibarrApi::_checkFilters($sqlfilters))
     		{
     			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
     		}
-    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
     	}
 
 
-    	$sql.= $this->db->order($sortfield, $sortorder);
+    	$sql .= $this->db->order($sortfield, $sortorder);
 
     	if ($limit) {
     		if ($page < 0) {
@@ -720,21 +720,21 @@ 
     	$list = array();
 
     	$sql = "SELECT rowid, code, pos,  label, use_default, color, description";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
-    	$sql.= " WHERE t.active = 1";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
+    	$sql .= " WHERE t.active = 1";
     	// Add sql filters
     	if ($sqlfilters)
     	{
-    		if (! DolibarrApi::_checkFilters($sqlfilters))
+    		if (!DolibarrApi::_checkFilters($sqlfilters))
     		{
     			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
     		}
-    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
     	}
 
 
-    	$sql.= $this->db->order($sortfield, $sortorder);
+    	$sql .= $this->db->order($sortfield, $sortorder);
 
     	if ($limit) {
     		if ($page < 0) {
@@ -779,23 +779,23 @@ 
     	$list = array();
 
     	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
-    	$sql.= " WHERE t.active = 1";
-    	if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
-    	if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
+    	$sql .= " WHERE t.active = 1";
+    	if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+    	if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
     	// Add sql filters
     	if ($sqlfilters)
     	{
-    		if (! DolibarrApi::_checkFilters($sqlfilters))
+    		if (!DolibarrApi::_checkFilters($sqlfilters))
     		{
     			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
     		}
-    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
     	}
 
 
-    	$sql.= $this->db->order($sortfield, $sortorder);
+    	$sql .= $this->db->order($sortfield, $sortorder);
 
     	if ($limit) {
     		if ($page < 0) {
@@ -836,7 +836,7 @@ 
     {
     	global $langs, $conf;
 
-    	if (! DolibarrApiAccess::$user->admin
+    	if (!DolibarrApiAccess::$user->admin
     		&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
     	{
     		throw new RestException(503, 'Error API open to admin users only or to login user defined with constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
@@ -854,13 +854,13 @@ 
     	$file_list = array('missing' => array(), 'updated' => array());
 
     	// Local file to compare to
-    	$xmlshortfile = GETPOST('xmlshortfile')?GETPOST('xmlshortfile'):'/install/filelist-'.DOL_VERSION.'.xml';
+    	$xmlshortfile = GETPOST('xmlshortfile') ?GETPOST('xmlshortfile') : '/install/filelist-'.DOL_VERSION.'.xml';
     	$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
     	// Remote file to compare to
     	$xmlremote = ($target == 'default' ? '' : $target);
-    	if (empty($xmlremote) && ! empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
-    	$param='MAIN_FILECHECK_URL_'.DOL_VERSION;
-    	if (empty($xmlremote) && ! empty($conf->global->$param)) $xmlremote = $conf->global->$param;
+    	if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+    	$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
+    	if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
     	if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
 
     	if ($target == 'local')
@@ -871,7 +871,7 @@ 
     		}
     		else
     		{
-    			throw new RestException(500, $langs->trans('XmlNotFound') . ': ' . $xmlfile);
+    			throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
     		}
     	}
     	else
@@ -879,7 +879,7 @@ 
     		$xmlarray = getURLContent($xmlremote);
 
     		// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
-    		if (! $xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
+    		if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
     		{
     			$xmlfile = $xmlarray['content'];
     			//print "xmlfilestart".$xmlfile."endxmlfile";
@@ -887,7 +887,7 @@ 
     		}
     		else
     		{
-    			$errormsg=$langs->trans('XmlNotFound') . ': ' . $xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
+    			$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
     			throw new RestException(500, $errormsg);
     		}
     	}
@@ -903,83 +903,83 @@ 
     		// Forced constants
     		if (is_object($xml->dolibarr_constants[0]))
     		{
-    			$out.=load_fiche_titre($langs->trans("ForcedConstants"));
+    			$out .= load_fiche_titre($langs->trans("ForcedConstants"));
 
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Constant") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedValue") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("Value") . '</td>';
-    			$out.='</tr>'."\n";
+    			$out .= '<div class="div-table-responsive-no-min">';
+    			$out .= '<table class="noborder">';
+    			$out .= '<tr class="liste_titre">';
+    			$out .= '<td>#</td>';
+    			$out .= '<td>'.$langs->trans("Constant").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("ExpectedValue").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("Value").'</td>';
+    			$out .= '</tr>'."\n";
 
     			$i = 0;
     			foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
     			{
-    				$constname=$constant['name'];
-    				$constvalue=(string) $constant;
-    				$constvalue = (empty($constvalue)?'0':$constvalue);
+    				$constname = $constant['name'];
+    				$constvalue = (string) $constant;
+    				$constvalue = (empty($constvalue) ? '0' : $constvalue);
     				// Value found
-    				$value='';
-    				if ($constname && $conf->global->$constname != '') $value=$conf->global->$constname;
-    				$valueforchecksum=(empty($value)?'0':$value);
+    				$value = '';
+    				if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
+    				$valueforchecksum = (empty($value) ? '0' : $value);
 
-    				$checksumconcat[]=$valueforchecksum;
+    				$checksumconcat[] = $valueforchecksum;
 
     				$i++;
-    				$out.='<tr class="oddeven">';
-    				$out.='<td>'.$i.'</td>' . "\n";
-    				$out.='<td>'.$constname.'</td>' . "\n";
-    				$out.='<td align="center">'.$constvalue.'</td>' . "\n";
-    				$out.='<td align="center">'.$valueforchecksum.'</td>' . "\n";
-    				$out.="</tr>\n";
+    				$out .= '<tr class="oddeven">';
+    				$out .= '<td>'.$i.'</td>'."\n";
+    				$out .= '<td>'.$constname.'</td>'."\n";
+    				$out .= '<td align="center">'.$constvalue.'</td>'."\n";
+    				$out .= '<td align="center">'.$valueforchecksum.'</td>'."\n";
+    				$out .= "</tr>\n";
     			}
 
-    			if ($i==0)
+    			if ($i == 0)
     			{
-    				$out.='<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+    				$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
-    			$out.='</table>';
-    			$out.='</div>';
+    			$out .= '</table>';
+    			$out .= '</div>';
 
-    			$out.='<br>';
+    			$out .= '<br>';
     		}
 
     		// Scan htdocs
     		if (is_object($xml->dolibarr_htdocs_dir[0]))
     		{
     			//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
-    			$includecustom=(empty($xml->dolibarr_htdocs_dir[0]['includecustom'])?0:$xml->dolibarr_htdocs_dir[0]['includecustom']);
+    			$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
 
     			// Defined qualified files (must be same than into generate_filelist_xml.php)
-    			$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-    			$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+    			$regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+    			$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
     			$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
 
     			// Fill file_list with files in signature, new files, modified files
-    			$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat, $scanfiles);		// Fill array $file_list
+    			$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat, $scanfiles); // Fill array $file_list
     			// Complete with list of new files
     			foreach ($scanfiles as $keyfile => $valfile)
     			{
-    				$tmprelativefilename=preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT,'/').'/','', $valfile['fullname']);
-    				if (! in_array($tmprelativefilename, $file_list['insignature']))
+    				$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
+    				if (!in_array($tmprelativefilename, $file_list['insignature']))
     				{
-    					$md5newfile=@md5_file($valfile['fullname']);    // Can fails if we don't have permission to open/read file
-    					$file_list['added'][]=array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
+    					$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
+    					$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
     				}
     			}
 
     			// Files missings
-    			$out.=load_fiche_titre($langs->trans("FilesMissing"));
-
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Filename") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-    			$out.='</tr>'."\n";
+    			$out .= load_fiche_titre($langs->trans("FilesMissing"));
+
+    			$out .= '<div class="div-table-responsive-no-min">';
+    			$out .= '<table class="noborder">';
+    			$out .= '<tr class="liste_titre">';
+    			$out .= '<td>#</td>';
+    			$out .= '<td>'.$langs->trans("Filename").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("ExpectedChecksum").'</td>';
+    			$out .= '</tr>'."\n";
     			$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
     			if (is_array($tmpfilelist) && count($tmpfilelist))
     			{
@@ -987,36 +987,36 @@ 
     				foreach ($tmpfilelist as $file)
     				{
     					$i++;
-    					$out.='<tr class="oddeven">';
-    					$out.='<td>'.$i.'</td>' . "\n";
-    					$out.='<td>'.$file['filename'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-    					$out.="</tr>\n";
+    					$out .= '<tr class="oddeven">';
+    					$out .= '<td>'.$i.'</td>'."\n";
+    					$out .= '<td>'.$file['filename'].'</td>'."\n";
+    					$out .= '<td align="center">'.$file['expectedmd5'].'</td>'."\n";
+    					$out .= "</tr>\n";
     				}
     			}
     			else
     			{
-    				$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+    				$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
-    			$out.='</table>';
-    			$out.='</div>';
+    			$out .= '</table>';
+    			$out .= '</div>';
 
-    			$out.='<br>';
+    			$out .= '<br>';
 
     			// Files modified
-    			$out.=load_fiche_titre($langs->trans("FilesModified"));
-
-    			$totalsize=0;
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Filename") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
-    			$out.='<td align="right">' . $langs->trans("Size") . '</td>';
-    			$out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
-    			$out.='</tr>'."\n";
+    			$out .= load_fiche_titre($langs->trans("FilesModified"));
+
+    			$totalsize = 0;
+    			$out .= '<div class="div-table-responsive-no-min">';
+    			$out .= '<table class="noborder">';
+    			$out .= '<tr class="liste_titre">';
+    			$out .= '<td>#</td>';
+    			$out .= '<td>'.$langs->trans("Filename").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("ExpectedChecksum").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("CurrentChecksum").'</td>';
+    			$out .= '<td align="right">'.$langs->trans("Size").'</td>';
+    			$out .= '<td align="right">'.$langs->trans("DateModification").'</td>';
+    			$out .= '</tr>'."\n";
     			$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
     			if (is_array($tmpfilelist2) && count($tmpfilelist2))
     			{
@@ -1024,49 +1024,49 @@ 
     				foreach ($tmpfilelist2 as $file)
     				{
     					$i++;
-    					$out.='<tr class="oddeven">';
-    					$out.='<td>'.$i.'</td>' . "\n";
-    					$out.='<td>'.$file['filename'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['md5'].'</td>' . "\n";
+    					$out .= '<tr class="oddeven">';
+    					$out .= '<td>'.$i.'</td>'."\n";
+    					$out .= '<td>'.$file['filename'].'</td>'."\n";
+    					$out .= '<td align="center">'.$file['expectedmd5'].'</td>'."\n";
+    					$out .= '<td align="center">'.$file['md5'].'</td>'."\n";
     					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
     					$totalsize += $size;
-    					$out.='<td align="right">'.dol_print_size($size).'</td>' . "\n";
-    					$out.='<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
-    					$out.="</tr>\n";
+    					$out .= '<td align="right">'.dol_print_size($size).'</td>'."\n";
+    					$out .= '<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+    					$out .= "</tr>\n";
     				}
-    				$out.='<tr class="liste_total">';
-    				$out.='<td></td>' . "\n";
-    				$out.='<td>'.$langs->trans("Total").'</td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
-    				$out.='<td align="right"></td>' . "\n";
-    				$out.="</tr>\n";
+    				$out .= '<tr class="liste_total">';
+    				$out .= '<td></td>'."\n";
+    				$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+    				$out .= '<td align="center"></td>'."\n";
+    				$out .= '<td align="center"></td>'."\n";
+    				$out .= '<td align="right">'.dol_print_size($totalsize).'</td>'."\n";
+    				$out .= '<td align="right"></td>'."\n";
+    				$out .= "</tr>\n";
     			}
     			else
     			{
-    				$out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+    				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
-    			$out.='</table>';
-    			$out.='</div>';
+    			$out .= '</table>';
+    			$out .= '</div>';
 
-    			$out.='<br>';
+    			$out .= '<br>';
 
     			// Files added
-    			$out.=load_fiche_titre($langs->trans("FilesAdded"));
+    			$out .= load_fiche_titre($langs->trans("FilesAdded"));
 
     			$totalsize = 0;
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Filename") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
-    			$out.='<td align="right">' . $langs->trans("Size") . '</td>';
-    			$out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
-    			$out.='</tr>'."\n";
+    			$out .= '<div class="div-table-responsive-no-min">';
+    			$out .= '<table class="noborder">';
+    			$out .= '<tr class="liste_titre">';
+    			$out .= '<td>#</td>';
+    			$out .= '<td>'.$langs->trans("Filename").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("ExpectedChecksum").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("CurrentChecksum").'</td>';
+    			$out .= '<td align="right">'.$langs->trans("Size").'</td>';
+    			$out .= '<td align="right">'.$langs->trans("DateModification").'</td>';
+    			$out .= '</tr>'."\n";
     			$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
     			if (is_array($tmpfilelist3) && count($tmpfilelist3))
     			{
@@ -1074,32 +1074,32 @@ 
     				foreach ($tmpfilelist3 as $file)
     				{
     					$i++;
-    					$out.='<tr class="oddeven">';
-    					$out.='<td>'.$i.'</td>' . "\n";
-    					$out.='<td>'.$file['filename'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['md5'].'</td>' . "\n";
+    					$out .= '<tr class="oddeven">';
+    					$out .= '<td>'.$i.'</td>'."\n";
+    					$out .= '<td>'.$file['filename'].'</td>'."\n";
+    					$out .= '<td align="center">'.$file['expectedmd5'].'</td>'."\n";
+    					$out .= '<td align="center">'.$file['md5'].'</td>'."\n";
     					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
     					$totalsize += $size;
-    					$out.='<td align="right">'.dol_print_size($size).'</td>' . "\n";
-    					$out.='<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
-    					$out.="</tr>\n";
+    					$out .= '<td align="right">'.dol_print_size($size).'</td>'."\n";
+    					$out .= '<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+    					$out .= "</tr>\n";
     				}
-    				$out.='<tr class="liste_total">';
-    				$out.='<td></td>' . "\n";
-    				$out.='<td>'.$langs->trans("Total").'</td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
-    				$out.='<td align="right"></td>' . "\n";
-    				$out.="</tr>\n";
+    				$out .= '<tr class="liste_total">';
+    				$out .= '<td></td>'."\n";
+    				$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+    				$out .= '<td align="center"></td>'."\n";
+    				$out .= '<td align="center"></td>'."\n";
+    				$out .= '<td align="right">'.dol_print_size($totalsize).'</td>'."\n";
+    				$out .= '<td align="right"></td>'."\n";
+    				$out .= "</tr>\n";
     			}
     			else
     			{
-    				$out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+    				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
-    			$out.='</table>';
-    			$out.='</div>';
+    			$out .= '</table>';
+    			$out .= '</div>';
 
 
     			// Show warning
@@ -1123,7 +1123,7 @@ 
 
     		asort($checksumconcat); // Sort list of checksum
     		//var_dump($checksumconcat);
-    		$checksumget = md5(join(',',$checksumconcat));
+    		$checksumget = md5(join(',', $checksumconcat));
     		$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
 
     		$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
@@ -1132,24 +1132,24 @@ 
     			if (count($file_list['added']))
     			{
     				$resultcode = 'warning';
-    				$resultcomment='FileIntegrityIsOkButFilesWereAdded';
+    				$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
     				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    				$outcurrentchecksum =  $checksumget;
+    				$outcurrentchecksum = $checksumget;
     			}
     			else
     			{
     				$resultcode = 'ok';
-    				$resultcomment='Success';
+    				$resultcomment = 'Success';
     				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    				$outcurrentchecksum =  $checksumget;
+    				$outcurrentchecksum = $checksumget;
     			}
     		}
     		else
     		{
     			$resultcode = 'error';
-    			$resultcomment='Error';
+    			$resultcomment = 'Error';
     			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    			$outcurrentchecksum =  $checksumget;
+    			$outcurrentchecksum = $checksumget;
     		}
     	}
     	else {

Braces +58 added lines, -41 removed lines

@@ -201,8 +201,7 @@ 
 
         if ($country->fetch($id) < 0) {
             throw new RestException(503, 'Error when retrieving country : '.$country->error);
-        }
-        else if ($country->fetch($id) == 0) {
+        } else if ($country->fetch($id) == 0) {
             throw new RestException(404, 'country not found');
         }
 
@@ -340,8 +339,12 @@ 
         $sql = "SELECT id, code, type, libelle as label, module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
         $sql.= " WHERE t.active = 1";
-        if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
-        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        if ($type) {
+            $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
+        }
+        if ($module) {
+            $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        }
         // Add sql filters
         if ($sqlfilters)
         {
@@ -402,7 +405,9 @@ 
         $sql = "SELECT rowid, code, label, module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_civility as t";
         $sql.= " WHERE t.active = 1";
-        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        if ($module) {
+            $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        }
         // Add sql filters
         if ($sqlfilters)
         {
@@ -458,13 +463,19 @@ 
     {
         $list = array();
 
-        if ($type == 'thirdparty') $type='societe';
-        if ($type == 'contact') $type='socpeople';
+        if ($type == 'thirdparty') {
+            $type='societe';
+        }
+        if ($type == 'contact') {
+            $type='socpeople';
+        }
 
         $sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
         $sql.= " FROM ".MAIN_DB_PREFIX."extrafields as t";
         $sql.= " WHERE t.entity IN (".getEntity('extrafields').")";
-        if (! empty($type)) $sql.= " AND t.elementtype = '".$this->db->escape($type)."'";
+        if (! empty($type)) {
+            $sql.= " AND t.elementtype = '".$this->db->escape($type)."'";
+        }
         // Add sql filters
         if ($sqlfilters)
         {
@@ -501,8 +512,7 @@ 
         			$list[$tab->elementtype][$tab->name]['list']=$tab->list;
         		}
         	}
-        }
-        else
+        } else
         {
             throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
         }
@@ -539,8 +549,12 @@ 
         $sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
         $sql.= " WHERE t.active = 1";
-        if ($zipcode) $sql.=" AND t.zip LIKE '%" . $this->db->escape($zipcode) . "%'";
-        if ($town)    $sql.=" AND t.town LIKE '%" . $this->db->escape($town) . "%'";
+        if ($zipcode) {
+            $sql.=" AND t.zip LIKE '%" . $this->db->escape($zipcode) . "%'";
+        }
+        if ($town) {
+            $sql.=" AND t.town LIKE '%" . $this->db->escape($town) . "%'";
+        }
         // Add sql filters
         if ($sqlfilters)
         {
@@ -781,8 +795,12 @@ 
     	$sql = "SELECT rowid, code, pos,  label, use_default, description";
     	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
     	$sql.= " WHERE t.active = 1";
-    	if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
-    	if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+    	if ($type) {
+    	    $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
+    	}
+    	if ($module) {
+    	    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+    	}
     	// Add sql filters
     	if ($sqlfilters)
     	{
@@ -858,23 +876,27 @@ 
     	$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
     	// Remote file to compare to
     	$xmlremote = ($target == 'default' ? '' : $target);
-    	if (empty($xmlremote) && ! empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+    	if (empty($xmlremote) && ! empty($conf->global->MAIN_FILECHECK_URL)) {
+    	    $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+    	}
     	$param='MAIN_FILECHECK_URL_'.DOL_VERSION;
-    	if (empty($xmlremote) && ! empty($conf->global->$param)) $xmlremote = $conf->global->$param;
-    	if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+    	if (empty($xmlremote) && ! empty($conf->global->$param)) {
+    	    $xmlremote = $conf->global->$param;
+    	}
+    	if (empty($xmlremote)) {
+    	    $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+    	}
 
     	if ($target == 'local')
     	{
     		if (dol_is_file($xmlfile))
     		{
     			$xml = simplexml_load_file($xmlfile);
-    		}
-    		else
+    		} else
     		{
     			throw new RestException(500, $langs->trans('XmlNotFound') . ': ' . $xmlfile);
     		}
-    	}
-    	else
+    	} else
     	{
     		$xmlarray = getURLContent($xmlremote);
 
@@ -884,8 +906,7 @@ 
     			$xmlfile = $xmlarray['content'];
     			//print "xmlfilestart".$xmlfile."endxmlfile";
     			$xml = simplexml_load_string($xmlfile);
-    		}
-    		else
+    		} else
     		{
     			$errormsg=$langs->trans('XmlNotFound') . ': ' . $xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
     			throw new RestException(500, $errormsg);
@@ -915,14 +936,18 @@ 
     			$out.='</tr>'."\n";
 
     			$i = 0;
-    			foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
+    			foreach ($xml->dolibarr_constants[0]->constant as $constant) {
+    			    // $constant is a simpleXMLElement
     			{
     				$constname=$constant['name'];
+    			}
     				$constvalue=(string) $constant;
     				$constvalue = (empty($constvalue)?'0':$constvalue);
     				// Value found
     				$value='';
-    				if ($constname && $conf->global->$constname != '') $value=$conf->global->$constname;
+    				if ($constname && $conf->global->$constname != '') {
+    				    $value=$conf->global->$constname;
+    				}
     				$valueforchecksum=(empty($value)?'0':$value);
 
     				$checksumconcat[]=$valueforchecksum;
@@ -993,8 +1018,7 @@ 
     					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
     					$out.="</tr>\n";
     				}
-    			}
-    			else
+    			} else
     			{
     				$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
@@ -1043,8 +1067,7 @@ 
     				$out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
     				$out.='<td align="right"></td>' . "\n";
     				$out.="</tr>\n";
-    			}
-    			else
+    			} else
     			{
     				$out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
@@ -1093,8 +1116,7 @@ 
     				$out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
     				$out.='<td align="right"></td>' . "\n";
     				$out.="</tr>\n";
-    			}
-    			else
+    			} else
     			{
     				$out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
@@ -1106,13 +1128,11 @@ 
     			if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
     			{
     				//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-    			}
-    			else
+    			} else
     			{
     				//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
     			}
-    		}
-    		else
+    		} else
     		{
     			throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
     		}
@@ -1135,24 +1155,21 @@ 
     				$resultcomment='FileIntegrityIsOkButFilesWereAdded';
     				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
     				$outcurrentchecksum =  $checksumget;
-    			}
-    			else
+    			} else
     			{
     				$resultcode = 'ok';
     				$resultcomment='Success';
     				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     				$outcurrentchecksum =  $checksumget;
     			}
-    		}
-    		else
+    		} else
     		{
     			$resultcode = 'error';
     			$resultcomment='Error';
     			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     			$outcurrentchecksum =  $checksumget;
     		}
-    	}
-    	else {
+    	} else {
     		throw new RestException(404, 'No signature file known');
     	}
 

dolibarr/htdocs/api/class/api_status.class.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 
 
 /**
@@ -39,7 +39,7 @@ 
             'success' => array(
                 'code' => 200,
                 'dolibarr_version' => DOL_VERSION,
-                'access_locked' => (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)?'0':$conf->global->MAIN_ONLY_LOGIN_ALLOWED),
+                'access_locked' => (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED) ? '0' : $conf->global->MAIN_ONLY_LOGIN_ALLOWED),
             ),
         );
     }

dolibarr/htdocs/api/class/api_documents.class.php

Indentation +550 added lines, -550 removed lines

@@ -33,563 +33,563 @@
 class Documents extends DolibarrApi
 {
 
-	/**
-	 * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
-	 */
-	static $DOCUMENT_FIELDS = array(
-		'modulepart'
-	);
-
-	/**
-	 * Constructor
-	 */
-	function __construct()
-	{
-		global $db;
-		$this->db = $db;
-	}
-
-
-	/**
-	 * Download a document.
-	 *
-	 * Note that, this API is similar to using the wrapper link "documents.php" to download a file (used for
-	 * internal HTML links of documents into application), but with no need to have a session cookie (the token is used instead).
-	 *
-	 * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
-	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf)
-	 * @return  array                   List of documents
-	 *
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 * @throws 200
-	 *
-	 * @url GET /download
-	 */
-	public function index($module_part, $original_file='')
-	{
-		global $conf, $langs;
-
-		if (empty($module_part)) {
-				throw new RestException(400, 'bad value for parameter modulepart');
-		}
-		if (empty($original_file)) {
-			throw new RestException(400, 'bad value for parameter original_file');
-		}
-
-		//--- Finds and returns the document
-		$entity=$conf->entity;
-
-		$check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
-		$accessallowed              = $check_access['accessallowed'];
-		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
-		$original_file              = $check_access['original_file'];
-
-		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
-		{
-			throw new RestException(401);
-		}
-		if (!$accessallowed) {
-			throw new RestException(401);
-		}
-
-		$filename = basename($original_file);
-		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
-
-		if (! file_exists($original_file_osencoded))
-		{
-			throw new RestException(404, 'File not found');
-		}
-
-		$file_content=file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64' );
-	}
-
-
-	/**
-	 * Build a document.
-	 *
-	 * Test sample 1: { "module_part": "invoice", "original_file": "FA1701-001/FA1701-001.pdf", "doctemplate": "crabe", "langcode": "fr_FR" }.
-	 *
-	 * @param   string  $module_part    Name of module or area concerned by file download ('invoice', 'order', ...).
-	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf).
-	 * @param	string	$doctemplate	Set here the doc template to use for document generation (If not set, use the default template).
-	 * @param	string	$langcode		Language code like 'en_US', 'fr_FR', 'es_ES', ... (If not set, use the default language).
-	 * @return  array                   List of documents
-	 *
-	 * @throws 500
-	 * @throws 501
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 * @throws 200
-	 *
-	 * @url PUT /builddoc
-	 */
-	public function builddoc($module_part, $original_file='', $doctemplate='', $langcode='')
-	{
-		global $conf, $langs;
-
-		if (empty($module_part)) {
-			throw new RestException(400, 'bad value for parameter modulepart');
-		}
-		if (empty($original_file)) {
-			throw new RestException(400, 'bad value for parameter original_file');
-		}
-
-		$outputlangs = $langs;
-		if ($langcode && $langs->defaultlang != $langcode)
-		{
-			$outputlangs=new Translate('', $conf);
-			$outputlangs->setDefaultLang($langcode);
-		}
-
-		//--- Finds and returns the document
-		$entity=$conf->entity;
-
-		$check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', 'write');
-		$accessallowed              = $check_access['accessallowed'];
-		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
-		$original_file              = $check_access['original_file'];
-
-		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file)) {
-			throw new RestException(401);
-		}
-		if (!$accessallowed) {
-			throw new RestException(401);
-		}
-
-		// --- Generates the document
-		$hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 0 : 1;
-		$hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1;
-		$hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1;
-
-		$templateused='';
-
-		if ($module_part == 'facture' || $module_part == 'invoice')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$this->invoice = new Facture($this->db);
-			$result = $this->invoice->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
-				throw new RestException(404, 'Invoice not found');
-			}
-
-			$templateused = $doctemplate?$doctemplate:$this->invoice->modelpdf;
-			$result = $this->invoice->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
-				throw new RestException(500, 'Error generating document');
-			}
-		}
-		elseif ($module_part == 'commande' || $module_part == 'order')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-			$this->order = new Commande($this->db);
-			$result = $this->order->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
-				throw new RestException(404, 'Order not found');
-			}
-			$templateused = $doctemplate?$doctemplate:$this->order->modelpdf;
-			$result = $this->order->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
-				throw new RestException(500, 'Error generating document');
-			}
-		}
-		elseif ($module_part == 'propal' || $module_part == 'proposal')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-			$this->propal = new Propal($this->db);
-			$result = $this->propal->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
-				throw new RestException(404, 'Proposal not found');
-			}
-			$templateused = $doctemplate?$doctemplate:$this->propal->modelpdf;
-			$result = $this->propal->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
-				throw new RestException(500, 'Error generating document');
-			}
-		}
-		else
-		{
-			throw new RestException(403, 'Generation not available for this modulepart');
-		}
-
-		$filename = basename($original_file);
-		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
-
-		if (! file_exists($original_file_osencoded))
-		{
-			throw new RestException(404, 'File not found');
-		}
-
-		$file_content=file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64' );
-	}
-
-	/**
-	 * Return the list of documents of a dedicated element (from its ID or Ref)
-	 *
-	 * @param   string 	$modulepart		Name of module or area concerned ('thirdparty', 'member', 'proposal', 'order', 'invoice', 'shipment', 'project',  ...)
-	 * @param	int		$id				ID of element
-	 * @param	string	$ref			Ref of element
-	 * @param	string	$sortfield		Sort criteria ('','fullname','relativename','name','date','size')
-	 * @param	string	$sortorder		Sort order ('asc' or 'desc')
-	 * @return	array					Array of documents with path
-	 *
-	 * @throws 200
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 * @throws 500
-	 *
-	 * @url GET /
-	 */
-	function getDocumentsListByElement($modulepart, $id=0, $ref='', $sortfield='', $sortorder='')
-	{
-		global $conf;
-
-		if (empty($modulepart)) {
-			throw new RestException(400, 'bad value for parameter modulepart');
-		}
-
-		if (empty($id) && empty($ref)) {
-			throw new RestException(400, 'bad value for parameter id or ref');
-		}
-
-		$id = (empty($id)?0:$id);
-
-		if ($modulepart == 'societe' || $modulepart == 'thirdparty')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-
-			if (!DolibarrApiAccess::$user->rights->societe->lire) {
-				throw new RestException(401);
-			}
-
-			$object = new Societe($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
-				throw new RestException(404, 'Thirdparty not found');
-			}
-
-			$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id;
-		}
-		else if ($modulepart == 'adherent' || $modulepart == 'member')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-
-			if (!DolibarrApiAccess::$user->rights->adherent->lire) {
-				throw new RestException(401);
-			}
-
-			$object = new Adherent($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
-				throw new RestException(404, 'Member not found');
-			}
-
-			$upload_dir = $conf->adherent->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'member');
-		}
-		else if ($modulepart == 'propal' || $modulepart == 'proposal')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-
-			if (!DolibarrApiAccess::$user->rights->propal->lire) {
-				throw new RestException(401);
-			}
-
-			$object = new Propal($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
-				throw new RestException(404, 'Proposal not found');
-			}
-
-			$upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . get_exdir(0, 0, 0, 1, $object, 'propal');
-		}
-		else if ($modulepart == 'commande' || $modulepart == 'order')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-
-			if (!DolibarrApiAccess::$user->rights->commande->lire) {
-				throw new RestException(401);
-			}
-
-			$object = new Commande($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
-				throw new RestException(404, 'Order not found');
-			}
-
-			$upload_dir = $conf->commande->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'commande');
-		}
-		else if ($modulepart == 'shipment' || $modulepart == 'expedition')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-
-			if (!DolibarrApiAccess::$user->rights->expedition->lire) {
-				throw new RestException(401);
-			}
-
-			$object = new Expedition($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
-				throw new RestException(404, 'Shipment not found');
-			}
-
-			$upload_dir = $conf->expedition->dir_output . "/sending/" . get_exdir(0, 0, 0, 1, $object, 'shipment');
-		}
-		else if ($modulepart == 'facture' || $modulepart == 'invoice')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-
-			if (!DolibarrApiAccess::$user->rights->facture->lire) {
-				throw new RestException(401);
-			}
-
-			$object = new Facture($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
-				throw new RestException(404, 'Invoice not found');
-			}
-
-			$upload_dir = $conf->facture->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'invoice');
-		}
-		else if ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-
-			if (!DolibarrApiAccess::$user->rights->agenda->myactions->read && !DolibarrApiAccess::$user->rights->agenda->allactions->read) {
-				throw new RestException(401);
-			}
-
-			$object = new ActionComm($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
-				throw new RestException(404, 'Event not found');
-			}
-
-			$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
-		}
-		else
-		{
-			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
-		}
-
-		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-		if (empty($filearray)) {
-			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(! empty($object->Ref)?' or Ref '.$object->ref:'').' does not return any document.');
-		}
-
-		return $filearray;
-	}
-
-
-	/**
-	 * Return a document.
-	 *
-	 * @param   int         $id          ID of document
-	 * @return  array                    Array with data of file
-	 *
-	 * @throws RestException
-	 */
-	/*
+    /**
+     * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $DOCUMENT_FIELDS = array(
+        'modulepart'
+    );
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        global $db;
+        $this->db = $db;
+    }
+
+
+    /**
+     * Download a document.
+     *
+     * Note that, this API is similar to using the wrapper link "documents.php" to download a file (used for
+     * internal HTML links of documents into application), but with no need to have a session cookie (the token is used instead).
+     *
+     * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
+     * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf)
+     * @return  array                   List of documents
+     *
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 200
+     *
+     * @url GET /download
+     */
+    public function index($module_part, $original_file='')
+    {
+        global $conf, $langs;
+
+        if (empty($module_part)) {
+                throw new RestException(400, 'bad value for parameter modulepart');
+        }
+        if (empty($original_file)) {
+            throw new RestException(400, 'bad value for parameter original_file');
+        }
+
+        //--- Finds and returns the document
+        $entity=$conf->entity;
+
+        $check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
+        $accessallowed              = $check_access['accessallowed'];
+        $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
+        $original_file              = $check_access['original_file'];
+
+        if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
+        {
+            throw new RestException(401);
+        }
+        if (!$accessallowed) {
+            throw new RestException(401);
+        }
+
+        $filename = basename($original_file);
+        $original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+
+        if (! file_exists($original_file_osencoded))
+        {
+            throw new RestException(404, 'File not found');
+        }
+
+        $file_content=file_get_contents($original_file_osencoded);
+        return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64' );
+    }
+
+
+    /**
+     * Build a document.
+     *
+     * Test sample 1: { "module_part": "invoice", "original_file": "FA1701-001/FA1701-001.pdf", "doctemplate": "crabe", "langcode": "fr_FR" }.
+     *
+     * @param   string  $module_part    Name of module or area concerned by file download ('invoice', 'order', ...).
+     * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf).
+     * @param	string	$doctemplate	Set here the doc template to use for document generation (If not set, use the default template).
+     * @param	string	$langcode		Language code like 'en_US', 'fr_FR', 'es_ES', ... (If not set, use the default language).
+     * @return  array                   List of documents
+     *
+     * @throws 500
+     * @throws 501
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 200
+     *
+     * @url PUT /builddoc
+     */
+    public function builddoc($module_part, $original_file='', $doctemplate='', $langcode='')
+    {
+        global $conf, $langs;
+
+        if (empty($module_part)) {
+            throw new RestException(400, 'bad value for parameter modulepart');
+        }
+        if (empty($original_file)) {
+            throw new RestException(400, 'bad value for parameter original_file');
+        }
+
+        $outputlangs = $langs;
+        if ($langcode && $langs->defaultlang != $langcode)
+        {
+            $outputlangs=new Translate('', $conf);
+            $outputlangs->setDefaultLang($langcode);
+        }
+
+        //--- Finds and returns the document
+        $entity=$conf->entity;
+
+        $check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', 'write');
+        $accessallowed              = $check_access['accessallowed'];
+        $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
+        $original_file              = $check_access['original_file'];
+
+        if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file)) {
+            throw new RestException(401);
+        }
+        if (!$accessallowed) {
+            throw new RestException(401);
+        }
+
+        // --- Generates the document
+        $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 0 : 1;
+        $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1;
+        $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1;
+
+        $templateused='';
+
+        if ($module_part == 'facture' || $module_part == 'invoice')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+            $this->invoice = new Facture($this->db);
+            $result = $this->invoice->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
+            if( ! $result ) {
+                throw new RestException(404, 'Invoice not found');
+            }
+
+            $templateused = $doctemplate?$doctemplate:$this->invoice->modelpdf;
+            $result = $this->invoice->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            if( $result <= 0 ) {
+                throw new RestException(500, 'Error generating document');
+            }
+        }
+        elseif ($module_part == 'commande' || $module_part == 'order')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+            $this->order = new Commande($this->db);
+            $result = $this->order->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
+            if( ! $result ) {
+                throw new RestException(404, 'Order not found');
+            }
+            $templateused = $doctemplate?$doctemplate:$this->order->modelpdf;
+            $result = $this->order->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            if( $result <= 0 ) {
+                throw new RestException(500, 'Error generating document');
+            }
+        }
+        elseif ($module_part == 'propal' || $module_part == 'proposal')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+            $this->propal = new Propal($this->db);
+            $result = $this->propal->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
+            if( ! $result ) {
+                throw new RestException(404, 'Proposal not found');
+            }
+            $templateused = $doctemplate?$doctemplate:$this->propal->modelpdf;
+            $result = $this->propal->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            if( $result <= 0 ) {
+                throw new RestException(500, 'Error generating document');
+            }
+        }
+        else
+        {
+            throw new RestException(403, 'Generation not available for this modulepart');
+        }
+
+        $filename = basename($original_file);
+        $original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+
+        if (! file_exists($original_file_osencoded))
+        {
+            throw new RestException(404, 'File not found');
+        }
+
+        $file_content=file_get_contents($original_file_osencoded);
+        return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64' );
+    }
+
+    /**
+     * Return the list of documents of a dedicated element (from its ID or Ref)
+     *
+     * @param   string 	$modulepart		Name of module or area concerned ('thirdparty', 'member', 'proposal', 'order', 'invoice', 'shipment', 'project',  ...)
+     * @param	int		$id				ID of element
+     * @param	string	$ref			Ref of element
+     * @param	string	$sortfield		Sort criteria ('','fullname','relativename','name','date','size')
+     * @param	string	$sortorder		Sort order ('asc' or 'desc')
+     * @return	array					Array of documents with path
+     *
+     * @throws 200
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 500
+     *
+     * @url GET /
+     */
+    function getDocumentsListByElement($modulepart, $id=0, $ref='', $sortfield='', $sortorder='')
+    {
+        global $conf;
+
+        if (empty($modulepart)) {
+            throw new RestException(400, 'bad value for parameter modulepart');
+        }
+
+        if (empty($id) && empty($ref)) {
+            throw new RestException(400, 'bad value for parameter id or ref');
+        }
+
+        $id = (empty($id)?0:$id);
+
+        if ($modulepart == 'societe' || $modulepart == 'thirdparty')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+
+            if (!DolibarrApiAccess::$user->rights->societe->lire) {
+                throw new RestException(401);
+            }
+
+            $object = new Societe($this->db);
+            $result=$object->fetch($id, $ref);
+            if ( ! $result ) {
+                throw new RestException(404, 'Thirdparty not found');
+            }
+
+            $upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id;
+        }
+        else if ($modulepart == 'adherent' || $modulepart == 'member')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+
+            if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+                throw new RestException(401);
+            }
+
+            $object = new Adherent($this->db);
+            $result=$object->fetch($id, $ref);
+            if ( ! $result ) {
+                throw new RestException(404, 'Member not found');
+            }
+
+            $upload_dir = $conf->adherent->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'member');
+        }
+        else if ($modulepart == 'propal' || $modulepart == 'proposal')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+
+            if (!DolibarrApiAccess::$user->rights->propal->lire) {
+                throw new RestException(401);
+            }
+
+            $object = new Propal($this->db);
+            $result=$object->fetch($id, $ref);
+            if ( ! $result ) {
+                throw new RestException(404, 'Proposal not found');
+            }
+
+            $upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . get_exdir(0, 0, 0, 1, $object, 'propal');
+        }
+        else if ($modulepart == 'commande' || $modulepart == 'order')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+            if (!DolibarrApiAccess::$user->rights->commande->lire) {
+                throw new RestException(401);
+            }
+
+            $object = new Commande($this->db);
+            $result=$object->fetch($id, $ref);
+            if ( ! $result ) {
+                throw new RestException(404, 'Order not found');
+            }
+
+            $upload_dir = $conf->commande->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'commande');
+        }
+        else if ($modulepart == 'shipment' || $modulepart == 'expedition')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+
+            if (!DolibarrApiAccess::$user->rights->expedition->lire) {
+                throw new RestException(401);
+            }
+
+            $object = new Expedition($this->db);
+            $result=$object->fetch($id, $ref);
+            if ( ! $result ) {
+                throw new RestException(404, 'Shipment not found');
+            }
+
+            $upload_dir = $conf->expedition->dir_output . "/sending/" . get_exdir(0, 0, 0, 1, $object, 'shipment');
+        }
+        else if ($modulepart == 'facture' || $modulepart == 'invoice')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+            if (!DolibarrApiAccess::$user->rights->facture->lire) {
+                throw new RestException(401);
+            }
+
+            $object = new Facture($this->db);
+            $result=$object->fetch($id, $ref);
+            if ( ! $result ) {
+                throw new RestException(404, 'Invoice not found');
+            }
+
+            $upload_dir = $conf->facture->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'invoice');
+        }
+        else if ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
+        {
+            require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+            if (!DolibarrApiAccess::$user->rights->agenda->myactions->read && !DolibarrApiAccess::$user->rights->agenda->allactions->read) {
+                throw new RestException(401);
+            }
+
+            $object = new ActionComm($this->db);
+            $result=$object->fetch($id, $ref);
+            if ( ! $result ) {
+                throw new RestException(404, 'Event not found');
+            }
+
+            $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
+        }
+        else
+        {
+            throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
+        }
+
+        $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+        if (empty($filearray)) {
+            throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(! empty($object->Ref)?' or Ref '.$object->ref:'').' does not return any document.');
+        }
+
+        return $filearray;
+    }
+
+
+    /**
+     * Return a document.
+     *
+     * @param   int         $id          ID of document
+     * @return  array                    Array with data of file
+     *
+     * @throws RestException
+     */
+    /*
     public function get($id) {
         return array('note'=>'xxx');
     }*/
 
 
-	/**
-	 * Upload a file.
-	 *
-	 * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
-	 * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "image/mywebsite", "filecontent": "Y29udGVudCB0ZXh0Cg==", "fileencoding": "base64", "overwriteifexists": "0" }.
-	 *
-	 * @param   string  $filename           Name of file to create ('FA1705-0123.txt')
-	 * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', 'project', 'project_task', ...)
-	 * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
-	 * @param   string  $subdir       		Subdirectory (Only if ref not provided)
-	 * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
-	 * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64) {@example '' or 'base64'}
-	 * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
-	 *
-	 * @throws 200
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 * @throws 500
-	 *
-	 * @url POST /upload
-	 */
-	public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
-	{
-		global $db, $conf;
-
-		/*var_dump($modulepart);
+    /**
+     * Upload a file.
+     *
+     * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+     * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "image/mywebsite", "filecontent": "Y29udGVudCB0ZXh0Cg==", "fileencoding": "base64", "overwriteifexists": "0" }.
+     *
+     * @param   string  $filename           Name of file to create ('FA1705-0123.txt')
+     * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', 'project', 'project_task', ...)
+     * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
+     * @param   string  $subdir       		Subdirectory (Only if ref not provided)
+     * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
+     * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64) {@example '' or 'base64'}
+     * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
+     *
+     * @throws 200
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 500
+     *
+     * @url POST /upload
+     */
+    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
+    {
+        global $db, $conf;
+
+        /*var_dump($modulepart);
         var_dump($filename);
         var_dump($filecontent);
         exit;*/
 
-		if(empty($modulepart))
-		{
-			throw new RestException(400, 'Modulepart not provided.');
-		}
-
-		if (!DolibarrApiAccess::$user->rights->ecm->upload) {
-			throw new RestException(401);
-		}
-
-		$newfilecontent = '';
-		if (empty($fileencoding)) $newfilecontent = $filecontent;
-		if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
-
-		$original_file = dol_sanitizeFileName($filename);
-
-		// Define $uploadir
-		$object = null;
-		$entity = DolibarrApiAccess::$user->entity;
-		if ($ref)
-		{
-			$tmpreldir='';
-
-			if ($modulepart == 'facture' || $modulepart == 'invoice')
-			{
-				$modulepart='facture';
-
-				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-				$object = new Facture($this->db);
-			}
-			elseif ($modulepart == 'project')
-			{
-				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$object = new Project($this->db);
-			}
-			elseif ($modulepart == 'task' || $modulepart == 'project_task')
-			{
-				$modulepart = 'project_task';
-
-				require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-				$object = new Task($this->db);
-
-				$task_result = $object->fetch('', $ref);
-
-				// Fetching the tasks project is required because its out_dir might be a sub-directory of the project
-				if($task_result > 0)
-				{
-					$project_result = $object->fetch_projet();
-
-					if($project_result >= 0)
-					{
-						$tmpreldir = dol_sanitizeFileName($object->project->ref).'/';
-					}
-				}
-				else
-				{
-					throw new RestException(500, 'Error while fetching Task '.$ref);
-				}
-			}
-			// TODO Implement additional moduleparts
-			else
-			{
-				throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
-			}
-
-			if(is_object($object))
-			{
-				$result = $object->fetch('', $ref);
-
-				if($result == 0)
-				{
-					throw new RestException(404, "Object with ref '".$ref."' was not found.");
-			}
-				elseif ($result < 0)
-				{
-					throw new RestException(500, 'Error while fetching object.');
-				}
-			}
-
-			if (! ($object->id > 0))
-			{
-   				throw new RestException(404, 'The object '.$modulepart." with ref '".$ref."' was not found.");
-			}
-
-			$relativefile = $tmpreldir.dol_sanitizeFileName($object->ref);
-
-			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, $ref, 'write');
-			$upload_dir = $tmp['original_file'];	// No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
-
-			if (empty($upload_dir) || $upload_dir == '/')
-			{
-				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
-			}
-		}
-		else
-		{
-			if ($modulepart == 'invoice') $modulepart ='facture';
-
-			$relativefile = $subdir;
-
-			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'write');
-			$upload_dir = $tmp['original_file'];	// No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
-
-			if (empty($upload_dir) || $upload_dir == '/')
-			{
-				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
-			}
-		}
-		// $original_file here is still value of filename without any dir.
-
-		$upload_dir = dol_sanitizePathName($upload_dir);
-
-		$destfile = $upload_dir . '/' . $original_file;
-		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
-		dol_delete_file($destfiletmp);
-		//var_dump($original_file);exit;
-
-		if (!dol_is_dir(dirname($destfile))) {
-			throw new RestException(401, 'Directory not exists : '.dirname($destfile));
-		}
-
-		if (! $overwriteifexists && dol_is_file($destfile))
-		{
-			throw new RestException(500, "File with name '".$original_file."' already exists.");
-		}
-
-		$fhandle = @fopen($destfiletmp, 'w');
-		if ($fhandle)
-		{
-			$nbofbyteswrote = fwrite($fhandle, $newfilecontent);
-			fclose($fhandle);
-			@chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
-		}
-		else
-		{
-			throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
-		}
-
-		$result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
-		if (! $result)
-		{
-			throw new RestException(500, "Failed to move file into '".$destfile."'");
-		}
-
-		return dol_basename($destfile);
-	}
-
-	/**
-	 * Validate fields before create or update object
-	 *
-	 * @param   array           $data   Array with data to verify
-	 * @return  array
-	 * @throws  RestException
-	 */
-	function _validate_file($data) {
-		$result = array();
-		foreach (Documents::$DOCUMENT_FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
-			$result[$field] = $data[$field];
-		}
-		return $result;
-	}
+        if(empty($modulepart))
+        {
+            throw new RestException(400, 'Modulepart not provided.');
+        }
+
+        if (!DolibarrApiAccess::$user->rights->ecm->upload) {
+            throw new RestException(401);
+        }
+
+        $newfilecontent = '';
+        if (empty($fileencoding)) $newfilecontent = $filecontent;
+        if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
+
+        $original_file = dol_sanitizeFileName($filename);
+
+        // Define $uploadir
+        $object = null;
+        $entity = DolibarrApiAccess::$user->entity;
+        if ($ref)
+        {
+            $tmpreldir='';
+
+            if ($modulepart == 'facture' || $modulepart == 'invoice')
+            {
+                $modulepart='facture';
+
+                require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+                $object = new Facture($this->db);
+            }
+            elseif ($modulepart == 'project')
+            {
+                require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+                $object = new Project($this->db);
+            }
+            elseif ($modulepart == 'task' || $modulepart == 'project_task')
+            {
+                $modulepart = 'project_task';
+
+                require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+                $object = new Task($this->db);
+
+                $task_result = $object->fetch('', $ref);
+
+                // Fetching the tasks project is required because its out_dir might be a sub-directory of the project
+                if($task_result > 0)
+                {
+                    $project_result = $object->fetch_projet();
+
+                    if($project_result >= 0)
+                    {
+                        $tmpreldir = dol_sanitizeFileName($object->project->ref).'/';
+                    }
+                }
+                else
+                {
+                    throw new RestException(500, 'Error while fetching Task '.$ref);
+                }
+            }
+            // TODO Implement additional moduleparts
+            else
+            {
+                throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
+            }
+
+            if(is_object($object))
+            {
+                $result = $object->fetch('', $ref);
+
+                if($result == 0)
+                {
+                    throw new RestException(404, "Object with ref '".$ref."' was not found.");
+            }
+                elseif ($result < 0)
+                {
+                    throw new RestException(500, 'Error while fetching object.');
+                }
+            }
+
+            if (! ($object->id > 0))
+            {
+                    throw new RestException(404, 'The object '.$modulepart." with ref '".$ref."' was not found.");
+            }
+
+            $relativefile = $tmpreldir.dol_sanitizeFileName($object->ref);
+
+            $tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, $ref, 'write');
+            $upload_dir = $tmp['original_file'];	// No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
+
+            if (empty($upload_dir) || $upload_dir == '/')
+            {
+                throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
+            }
+        }
+        else
+        {
+            if ($modulepart == 'invoice') $modulepart ='facture';
+
+            $relativefile = $subdir;
+
+            $tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'write');
+            $upload_dir = $tmp['original_file'];	// No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
+
+            if (empty($upload_dir) || $upload_dir == '/')
+            {
+                throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
+            }
+        }
+        // $original_file here is still value of filename without any dir.
+
+        $upload_dir = dol_sanitizePathName($upload_dir);
+
+        $destfile = $upload_dir . '/' . $original_file;
+        $destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
+        dol_delete_file($destfiletmp);
+        //var_dump($original_file);exit;
+
+        if (!dol_is_dir(dirname($destfile))) {
+            throw new RestException(401, 'Directory not exists : '.dirname($destfile));
+        }
+
+        if (! $overwriteifexists && dol_is_file($destfile))
+        {
+            throw new RestException(500, "File with name '".$original_file."' already exists.");
+        }
+
+        $fhandle = @fopen($destfiletmp, 'w');
+        if ($fhandle)
+        {
+            $nbofbyteswrote = fwrite($fhandle, $newfilecontent);
+            fclose($fhandle);
+            @chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
+        }
+        else
+        {
+            throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
+        }
+
+        $result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
+        if (! $result)
+        {
+            throw new RestException(500, "Failed to move file into '".$destfile."'");
+        }
+
+        return dol_basename($destfile);
+    }
+
+    /**
+     * Validate fields before create or update object
+     *
+     * @param   array           $data   Array with data to verify
+     * @return  array
+     * @throws  RestException
+     */
+    function _validate_file($data) {
+        $result = array();
+        foreach (Documents::$DOCUMENT_FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $result[$field] = $data[$field];
+        }
+        return $result;
+    }
 }

Spacing +65 added lines, -65 removed lines

@@ -67,7 +67,7 @@ 
 	 *
 	 * @url GET /download
 	 */
-	public function index($module_part, $original_file='')
+	public function index($module_part, $original_file = '')
 	{
 		global $conf, $langs;
 
@@ -79,14 +79,14 @@ 
 		}
 
 		//--- Finds and returns the document
-		$entity=$conf->entity;
+		$entity = $conf->entity;
 
 		$check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
 		$accessallowed              = $check_access['accessallowed'];
 		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 		$original_file              = $check_access['original_file'];
 
-		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
+		if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file))
 		{
 			throw new RestException(401);
 		}
@@ -95,15 +95,15 @@ 
 		}
 
 		$filename = basename($original_file);
-		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+		$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-		if (! file_exists($original_file_osencoded))
+		if (!file_exists($original_file_osencoded))
 		{
 			throw new RestException(404, 'File not found');
 		}
 
-		$file_content=file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64' );
+		$file_content = file_get_contents($original_file_osencoded);
+		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64');
 	}
 
 
@@ -127,7 +127,7 @@ 
 	 *
 	 * @url PUT /builddoc
 	 */
-	public function builddoc($module_part, $original_file='', $doctemplate='', $langcode='')
+	public function builddoc($module_part, $original_file = '', $doctemplate = '', $langcode = '')
 	{
 		global $conf, $langs;
 
@@ -141,19 +141,19 @@ 
 		$outputlangs = $langs;
 		if ($langcode && $langs->defaultlang != $langcode)
 		{
-			$outputlangs=new Translate('', $conf);
+			$outputlangs = new Translate('', $conf);
 			$outputlangs->setDefaultLang($langcode);
 		}
 
 		//--- Finds and returns the document
-		$entity=$conf->entity;
+		$entity = $conf->entity;
 
 		$check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', 'write');
 		$accessallowed              = $check_access['accessallowed'];
 		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 		$original_file              = $check_access['original_file'];
 
-		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file)) {
+		if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file)) {
 			throw new RestException(401);
 		}
 		if (!$accessallowed) {
@@ -165,20 +165,20 @@ 
 		$hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1;
 		$hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1;
 
-		$templateused='';
+		$templateused = '';
 
 		if ($module_part == 'facture' || $module_part == 'invoice')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$this->invoice = new Facture($this->db);
 			$result = $this->invoice->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
+			if (!$result) {
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$templateused = $doctemplate?$doctemplate:$this->invoice->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->invoice->modelpdf;
 			$result = $this->invoice->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
+			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
 		}
@@ -187,12 +187,12 @@ 
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$this->order = new Commande($this->db);
 			$result = $this->order->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
+			if (!$result) {
 				throw new RestException(404, 'Order not found');
 			}
-			$templateused = $doctemplate?$doctemplate:$this->order->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->order->modelpdf;
 			$result = $this->order->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
+			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
 		}
@@ -201,12 +201,12 @@ 
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$this->propal = new Propal($this->db);
 			$result = $this->propal->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
+			if (!$result) {
 				throw new RestException(404, 'Proposal not found');
 			}
-			$templateused = $doctemplate?$doctemplate:$this->propal->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->propal->modelpdf;
 			$result = $this->propal->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
+			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
 		}
@@ -216,15 +216,15 @@ 
 		}
 
 		$filename = basename($original_file);
-		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+		$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-		if (! file_exists($original_file_osencoded))
+		if (!file_exists($original_file_osencoded))
 		{
 			throw new RestException(404, 'File not found');
 		}
 
-		$file_content=file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64' );
+		$file_content = file_get_contents($original_file_osencoded);
+		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64');
 	}
 
 	/**
@@ -245,7 +245,7 @@ 
 	 *
 	 * @url GET /
 	 */
-	function getDocumentsListByElement($modulepart, $id=0, $ref='', $sortfield='', $sortorder='')
+	function getDocumentsListByElement($modulepart, $id = 0, $ref = '', $sortfield = '', $sortorder = '')
 	{
 		global $conf;
 
@@ -257,7 +257,7 @@ 
 			throw new RestException(400, 'bad value for parameter id or ref');
 		}
 
-		$id = (empty($id)?0:$id);
+		$id = (empty($id) ? 0 : $id);
 
 		if ($modulepart == 'societe' || $modulepart == 'thirdparty')
 		{
@@ -268,12 +268,12 @@ 
 			}
 
 			$object = new Societe($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Thirdparty not found');
 			}
 
-			$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id;
+			$upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;
 		}
 		else if ($modulepart == 'adherent' || $modulepart == 'member')
 		{
@@ -284,12 +284,12 @@ 
 			}
 
 			$object = new Adherent($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Member not found');
 			}
 
-			$upload_dir = $conf->adherent->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'member');
+			$upload_dir = $conf->adherent->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'member');
 		}
 		else if ($modulepart == 'propal' || $modulepart == 'proposal')
 		{
@@ -300,12 +300,12 @@ 
 			}
 
 			$object = new Propal($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Proposal not found');
 			}
 
-			$upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . get_exdir(0, 0, 0, 1, $object, 'propal');
+			$upload_dir = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');
 		}
 		else if ($modulepart == 'commande' || $modulepart == 'order')
 		{
@@ -316,12 +316,12 @@ 
 			}
 
 			$object = new Commande($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Order not found');
 			}
 
-			$upload_dir = $conf->commande->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'commande');
+			$upload_dir = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
 		}
 		else if ($modulepart == 'shipment' || $modulepart == 'expedition')
 		{
@@ -332,12 +332,12 @@ 
 			}
 
 			$object = new Expedition($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Shipment not found');
 			}
 
-			$upload_dir = $conf->expedition->dir_output . "/sending/" . get_exdir(0, 0, 0, 1, $object, 'shipment');
+			$upload_dir = $conf->expedition->dir_output."/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');
 		}
 		else if ($modulepart == 'facture' || $modulepart == 'invoice')
 		{
@@ -348,12 +348,12 @@ 
 			}
 
 			$object = new Facture($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$upload_dir = $conf->facture->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'invoice');
+			$upload_dir = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 		}
 		else if ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
 		{
@@ -364,8 +364,8 @@ 
 			}
 
 			$object = new ActionComm($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Event not found');
 			}
 
@@ -376,9 +376,9 @@ 
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
 
-		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		if (empty($filearray)) {
-			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(! empty($object->Ref)?' or Ref '.$object->ref:'').' does not return any document.');
+			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->Ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
 		}
 
 		return $filearray;
@@ -421,7 +421,7 @@ 
 	 *
 	 * @url POST /upload
 	 */
-	public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
+	public function post($filename, $modulepart, $ref = '', $subdir = '', $filecontent = '', $fileencoding = '', $overwriteifexists = 0)
 	{
 		global $db, $conf;
 
@@ -430,7 +430,7 @@ 
         var_dump($filecontent);
         exit;*/
 
-		if(empty($modulepart))
+		if (empty($modulepart))
 		{
 			throw new RestException(400, 'Modulepart not provided.');
 		}
@@ -450,11 +450,11 @@ 
 		$entity = DolibarrApiAccess::$user->entity;
 		if ($ref)
 		{
-			$tmpreldir='';
+			$tmpreldir = '';
 
 			if ($modulepart == 'facture' || $modulepart == 'invoice')
 			{
-				$modulepart='facture';
+				$modulepart = 'facture';
 
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$object = new Facture($this->db);
@@ -474,11 +474,11 @@ 
 				$task_result = $object->fetch('', $ref);
 
 				// Fetching the tasks project is required because its out_dir might be a sub-directory of the project
-				if($task_result > 0)
+				if ($task_result > 0)
 				{
 					$project_result = $object->fetch_projet();
 
-					if($project_result >= 0)
+					if ($project_result >= 0)
 					{
 						$tmpreldir = dol_sanitizeFileName($object->project->ref).'/';
 					}
@@ -494,11 +494,11 @@ 
 				throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 			}
 
-			if(is_object($object))
+			if (is_object($object))
 			{
 				$result = $object->fetch('', $ref);
 
-				if($result == 0)
+				if ($result == 0)
 				{
 					throw new RestException(404, "Object with ref '".$ref."' was not found.");
 			}
@@ -508,7 +508,7 @@ 
 				}
 			}
 
-			if (! ($object->id > 0))
+			if (!($object->id > 0))
 			{
    				throw new RestException(404, 'The object '.$modulepart." with ref '".$ref."' was not found.");
 			}
@@ -516,7 +516,7 @@ 
 			$relativefile = $tmpreldir.dol_sanitizeFileName($object->ref);
 
 			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, $ref, 'write');
-			$upload_dir = $tmp['original_file'];	// No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
+			$upload_dir = $tmp['original_file']; // No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
 
 			if (empty($upload_dir) || $upload_dir == '/')
 			{
@@ -525,12 +525,12 @@ 
 		}
 		else
 		{
-			if ($modulepart == 'invoice') $modulepart ='facture';
+			if ($modulepart == 'invoice') $modulepart = 'facture';
 
 			$relativefile = $subdir;
 
 			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'write');
-			$upload_dir = $tmp['original_file'];	// No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
+			$upload_dir = $tmp['original_file']; // No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
 
 			if (empty($upload_dir) || $upload_dir == '/')
 			{
@@ -541,8 +541,8 @@ 
 
 		$upload_dir = dol_sanitizePathName($upload_dir);
 
-		$destfile = $upload_dir . '/' . $original_file;
-		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
+		$destfile = $upload_dir.'/'.$original_file;
+		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/'.$original_file;
 		dol_delete_file($destfiletmp);
 		//var_dump($original_file);exit;
 
@@ -550,7 +550,7 @@ 
 			throw new RestException(401, 'Directory not exists : '.dirname($destfile));
 		}
 
-		if (! $overwriteifexists && dol_is_file($destfile))
+		if (!$overwriteifexists && dol_is_file($destfile))
 		{
 			throw new RestException(500, "File with name '".$original_file."' already exists.");
 		}
@@ -568,7 +568,7 @@ 
 		}
 
 		$result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
-		if (! $result)
+		if (!$result)
 		{
 			throw new RestException(500, "Failed to move file into '".$destfile."'");
 		}

Braces +28 added lines, -37 removed lines

@@ -181,8 +181,7 @@ 
 			if( $result <= 0 ) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		elseif ($module_part == 'commande' || $module_part == 'order')
+		} elseif ($module_part == 'commande' || $module_part == 'order')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$this->order = new Commande($this->db);
@@ -195,8 +194,7 @@ 
 			if( $result <= 0 ) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		elseif ($module_part == 'propal' || $module_part == 'proposal')
+		} elseif ($module_part == 'propal' || $module_part == 'proposal')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$this->propal = new Propal($this->db);
@@ -209,8 +207,7 @@ 
 			if( $result <= 0 ) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		else
+		} else
 		{
 			throw new RestException(403, 'Generation not available for this modulepart');
 		}
@@ -274,8 +271,7 @@ 
 			}
 
 			$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id;
-		}
-		else if ($modulepart == 'adherent' || $modulepart == 'member')
+		} else if ($modulepart == 'adherent' || $modulepart == 'member')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
@@ -290,8 +286,7 @@ 
 			}
 
 			$upload_dir = $conf->adherent->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'member');
-		}
-		else if ($modulepart == 'propal' || $modulepart == 'proposal')
+		} else if ($modulepart == 'propal' || $modulepart == 'proposal')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
@@ -306,8 +301,7 @@ 
 			}
 
 			$upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . get_exdir(0, 0, 0, 1, $object, 'propal');
-		}
-		else if ($modulepart == 'commande' || $modulepart == 'order')
+		} else if ($modulepart == 'commande' || $modulepart == 'order')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
@@ -322,8 +316,7 @@ 
 			}
 
 			$upload_dir = $conf->commande->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'commande');
-		}
-		else if ($modulepart == 'shipment' || $modulepart == 'expedition')
+		} else if ($modulepart == 'shipment' || $modulepart == 'expedition')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
@@ -338,8 +331,7 @@ 
 			}
 
 			$upload_dir = $conf->expedition->dir_output . "/sending/" . get_exdir(0, 0, 0, 1, $object, 'shipment');
-		}
-		else if ($modulepart == 'facture' || $modulepart == 'invoice')
+		} else if ($modulepart == 'facture' || $modulepart == 'invoice')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -354,8 +346,7 @@ 
 			}
 
 			$upload_dir = $conf->facture->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'invoice');
-		}
-		else if ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
+		} else if ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
@@ -370,8 +361,7 @@ 
 			}
 
 			$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
-		}
-		else
+		} else
 		{
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
@@ -440,8 +430,12 @@ 
 		}
 
 		$newfilecontent = '';
-		if (empty($fileencoding)) $newfilecontent = $filecontent;
-		if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
+		if (empty($fileencoding)) {
+		    $newfilecontent = $filecontent;
+		}
+		if ($fileencoding == 'base64') {
+		    $newfilecontent = base64_decode($filecontent);
+		}
 
 		$original_file = dol_sanitizeFileName($filename);
 
@@ -458,13 +452,11 @@ 
 
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$object = new Facture($this->db);
-			}
-			elseif ($modulepart == 'project')
+			} elseif ($modulepart == 'project')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$object = new Project($this->db);
-			}
-			elseif ($modulepart == 'task' || $modulepart == 'project_task')
+			} elseif ($modulepart == 'task' || $modulepart == 'project_task')
 			{
 				$modulepart = 'project_task';
 
@@ -482,8 +474,7 @@ 
 					{
 						$tmpreldir = dol_sanitizeFileName($object->project->ref).'/';
 					}
-				}
-				else
+				} else
 				{
 					throw new RestException(500, 'Error while fetching Task '.$ref);
 				}
@@ -501,8 +492,7 @@ 
 				if($result == 0)
 				{
 					throw new RestException(404, "Object with ref '".$ref."' was not found.");
-			}
-				elseif ($result < 0)
+			} elseif ($result < 0)
 				{
 					throw new RestException(500, 'Error while fetching object.');
 				}
@@ -522,10 +512,11 @@ 
 			{
 				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
 			}
-		}
-		else
+		} else
 		{
-			if ($modulepart == 'invoice') $modulepart ='facture';
+			if ($modulepart == 'invoice') {
+			    $modulepart ='facture';
+			}
 
 			$relativefile = $subdir;
 
@@ -561,8 +552,7 @@ 
 			$nbofbyteswrote = fwrite($fhandle, $newfilecontent);
 			fclose($fhandle);
 			@chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
-		}
-		else
+		} else
 		{
 			throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
 		}
@@ -586,8 +576,9 @@ 
 	function _validate_file($data) {
 		$result = array();
 		foreach (Documents::$DOCUMENT_FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
+			if (!isset($data[$field])) {
+							throw new RestException(400, "$field field missing");
+			}
 			$result[$field] = $data[$field];
 		}
 		return $result;

dolibarr/htdocs/api/admin/index.php

Indentation +37 added lines, -37 removed lines

@@ -33,49 +33,49 @@
 $langs->load("admin");
 
 if (! $user->admin)
-	accessforbidden();
+    accessforbidden();
 
 $action=GETPOST('action','aZ09');
 
 //Activate ProfId
 if ($action == 'setproductionmode')
 {
-	$status = GETPOST('status','alpha');
-
-	if (dolibarr_set_const($db, 'API_PRODUCTION_MODE', $status, 'chaine', 0, '', 0) > 0)
-	{
-		$error=0;
-
-		if ($status == 1)
-		{
-			$result = dol_mkdir($conf->api->dir_temp);
-			if ($result < 0)
-			{
-				setEventMessages($langs->trans("ErrorFailedToCreateDir", $conf->api->dir_temp), null, 'errors');
-				$error++;
-			}
-		}
-		else
-		{
-			// Delete the cache file otherwise it does not update
-			$result = dol_delete_file($conf->api->dir_temp.'/routes.php');
-			if ($result < 0)
-			{
-				setEventMessages($langs->trans("ErrorFailedToDeleteFile", $conf->api->dir_temp.'/routes.php'), null, 'errors');
-				$error++;
-			}
-		}
-
-	    if (!$error)
-	    {
-    		header("Location: ".$_SERVER["PHP_SELF"]);
-	   	    exit;
-	    }
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    $status = GETPOST('status','alpha');
+
+    if (dolibarr_set_const($db, 'API_PRODUCTION_MODE', $status, 'chaine', 0, '', 0) > 0)
+    {
+        $error=0;
+
+        if ($status == 1)
+        {
+            $result = dol_mkdir($conf->api->dir_temp);
+            if ($result < 0)
+            {
+                setEventMessages($langs->trans("ErrorFailedToCreateDir", $conf->api->dir_temp), null, 'errors');
+                $error++;
+            }
+        }
+        else
+        {
+            // Delete the cache file otherwise it does not update
+            $result = dol_delete_file($conf->api->dir_temp.'/routes.php');
+            if ($result < 0)
+            {
+                setEventMessages($langs->trans("ErrorFailedToDeleteFile", $conf->api->dir_temp.'/routes.php'), null, 'errors');
+                $error++;
+            }
+        }
+
+        if (!$error)
+        {
+            header("Location: ".$_SERVER["PHP_SELF"]);
+                exit;
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 dol_mkdir(DOL_DATA_ROOT.'/api/temp');		// May have been deleted by a purge

Braces +6 added lines, -9 removed lines

@@ -32,8 +32,9 @@ 
 // Load translation files required by the page
 $langs->load("admin");
 
-if (! $user->admin)
+if (! $user->admin) {
 	accessforbidden();
+}
 
 $action=GETPOST('action','aZ09');
 
@@ -54,8 +55,7 @@ 
 				setEventMessages($langs->trans("ErrorFailedToCreateDir", $conf->api->dir_temp), null, 'errors');
 				$error++;
 			}
-		}
-		else
+		} else
 		{
 			// Delete the cache file otherwise it does not update
 			$result = dol_delete_file($conf->api->dir_temp.'/routes.php');
@@ -71,8 +71,7 @@ 
     		header("Location: ".$_SERVER["PHP_SELF"]);
 	   	    exit;
 	    }
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -111,8 +110,7 @@ 
     print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=0">';
     print img_picto($langs->trans("Activated"),'switch_on');
     print '</a></td>';
-}
-else
+} else
 {
     print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=1">';
     print img_picto($langs->trans("Disabled"),'switch_off');
@@ -144,8 +142,7 @@ 
 {
     $url=DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
     print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-}
-else
+} else
 {
     print $langs->trans("NotAvailableWithThisDistribution");
 }

Spacing +21 added lines, -21 removed lines

@@ -28,26 +28,26 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 // Load translation files required by the page
 $langs->load("admin");
 
-if (! $user->admin)
+if (!$user->admin)
 	accessforbidden();
 
-$action=GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 //Activate ProfId
 if ($action == 'setproductionmode')
 {
-	$status = GETPOST('status','alpha');
+	$status = GETPOST('status', 'alpha');
 
 	if (dolibarr_set_const($db, 'API_PRODUCTION_MODE', $status, 'chaine', 0, '', 0) > 0)
 	{
-		$error=0;
+		$error = 0;
 
 		if ($status == 1)
 		{
@@ -81,7 +81,7 @@ 
 	}
 }
 
-dol_mkdir(DOL_DATA_ROOT.'/api/temp');		// May have been deleted by a purge
+dol_mkdir(DOL_DATA_ROOT.'/api/temp'); // May have been deleted by a purge
 
 
 /*
@@ -90,8 +90,8 @@ 
 
 llxHeader();
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ApiSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ApiSetup"), $linkback, 'title_setup');
 
 print $langs->trans("ApiDesc")."<br>\n";
 print "<br>\n";
@@ -108,17 +108,17 @@ 
 
 print '<tr class="impair">';
 print '<td>'.$langs->trans("ApiProductionMode").'</td>';
-$production_mode=(empty($conf->global->API_PRODUCTION_MODE)?false:true);
+$production_mode = (empty($conf->global->API_PRODUCTION_MODE) ?false:true);
 if ($production_mode)
 {
-    print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=0">';
-    print img_picto($langs->trans("Activated"),'switch_on');
+    print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i + 1).'&status=0">';
+    print img_picto($langs->trans("Activated"), 'switch_on');
     print '</a></td>';
 }
 else
 {
-    print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=1">';
-    print img_picto($langs->trans("Disabled"),'switch_off');
+    print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i + 1).'&status=1">';
+    print img_picto($langs->trans("Disabled"), 'switch_off');
     print '</a></td>';
 }
 print '<td>&nbsp;</td>';
@@ -128,15 +128,15 @@ 
 print '<br><br>';
 
 // Define $urlwithroot
-$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
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 // Show message
-$message='';
-$url=$urlwithroot.'/api/index.php/login?login=<strong>auserlogin</strong>&password=<strong>thepassword</strong>[&reset=1]';
-$message.=$langs->trans("UrlToGetKeyToUseAPIs").':<br>';
-$message.=img_picto('','object_globe.png').' '.$url;
+$message = '';
+$url = $urlwithroot.'/api/index.php/login?login=<strong>auserlogin</strong>&password=<strong>thepassword</strong>[&reset=1]';
+$message .= $langs->trans("UrlToGetKeyToUseAPIs").':<br>';
+$message .= img_picto('', 'object_globe.png').' '.$url;
 print $message;
 print '<br>';
 print '<br>';
@@ -145,8 +145,8 @@ 
 print '<u>'.$langs->trans("ApiExporerIs").':</u><br>';
 if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/explorer'))
 {
-    $url=DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
-    print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+    $url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
+    print img_picto('', 'object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
 }
 else
 {

dolibarr/htdocs/api/admin/explorer.php

Indentation +12 added lines, -12 removed lines

@@ -78,23 +78,23 @@ 
                 $module=$part=$obj=strtolower(preg_replace('/^mod/i','',$modulename));
                 //if ($part == 'propale') $part='propal';
                 if ($module == 'societe') {
-					$obj = 'thirdparty';
-				}
+                    $obj = 'thirdparty';
+                }
                 if ($module == 'categorie') {
                     $part = 'categories';
-					$obj = 'category';
-				}
+                    $obj = 'category';
+                }
                 if ($module == 'facture') {
                     $part = 'compta/facture';
-					$obj = 'facture';
-				}
+                    $obj = 'facture';
+                }
                 if ($module == 'ficheinter') {
-                                       $obj = 'fichinter';
-                                       $part = 'fichinter';
-                                       $module='fichinter';
-                               }
+                                        $obj = 'fichinter';
+                                        $part = 'fichinter';
+                                        $module='fichinter';
+                                }
 
-		if (empty($conf->$module->enabled)) $enabled=false;
+        if (empty($conf->$module->enabled)) $enabled=false;
 
                 if ($enabled)
                 {
@@ -149,7 +149,7 @@ 
                                     }*/
 
                                     //$listofapis[]=array('classname'=>$classname, 'fullpath'=>$file_searched);
-                           /*     }
+                            /*     }
 
                             }*/
                         }

Spacing +29 added lines, -29 removed lines

@@ -42,7 +42,7 @@ 
 if (empty($conf->global->MAIN_MODULE_API))
 {
     dol_syslog("Call Dolibarr API interfaces with module REST disabled");
-    print $langs->trans("WarningModuleNotActive",'Api').'.<br><br>';
+    print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
     print $langs->trans("ToActivateModule");
     exit;
 }
@@ -52,7 +52,7 @@ 
 
 $api->r->addAPIClass('Luracast\\Restler\\Resources'); //this creates resources.json at API Root
 $api->r->setSupportedFormats('JsonFormat', 'XmlFormat');
-$api->r->addAuthenticationClass('DolibarrApiAccess','');
+$api->r->addAuthenticationClass('DolibarrApiAccess', '');
 
 $listofapis = array();
 
@@ -64,18 +64,18 @@ 
      */
     //dol_syslog("Scan directory ".$dir." for API modules");
 
-    $handle=@opendir(dol_osencode($dir));
+    $handle = @opendir(dol_osencode($dir));
     if (is_resource($handle))
     {
-        while (($file = readdir($handle))!==false)
+        while (($file = readdir($handle)) !== false)
         {
-            if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i",$file,$reg))
+            if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
             {
-                $modulename=$reg[1];
+                $modulename = $reg[1];
 
                 // Defined if module is enabled
-                $enabled=true;
-                $module=$part=$obj=strtolower(preg_replace('/^mod/i','',$modulename));
+                $enabled = true;
+                $module = $part = $obj = strtolower(preg_replace('/^mod/i', '', $modulename));
                 //if ($part == 'propale') $part='propal';
                 if ($module == 'societe') {
 					$obj = 'thirdparty';
@@ -91,10 +91,10 @@ 
                 if ($module == 'ficheinter') {
                                        $obj = 'fichinter';
                                        $part = 'fichinter';
-                                       $module='fichinter';
+                                       $module = 'fichinter';
                                }
 
-		if (empty($conf->$module->enabled)) $enabled=false;
+		if (empty($conf->$module->enabled)) $enabled = false;
 
                 if ($enabled)
                 {
@@ -108,12 +108,12 @@ 
                      */
                     $dir_part = DOL_DOCUMENT_ROOT.'/'.$part.'/class/';
 
-                    $handle_part=@opendir(dol_osencode($dir_part));
+                    $handle_part = @opendir(dol_osencode($dir_part));
                     if (is_resource($handle_part))
                     {
-                        while (($file_searched = readdir($handle_part))!==false)
+                        while (($file_searched = readdir($handle_part)) !== false)
                         {
-                            if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i",$file_searched,$reg))
+                            if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $reg))
                             {
                                 $classname = ucwords($reg[1]);
                                 require_once $dir_part.$file_searched;
@@ -161,43 +161,43 @@ 
 }
 
 //var_dump($listofapis);
-$listofapis=Routes::toArray();          // TODO api for "status" is lost here
+$listofapis = Routes::toArray(); // TODO api for "status" is lost here
 //var_dump($listofapis);
 
 
 llxHeader();
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ApiSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ApiSetup"), $linkback, 'title_setup');
 
 // Define $urlwithroot
-$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
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 // Show message
 print '<br>';
-$message='';
-$url='<a href="'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword" target="_blank">'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword[&reset=1]</a>';
-$message.=$langs->trans("UrlToGetKeyToUseAPIs").':<br>';
-$message.=img_picto('','object_globe.png').' '.$url;
+$message = '';
+$url = '<a href="'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword" target="_blank">'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword[&reset=1]</a>';
+$message .= $langs->trans("UrlToGetKeyToUseAPIs").':<br>';
+$message .= img_picto('', 'object_globe.png').' '.$url;
 print $message;
 print '<br>';
 print '<br>';
 
-$oldclass='';
+$oldclass = '';
 
 print $langs->trans("ListOfAvailableAPIs").':<br>';
-foreach($listofapis['v1'] as $key => $val)
+foreach ($listofapis['v1'] as $key => $val)
 {
     if ($key == 'login') continue;
     if ($key == 'index') continue;
 
     if ($key)
     {
-        foreach($val as $method => $val2)
+        foreach ($val as $method => $val2)
         {
-            $newclass=$val2['className'];
+            $newclass = $val2['className'];
 
             if (preg_match('/restler/i', $newclass)) continue;
 
@@ -207,9 +207,9 @@ 
                 $oldclass = $newclass;
             }
             //print $key.' - '.$val['classname'].' - '.$val['fullpath']." - ".DOL_MAIN_URL_ROOT.'/api/index.php/'.strtolower(preg_replace('/Api$/','',$val['classname']))."/xxx<br>\n";
-            $url=$urlwithroot.'/api/index.php/'.$key;
-            $url.='?api_key=token';
-            print img_picto('','object_globe.png').' '.$method.' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+            $url = $urlwithroot.'/api/index.php/'.$key;
+            $url .= '?api_key=token';
+            print img_picto('', 'object_globe.png').' '.$method.' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
         }
     }
 }

Braces +12 added lines, -4 removed lines

@@ -94,7 +94,9 @@ 
                                        $module='fichinter';
                                }
 
-		if (empty($conf->$module->enabled)) $enabled=false;
+		if (empty($conf->$module->enabled)) {
+		    $enabled=false;
+		}
 
                 if ($enabled)
                 {
@@ -190,8 +192,12 @@ 
 print $langs->trans("ListOfAvailableAPIs").':<br>';
 foreach($listofapis['v1'] as $key => $val)
 {
-    if ($key == 'login') continue;
-    if ($key == 'index') continue;
+    if ($key == 'login') {
+        continue;
+    }
+    if ($key == 'index') {
+        continue;
+    }
 
     if ($key)
     {
@@ -199,7 +205,9 @@ 
         {
             $newclass=$val2['className'];
 
-            if (preg_match('/restler/i', $newclass)) continue;
+            if (preg_match('/restler/i', $newclass)) {
+                continue;
+            }
 
             if ($oldclass != $newclass)
             {

dolibarr/htdocs/api/index.php

Indentation +32 added lines, -32 removed lines

@@ -215,38 +215,38 @@
     // Load a dedicated API file
     dol_syslog("Load a dedicated API file module=".$module." moduledirforclass=".$moduledirforclass);
 
-	$tmpmodule = $module;
-	if ($tmpmodule != 'api')
-		$tmpmodule = preg_replace('/api$/i', '', $tmpmodule);
-	$classfile = str_replace('_', '', $tmpmodule);
-	if ($module == 'supplierproposals')
-		$classfile = 'supplier_proposals';
-	if ($module == 'supplierorders')
-		$classfile = 'supplier_orders';
-	if ($module == 'supplierinvoices')
-		$classfile = 'supplier_invoices';
-	if ($module == 'ficheinter')
-		$classfile = 'interventions';
-	if ($module == 'interventions')
-		$classfile = 'interventions';
-
-	$dir_part_file = dol_buildpath('/' . $moduledirforclass . '/class/api_' . $classfile . '.class.php', 0, 2);
-
-	$classname = ucwords($module);
-
-	dol_syslog('Search /' . $moduledirforclass . '/class/api_' . $classfile . '.class.php => dir_part_file=' . $dir_part_file . ' classname=' . $classname);
-
-	$res = false;
-	if ($dir_part_file)
-		$res = include_once $dir_part_file;
-	if (! $res) {
-		print 'API not found (failed to include API file)';
-		header('HTTP/1.1 501 API not found (failed to include API file)');
-		exit(0);
-	}
-
-	if (class_exists($classname))
-		$api->r->addAPIClass($classname);
+    $tmpmodule = $module;
+    if ($tmpmodule != 'api')
+        $tmpmodule = preg_replace('/api$/i', '', $tmpmodule);
+    $classfile = str_replace('_', '', $tmpmodule);
+    if ($module == 'supplierproposals')
+        $classfile = 'supplier_proposals';
+    if ($module == 'supplierorders')
+        $classfile = 'supplier_orders';
+    if ($module == 'supplierinvoices')
+        $classfile = 'supplier_invoices';
+    if ($module == 'ficheinter')
+        $classfile = 'interventions';
+    if ($module == 'interventions')
+        $classfile = 'interventions';
+
+    $dir_part_file = dol_buildpath('/' . $moduledirforclass . '/class/api_' . $classfile . '.class.php', 0, 2);
+
+    $classname = ucwords($module);
+
+    dol_syslog('Search /' . $moduledirforclass . '/class/api_' . $classfile . '.class.php => dir_part_file=' . $dir_part_file . ' classname=' . $classname);
+
+    $res = false;
+    if ($dir_part_file)
+        $res = include_once $dir_part_file;
+    if (! $res) {
+        print 'API not found (failed to include API file)';
+        header('HTTP/1.1 501 API not found (failed to include API file)');
+        exit(0);
+    }
+
+    if (class_exists($classname))
+        $api->r->addAPIClass($classname);
 }
 
 // TODO If not found, redirect to explorer

Spacing +35 added lines, -35 removed lines

@@ -24,25 +24,25 @@ 
  *  \file       htdocs/api/index.php
  */
 
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');		// If there is no need to load and show top and left menu
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');		// If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');       // Do not load ajax.lib.php library
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1'); // Do not load ajax.lib.php library
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 
 
 // Force entity if a value is provided into HTTP header. Otherwise, will use the entity of user of token used.
-if (! empty($_SERVER['HTTP_DOLAPIENTITY'])) define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
+if (!empty($_SERVER['HTTP_DOLAPIENTITY'])) define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
 
 
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=include '../main.inc.php';
-if (! $res) die("Include of main fails");
+$res = 0;
+if (!$res && file_exists("../main.inc.php")) $res = include '../main.inc.php';
+if (!$res) die("Include of main fails");
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
 
-call_user_func(function () {
+call_user_func(function() {
     $loader = Luracast\Restler\AutoLoader::instance();
     spl_autoload_register($loader);
     return $loader;
@@ -59,13 +59,13 @@ 
 {
     $langs->load("admin");
     dol_syslog("Call Dolibarr API interfaces with module REST disabled");
-    print $langs->trans("WarningModuleNotActive",'Api').'.<br><br>';
+    print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
     print $langs->trans("ToActivateModule");
     exit;
 }
 
 // Test if explorer is not disabled
-if (preg_match('/api\/index\.php\/explorer/', $_SERVER["PHP_SELF"]) && ! empty($conf->global->API_EXPLORER_DISABLED))
+if (preg_match('/api\/index\.php\/explorer/', $_SERVER["PHP_SELF"]) && !empty($conf->global->API_EXPLORER_DISABLED))
 {
     $langs->load("admin");
     dol_syslog("Call Dolibarr API interfaces with module REST disabled");
@@ -93,10 +93,10 @@ 
 
 
 // Set the flag to say to refresh (when we reload the explorer, production must be for API call only)
-$refreshcache=false;
-if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
+$refreshcache = false;
+if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
-    $refreshcache=true;
+    $refreshcache = true;
 }
 
 
@@ -107,8 +107,8 @@ 
 // See https://github.com/Luracast/Restler-API-Explorer for more info.
 $api->r->addAPIClass('Luracast\\Restler\\Explorer');
 
-$api->r->setSupportedFormats('JsonFormat', 'XmlFormat', 'UploadFormat');	// 'YamlFormat'
-$api->r->addAuthenticationClass('DolibarrApiAccess','');
+$api->r->setSupportedFormats('JsonFormat', 'XmlFormat', 'UploadFormat'); // 'YamlFormat'
+$api->r->addAuthenticationClass('DolibarrApiAccess', '');
 
 // Define accepted mime types
 UploadFormat::$allowedMimeTypes = array('image/jpeg', 'image/png', 'text/plain', 'application/octet-stream');
@@ -116,7 +116,7 @@ 
 
 
 // Call Explorer file for all APIs definitions
-if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
+if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
     // Scan all API files to load them
 
@@ -128,25 +128,25 @@ 
         // Search available module
         dol_syslog("Scan directory ".$dir." for module descriptor files, then search for API files");
 
-        $handle=@opendir(dol_osencode($dir));
+        $handle = @opendir(dol_osencode($dir));
         if (is_resource($handle))
         {
-            while (($file = readdir($handle))!==false)
+            while (($file = readdir($handle)) !== false)
             {
-                if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i",$file,$regmod))
+                if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i", $file, $regmod))
                 {
                     $module = strtolower($regmod[1]);
                     $moduledirforclass = getModuleDirForApiClass($module);
                     $modulenameforenabled = $module;
-                    if ($module == 'propale') { $modulenameforenabled='propal'; }
-                    if ($module == 'supplierproposal') { $modulenameforenabled='supplier_proposal'; }
-                    if ($module == 'ficheinter') { $modulenameforenabled='ficheinter'; }
+                    if ($module == 'propale') { $modulenameforenabled = 'propal'; }
+                    if ($module == 'supplierproposal') { $modulenameforenabled = 'supplier_proposal'; }
+                    if ($module == 'ficheinter') { $modulenameforenabled = 'ficheinter'; }
 
                     dol_syslog("Found module file ".$file." - module=".$module." - modulenameforenabled=".$modulenameforenabled." - moduledirforclass=".$moduledirforclass);
 
                     // Defined if module is enabled
-                    $enabled=true;
-                    if (empty($conf->$modulenameforenabled->enabled)) $enabled=false;
+                    $enabled = true;
+                    if (empty($conf->$modulenameforenabled->enabled)) $enabled = false;
 
                     if ($enabled)
                     {
@@ -155,14 +155,14 @@ 
                         // @todo : use getElementProperties() function ?
                         $dir_part = dol_buildpath('/'.$moduledirforclass.'/class/');
 
-                        $handle_part=@opendir(dol_osencode($dir_part));
+                        $handle_part = @opendir(dol_osencode($dir_part));
                         if (is_resource($handle_part))
                         {
-                            while (($file_searched = readdir($handle_part))!==false)
+                            while (($file_searched = readdir($handle_part)) !== false)
                             {
                                 if ($file_searched == 'api_access.class.php') continue;
 
-                                if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i",$file_searched,$regapi))
+                                if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $regapi))
                                 {
                                     $classname = ucwords($regapi[1]);
                                     $classname = str_replace('_', '', $classname);
@@ -201,7 +201,7 @@ 
 }
 
 // Call one APIs or one definition of an API
-if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' && $reg[2] != '/resources.json' && preg_match('/^\/(swagger|resources)\.json\/(.+)$/', $reg[2], $regbis) && $regbis[2] != 'root')))
+if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' && $reg[2] != '/resources.json' && preg_match('/^\/(swagger|resources)\.json\/(.+)$/', $reg[2], $regbis) && $regbis[2] != 'root')))
 {
     $module = $reg[1];
     if ($module == 'explorer')  // If we call page to explore details of a service
@@ -209,7 +209,7 @@ 
         $module = $regbis[2];
     }
 
-    $module=strtolower($module);
+    $module = strtolower($module);
     $moduledirforclass = getModuleDirForApiClass($module);
 
     // Load a dedicated API file
@@ -230,16 +230,16 @@ 
 	if ($module == 'interventions')
 		$classfile = 'interventions';
 
-	$dir_part_file = dol_buildpath('/' . $moduledirforclass . '/class/api_' . $classfile . '.class.php', 0, 2);
+	$dir_part_file = dol_buildpath('/'.$moduledirforclass.'/class/api_'.$classfile.'.class.php', 0, 2);
 
 	$classname = ucwords($module);
 
-	dol_syslog('Search /' . $moduledirforclass . '/class/api_' . $classfile . '.class.php => dir_part_file=' . $dir_part_file . ' classname=' . $classname);
+	dol_syslog('Search /'.$moduledirforclass.'/class/api_'.$classfile.'.class.php => dir_part_file='.$dir_part_file.' classname='.$classname);
 
 	$res = false;
 	if ($dir_part_file)
 		$res = include_once $dir_part_file;
-	if (! $res) {
+	if (!$res) {
 		print 'API not found (failed to include API file)';
 		header('HTTP/1.1 501 API not found (failed to include API file)');
 		exit(0);

Braces +69 added lines, -33 removed lines

@@ -24,21 +24,45 @@ 
  *  \file       htdocs/api/index.php
  */
 
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');		// If there is no need to load and show top and left menu
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');		// If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');       // Do not load ajax.lib.php library
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+// Do not check anti CSRF attack test
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Do not check anti POST attack test
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no need to load and show top and left menu
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+// Do not load ajax.lib.php library
+if (! defined("NOLOGIN")) {
+    define("NOLOGIN",'1');
+}
+// If this page is public (can be called outside logged session)
 
 
 // Force entity if a value is provided into HTTP header. Otherwise, will use the entity of user of token used.
-if (! empty($_SERVER['HTTP_DOLAPIENTITY'])) define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
+if (! empty($_SERVER['HTTP_DOLAPIENTITY'])) {
+    define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
+}
 
 
 $res=0;
-if (! $res && file_exists("../main.inc.php")) $res=include '../main.inc.php';
-if (! $res) die("Include of main fails");
+if (! $res && file_exists("../main.inc.php")) {
+    $res=include '../main.inc.php';
+}
+if (! $res) {
+    die("Include of main fails");
+}
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
 
@@ -146,7 +170,9 @@ 
 
                     // Defined if module is enabled
                     $enabled=true;
-                    if (empty($conf->$modulenameforenabled->enabled)) $enabled=false;
+                    if (empty($conf->$modulenameforenabled->enabled)) {
+                        $enabled=false;
+                    }
 
                     if ($enabled)
                     {
@@ -160,7 +186,9 @@ 
                         {
                             while (($file_searched = readdir($handle_part))!==false)
                             {
-                                if ($file_searched == 'api_access.class.php') continue;
+                                if ($file_searched == 'api_access.class.php') {
+                                    continue;
+                                }
 
                                 if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i",$file_searched,$regapi))
                                 {
@@ -171,13 +199,11 @@ 
                                     {
                                         //dol_syslog("Found API by index.php: classname=".$classname."Api for module ".$dir." into ".$dir_part.$file_searched);
                                         $listofapis[strtolower($classname.'Api')] = $classname.'Api';
-                                    }
-                                    elseif (class_exists($classname))
+                                    } elseif (class_exists($classname))
                                     {
                                         //dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
                                         $listofapis[strtolower($classname)] = $classname;
-                                    }
-                                    else
+                                    } else
                                     {
                                         dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
                                     }
@@ -204,10 +230,12 @@ 
 if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' && $reg[2] != '/resources.json' && preg_match('/^\/(swagger|resources)\.json\/(.+)$/', $reg[2], $regbis) && $regbis[2] != 'root')))
 {
     $module = $reg[1];
-    if ($module == 'explorer')  // If we call page to explore details of a service
+    if ($module == 'explorer') {
+        // If we call page to explore details of a service
     {
         $module = $regbis[2];
     }
+    }
 
     $module=strtolower($module);
     $moduledirforclass = getModuleDirForApiClass($module);
@@ -216,19 +244,25 @@ 
     dol_syslog("Load a dedicated API file module=".$module." moduledirforclass=".$moduledirforclass);
 
 	$tmpmodule = $module;
-	if ($tmpmodule != 'api')
-		$tmpmodule = preg_replace('/api$/i', '', $tmpmodule);
+	if ($tmpmodule != 'api') {
+			$tmpmodule = preg_replace('/api$/i', '', $tmpmodule);
+	}
 	$classfile = str_replace('_', '', $tmpmodule);
-	if ($module == 'supplierproposals')
-		$classfile = 'supplier_proposals';
-	if ($module == 'supplierorders')
-		$classfile = 'supplier_orders';
-	if ($module == 'supplierinvoices')
-		$classfile = 'supplier_invoices';
-	if ($module == 'ficheinter')
-		$classfile = 'interventions';
-	if ($module == 'interventions')
-		$classfile = 'interventions';
+	if ($module == 'supplierproposals') {
+			$classfile = 'supplier_proposals';
+	}
+	if ($module == 'supplierorders') {
+			$classfile = 'supplier_orders';
+	}
+	if ($module == 'supplierinvoices') {
+			$classfile = 'supplier_invoices';
+	}
+	if ($module == 'ficheinter') {
+			$classfile = 'interventions';
+	}
+	if ($module == 'interventions') {
+			$classfile = 'interventions';
+	}
 
 	$dir_part_file = dol_buildpath('/' . $moduledirforclass . '/class/api_' . $classfile . '.class.php', 0, 2);
 
@@ -237,17 +271,19 @@ 
 	dol_syslog('Search /' . $moduledirforclass . '/class/api_' . $classfile . '.class.php => dir_part_file=' . $dir_part_file . ' classname=' . $classname);
 
 	$res = false;
-	if ($dir_part_file)
-		$res = include_once $dir_part_file;
+	if ($dir_part_file) {
+			$res = include_once $dir_part_file;
+	}
 	if (! $res) {
 		print 'API not found (failed to include API file)';
 		header('HTTP/1.1 501 API not found (failed to include API file)');
 		exit(0);
 	}
 
-	if (class_exists($classname))
-		$api->r->addAPIClass($classname);
-}
+	if (class_exists($classname)) {
+			$api->r->addAPIClass($classname);
+	}
+	}
 
 // TODO If not found, redirect to explorer
 //var_dump($api->r->apiVersionMap);