Dolibarr / dolibarr

htdocs/core/class/html.formcron.class.php

Spacing +22 added lines, -22 removed lines

@@ -51,42 +51,42 @@
 	 * @param   integer	$readonly		Select is read only or not
 	 * @return	string					HTML select field
 	 */
-	function select_typejob($htmlname,$selected=0,$readonly=0)
+	function select_typejob($htmlname, $selected = 0, $readonly = 0)
 	{
 		global $langs;
 
 		$langs->load('cron@cron');
 		if (!empty($readonly)) {
-			if ($selected=='command') {
-				$out= $langs->trans('CronType_command');
-				$out.='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-				$out.= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
-				$out.='</SELECT>';
-			} elseif ($selected=='method') {
-				$out= $langs->trans('CronType_method');
-				$out.='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-				$out.= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
-				$out.='</SELECT>';
+			if ($selected == 'command') {
+				$out = $langs->trans('CronType_command');
+				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+				$out .= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
+				$out .= '</SELECT>';
+			} elseif ($selected == 'method') {
+				$out = $langs->trans('CronType_method');
+				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+				$out .= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
+				$out .= '</SELECT>';
 			}
-		}else {
+		} else {
 
-		$out='<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
+		$out = '<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
 
-		if ($selected=='command') {
-			$selected_attr=' selected ';
+		if ($selected == 'command') {
+			$selected_attr = ' selected ';
 		} else {
-			$selected_attr='';
+			$selected_attr = '';
 		}
-		$out.= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
+		$out .= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
 
-		if ($selected=='method') {
-			$selected_attr=' selected ';
+		if ($selected == 'method') {
+			$selected_attr = ' selected ';
 		} else {
-			$selected_attr='';
+			$selected_attr = '';
 		}
-		$out.= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
+		$out .= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
 
-		$out.='</SELECT>';
+		$out .= '</SELECT>';
 		}
 
 		return $out;

Braces +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 				$out.= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
 				$out.='</SELECT>';
 			}
-		}else {
+		} else {
 
 		$out='<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
 

htdocs/core/class/html.formpropal.class.php

Indentation +85 added lines, -85 removed lines

@@ -41,102 +41,102 @@
 		$this->db = $db;
 	}
 
-    /**
-     *    Return combo list of differents status of a proposal
-     *    Values are id of table c_propalst
-     *
-     *    @param	string	$selected   	Preselected value
-     *    @param	int		$short			Use short labels
-     *    @param	int		$excludedraft	0=All status, 1=Exclude draft status
-     *    @param	int 	$showempty		1=Add empty line
-     *    @param    string  $mode           'customer', 'supplier'
-     *    @param    string  $htmlname       Name of select field
-     *    @return	void
-     */
-    function selectProposalStatus($selected='',$short=0, $excludedraft=0, $showempty=1, $mode='customer',$htmlname='propal_statut')
-    {
-        global $langs;
+	/**
+	 *    Return combo list of differents status of a proposal
+	 *    Values are id of table c_propalst
+	 *
+	 *    @param	string	$selected   	Preselected value
+	 *    @param	int		$short			Use short labels
+	 *    @param	int		$excludedraft	0=All status, 1=Exclude draft status
+	 *    @param	int 	$showempty		1=Add empty line
+	 *    @param    string  $mode           'customer', 'supplier'
+	 *    @param    string  $htmlname       Name of select field
+	 *    @return	void
+	 */
+	function selectProposalStatus($selected='',$short=0, $excludedraft=0, $showempty=1, $mode='customer',$htmlname='propal_statut')
+	{
+		global $langs;
 
-        $prefix='';
-        $listofstatus=array();
-        if ($mode == 'supplier') 
-        {
-            $prefix='SupplierProposalStatus';
+		$prefix='';
+		$listofstatus=array();
+		if ($mode == 'supplier') 
+		{
+			$prefix='SupplierProposalStatus';
             
-            $langs->load("supplier_proposal");
-            $listofstatus=array(
-                0=>array('id'=>0, 'code'=>'PR_DRAFT'),
-                1=>array('id'=>1, 'code'=>'PR_OPEN'),
-                2=>array('id'=>2, 'code'=>'PR_SIGNED'),
-                3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
-                4=>array('id'=>4, 'code'=>'PR_CLOSED')
-            );
-        }
-        else
-        {
-            $prefix="PropalStatus";
+			$langs->load("supplier_proposal");
+			$listofstatus=array(
+				0=>array('id'=>0, 'code'=>'PR_DRAFT'),
+				1=>array('id'=>1, 'code'=>'PR_OPEN'),
+				2=>array('id'=>2, 'code'=>'PR_SIGNED'),
+				3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
+				4=>array('id'=>4, 'code'=>'PR_CLOSED')
+			);
+		}
+		else
+		{
+			$prefix="PropalStatus";
             
-            $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
-            $sql .= " WHERE active = 1";
-            dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if ($resql)
-            {
-                $num = $this->db->num_rows($resql);
-                $i = 0;
-                if ($num)
-                {
-                    while ($i < $num)
-                    {
-                        $obj = $this->db->fetch_object($resql);
-                        $listofstatus[$obj->id]=array('id'=>$obj->id,'code'=>$obj->code,'label'=>$obj->label);
-                        $i++;
-                    }
-                }
-            }
-            else
-            {
-                dol_print_error($this->db);
-            }
-        }
+			$sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
+			$sql .= " WHERE active = 1";
+			dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				if ($num)
+				{
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($resql);
+						$listofstatus[$obj->id]=array('id'=>$obj->id,'code'=>$obj->code,'label'=>$obj->label);
+						$i++;
+					}
+				}
+			}
+			else
+			{
+				dol_print_error($this->db);
+			}
+		}
 
-        print '<select class="flat" name="'.$htmlname.'">';
-        if ($showempty) print '<option value="-1">&nbsp;</option>';
+		print '<select class="flat" name="'.$htmlname.'">';
+		if ($showempty) print '<option value="-1">&nbsp;</option>';
 
-        foreach($listofstatus as $key => $obj)
-        {
-            if ($excludedraft)
-            {
+		foreach($listofstatus as $key => $obj)
+		{
+			if ($excludedraft)
+			{
 				if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')
 				{
 					$i++;
 					continue;
 				}
-            }
-            if ($selected != '' && $selected == $obj['id'])
-            {
-                print '<option value="'.$obj['id'].'" selected>';
-            }
-            else
-            {
-                print '<option value="'.$obj['id'].'">';
-            }
-            $key=$obj['code'];
-            if ($langs->trans($prefix.$key.($short?'Short':'')) != $prefix.$key.($short?'Short':''))
-            {
-                print $langs->trans($prefix.$key.($short?'Short':''));
-            }
-            else
+			}
+			if ($selected != '' && $selected == $obj['id'])
+			{
+				print '<option value="'.$obj['id'].'" selected>';
+			}
+			else
 			{
-                $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
-                if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
+				print '<option value="'.$obj['id'].'">';
+			}
+			$key=$obj['code'];
+			if ($langs->trans($prefix.$key.($short?'Short':'')) != $prefix.$key.($short?'Short':''))
+			{
+				print $langs->trans($prefix.$key.($short?'Short':''));
+			}
+			else
+			{
+				$conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
+				if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
 
-                print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):($obj['label']?$obj['label']:$obj['code']);
-            }
-            print '</option>';
-            $i++;
-        }
-        print '</select>';
-    }
+				print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):($obj['label']?$obj['label']:$obj['code']);
+			}
+			print '</option>';
+			$i++;
+		}
+		print '</select>';
+	}
 }
 

Spacing +15 added lines, -15 removed lines

@@ -53,18 +53,18 @@ 
      *    @param    string  $htmlname       Name of select field
      *    @return	void
      */
-    function selectProposalStatus($selected='',$short=0, $excludedraft=0, $showempty=1, $mode='customer',$htmlname='propal_statut')
+    function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut')
     {
         global $langs;
 
-        $prefix='';
-        $listofstatus=array();
+        $prefix = '';
+        $listofstatus = array();
         if ($mode == 'supplier') 
         {
-            $prefix='SupplierProposalStatus';
+            $prefix = 'SupplierProposalStatus';
             
             $langs->load("supplier_proposal");
-            $listofstatus=array(
+            $listofstatus = array(
                 0=>array('id'=>0, 'code'=>'PR_DRAFT'),
                 1=>array('id'=>1, 'code'=>'PR_OPEN'),
                 2=>array('id'=>2, 'code'=>'PR_SIGNED'),
@@ -74,12 +74,12 @@ 
         }
         else
         {
-            $prefix="PropalStatus";
+            $prefix = "PropalStatus";
             
             $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
             $sql .= " WHERE active = 1";
             dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
                 $num = $this->db->num_rows($resql);
@@ -89,7 +89,7 @@ 
                     while ($i < $num)
                     {
                         $obj = $this->db->fetch_object($resql);
-                        $listofstatus[$obj->id]=array('id'=>$obj->id,'code'=>$obj->code,'label'=>$obj->label);
+                        $listofstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$obj->label);
                         $i++;
                     }
                 }
@@ -103,7 +103,7 @@ 
         print '<select class="flat" name="'.$htmlname.'">';
         if ($showempty) print '<option value="-1">&nbsp;</option>';
 
-        foreach($listofstatus as $key => $obj)
+        foreach ($listofstatus as $key => $obj)
         {
             if ($excludedraft)
             {
@@ -121,17 +121,17 @@ 
             {
                 print '<option value="'.$obj['id'].'">';
             }
-            $key=$obj['code'];
-            if ($langs->trans($prefix.$key.($short?'Short':'')) != $prefix.$key.($short?'Short':''))
+            $key = $obj['code'];
+            if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))
             {
-                print $langs->trans($prefix.$key.($short?'Short':''));
+                print $langs->trans($prefix.$key.($short ? 'Short' : ''));
             }
             else
 			{
-                $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
-                if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
+                $conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
+                if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
 
-                print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):($obj['label']?$obj['label']:$obj['code']);
+                print ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) ? $langs->trans($prefix.$key.($short ? 'Short' : '')) : ($obj['label'] ? $obj['label'] : $obj['code']);
             }
             print '</option>';
             $i++;

Braces +10 added lines, -10 removed lines

@@ -71,8 +71,7 @@ 
                 3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
                 4=>array('id'=>4, 'code'=>'PR_CLOSED')
             );
-        }
-        else
+        } else
         {
             $prefix="PropalStatus";
             
@@ -93,15 +92,16 @@ 
                         $i++;
                     }
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($this->db);
             }
         }
 
         print '<select class="flat" name="'.$htmlname.'">';
-        if ($showempty) print '<option value="-1">&nbsp;</option>';
+        if ($showempty) {
+        	print '<option value="-1">&nbsp;</option>';
+        }
 
         foreach($listofstatus as $key => $obj)
         {
@@ -116,8 +116,7 @@ 
             if ($selected != '' && $selected == $obj['id'])
             {
                 print '<option value="'.$obj['id'].'" selected>';
-            }
-            else
+            } else
             {
                 print '<option value="'.$obj['id'].'">';
             }
@@ -125,11 +124,12 @@ 
             if ($langs->trans($prefix.$key.($short?'Short':'')) != $prefix.$key.($short?'Short':''))
             {
                 print $langs->trans($prefix.$key.($short?'Short':''));
-            }
-            else
+            } else
 			{
                 $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
-                if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
+                if (! empty($conv_to_new_code[$obj['code']])) {
+                	$key=$conv_to_new_code[$obj['code']];
+                }
 
                 print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):($obj['label']?$obj['label']:$obj['code']);
             }

htdocs/core/class/openid.class.php

Indentation +451 added lines, -451 removed lines

@@ -26,112 +26,112 @@ 
  */
 class SimpleOpenID
 {
-    var $openid_url_identity;
-    var $URLs = array();
-    var $error = array();
-    var $fields = array(
+	var $openid_url_identity;
+	var $URLs = array();
+	var $error = array();
+	var $fields = array(
 		'required'	 => array(),
 		'optional'	 => array(),
-    );
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        if (!function_exists('curl_exec'))
-        {
-            die('Error: Class SimpleOpenID requires curl extension to work');
-        }
-    }
-
-    /**
-     * SetOpenIDServer
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    function SetOpenIDServer($a)
-    {
-        $this->URLs['openid_server'] = $a;
-    }
-
-    /**
-     * SetOpenIDServer
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    function SetTrustRoot($a)
-    {
-        $this->URLs['trust_root'] = $a;
-    }
-
-    /**
-     * SetOpenIDServer
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    function SetCancelURL($a)
-    {
-        $this->URLs['cancel'] = $a;
-    }
-
-    /**
-     * SetApprovedURL
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    function SetApprovedURL($a)
-    {
-        $this->URLs['approved'] = $a;
-    }
-
-    /**
-     * SetRequiredFields
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    function SetRequiredFields($a)
-    {
-        if (is_array($a)){
-            $this->fields['required'] = $a;
-        }else{
-            $this->fields['required'][] = $a;
-        }
-    }
-
-    /**
-     * SetOptionalFields
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    function SetOptionalFields($a)
-    {
-        if (is_array($a)){
-            $this->fields['optional'] = $a;
-        }else{
-            $this->fields['optional'][] = $a;
-        }
-    }
-
-    /**
-     * SetIdentity
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    function SetIdentity($a)
-    { 	// Set Identity URL
-        if ((stripos($a, 'http://') === false)
-        && (stripos($a, 'https://') === false)){
-            $a = 'http://'.$a;
-        }
-        /*
+	);
+
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
+		if (!function_exists('curl_exec'))
+		{
+			die('Error: Class SimpleOpenID requires curl extension to work');
+		}
+	}
+
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	function SetOpenIDServer($a)
+	{
+		$this->URLs['openid_server'] = $a;
+	}
+
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	function SetTrustRoot($a)
+	{
+		$this->URLs['trust_root'] = $a;
+	}
+
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	function SetCancelURL($a)
+	{
+		$this->URLs['cancel'] = $a;
+	}
+
+	/**
+	 * SetApprovedURL
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	function SetApprovedURL($a)
+	{
+		$this->URLs['approved'] = $a;
+	}
+
+	/**
+	 * SetRequiredFields
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	function SetRequiredFields($a)
+	{
+		if (is_array($a)){
+			$this->fields['required'] = $a;
+		}else{
+			$this->fields['required'][] = $a;
+		}
+	}
+
+	/**
+	 * SetOptionalFields
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	function SetOptionalFields($a)
+	{
+		if (is_array($a)){
+			$this->fields['optional'] = $a;
+		}else{
+			$this->fields['optional'][] = $a;
+		}
+	}
+
+	/**
+	 * SetIdentity
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	function SetIdentity($a)
+	{ 	// Set Identity URL
+		if ((stripos($a, 'http://') === false)
+		&& (stripos($a, 'https://') === false)){
+			$a = 'http://'.$a;
+		}
+		/*
          $u = parse_url(trim($a));
          if (!isset($u['path'])){
          $u['path'] = '/';
@@ -144,341 +144,341 @@ 
          $identity = $u['scheme'] . '://' . $u['host'] . $u['path'];
          }
          //*/
-        $this->openid_url_identity = $a;
-    }
-
-    /**
-     * GetIdentity
-     *
-     * @return	string
-     */
-    function GetIdentity()
-    { 	// Get Identity
-        return $this->openid_url_identity;
-    }
-
-    /**
-     * SetOpenIDServer
-     *
-     * @return	void
-     */
-    function GetError()
-    {
-        $e = $this->error;
-        return array('code'=>$e[0],'description'=>$e[1]);
-    }
-
-    /**
-     * ErrorStore
-     *
-     * @param	string	$code		Code
-     * @param	string	$desc		Description
-     * @return	void
-     */
-    function ErrorStore($code, $desc = null)
-    {
-        $errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
-        if ($desc == null){
-            $desc = $errs[$code];
-        }
-        $this->error = array($code,$desc);
-    }
-
-    /**
-     * IsError
-     *
-     * @return	boolean
-     */
-    function IsError()
-    {
-        if (count($this->error) > 0)
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    /**
-     * splitResponse
-     *
-     * @param	string	$response		Server
-     * @return	void
-     */
-    function splitResponse($response)
-    {
-        $r = array();
-        $response = explode("\n", $response);
-        foreach($response as $line) {
-            $line = trim($line);
-            if ($line != "") {
-                list($key, $value) = explode(":", $line, 2);
-                $r[trim($key)] = trim($value);
-            }
-        }
-        return $r;
-    }
-
-    /**
-     * OpenID_Standarize
-     *
-     * @param	string	$openid_identity		Server
-     * @return	string
-     */
-    function OpenID_Standarize($openid_identity = null)
-    {
-        if ($openid_identity === null)
-        $openid_identity = $this->openid_url_identity;
-
-        $u = parse_url(strtolower(trim($openid_identity)));
-
-        if (!isset($u['path']) || ($u['path'] == '/')) {
-            $u['path'] = '';
-        }
-        if(substr($u['path'],-1,1) == '/'){
-            $u['path'] = substr($u['path'], 0, strlen($u['path'])-1);
-        }
-        if (isset($u['query'])){ // If there is a query string, then use identity as is
-            return $u['host'] . $u['path'] . '?' . $u['query'];
-        }else{
-            return $u['host'] . $u['path'];
-        }
-    }
-
-    /**
-     * array2url
-     *
-     * @param 	array	$arr		An array
-     * @return false|string		false if KO, string of url if OK
-     */
-    function array2url($arr)
-    { // converts associated array to URL Query String
-        if (!is_array($arr)){
-            return false;
-        }
-        $query = '';
-        foreach($arr as $key => $value){
-            $query .= $key . "=" . $value . "&";
-        }
-        return $query;
-    }
-
-    /**
-     * FSOCK_Request
-     *
-     * @param string 	$url		URL
-     * @param string	$method		Method
-     * @param string	$params		Params
-     * @return boolean|unknown
-     */
-    function FSOCK_Request($url, $method="GET", $params = "")
-    {
-        $fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds
-        if (!$fp) {
-            $this->ErrorStore('OPENID_SOCKETERROR', $errstr);
-            return false;
-        } else {
-            $request = $method . " /server HTTP/1.0\r\n";
-            $request .= "User-Agent: Dolibarr\r\n";
-            $request .= "Connection: close\r\n\r\n";
-            fwrite($fp, $request);
-            stream_set_timeout($fp, 4); // Connection response timeout is 4 seconds
-            $res = fread($fp, 2000);
-            $info = stream_get_meta_data($fp);
-            fclose($fp);
-
-            if ($info['timed_out']) {
-                $this->ErrorStore('OPENID_SOCKETTIMEOUT');
-            } else {
-                return $res;
-            }
-        }
-    }
-
-    /**
-     * CURL_Request
-     *
-     * @param 	string	$url		URL
-     * @param 	string	$method		Method
-     * @param 	string	$params		Params
-     * @return string
-     */
-    function CURL_Request($url, $method="GET", $params = "")
-    { // Remember, SSL MUST BE SUPPORTED
-        if (is_array($params)) $params = $this->array2url($params);
-
-        $curl = curl_init($url . ($method == "GET" && $params != "" ? "?" . $params : ""));
-        @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($curl, CURLOPT_HEADER, false);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
-        curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
-        if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        $response = curl_exec($curl);
-
-        if (curl_errno($curl) == 0){
-            $response;
-        }else{
-            $this->ErrorStore('OPENID_CURL', curl_error($curl));
-        }
-        return $response;
-    }
-
-    /**
-     * HTML2OpenIDServer
-     *
-     * @param string	$content	Content
-     * @return array				Array of servers
-     */
-    function HTML2OpenIDServer($content)
-    {
-        $get = array();
-
-        // Get details of their OpenID server and (optional) delegate
-        preg_match_all('/<link[^>]*rel=[\'"]openid.server[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
-        preg_match_all('/<link[^>]*href=\'"([^\'"]+)[\'"][^>]*rel=[\'"]openid.server[\'"][^>]*\/?>/i', $content, $matches2);
-        $servers = array_merge($matches1[1], $matches2[1]);
-
-        preg_match_all('/<link[^>]*rel=[\'"]openid.delegate[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
-
-        preg_match_all('/<link[^>]*href=[\'"]([^\'"]+)[\'"][^>]*rel=[\'"]openid.delegate[\'"][^>]*\/?>/i', $content, $matches2);
-
-        $delegates = array_merge($matches1[1], $matches2[1]);
-
-        $ret = array($servers, $delegates);
-        return $ret;
-    }
-
-
-    /**
-     * Get openid server
-     *
-     * @param	string	$url	Url to found endpoint
-     * @return 	string			Endpoint
-     */
-    function GetOpenIDServer($url='')
-    {
-    	global $conf;
+		$this->openid_url_identity = $a;
+	}
+
+	/**
+	 * GetIdentity
+	 *
+	 * @return	string
+	 */
+	function GetIdentity()
+	{ 	// Get Identity
+		return $this->openid_url_identity;
+	}
+
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @return	void
+	 */
+	function GetError()
+	{
+		$e = $this->error;
+		return array('code'=>$e[0],'description'=>$e[1]);
+	}
+
+	/**
+	 * ErrorStore
+	 *
+	 * @param	string	$code		Code
+	 * @param	string	$desc		Description
+	 * @return	void
+	 */
+	function ErrorStore($code, $desc = null)
+	{
+		$errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
+		if ($desc == null){
+			$desc = $errs[$code];
+		}
+		$this->error = array($code,$desc);
+	}
+
+	/**
+	 * IsError
+	 *
+	 * @return	boolean
+	 */
+	function IsError()
+	{
+		if (count($this->error) > 0)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * splitResponse
+	 *
+	 * @param	string	$response		Server
+	 * @return	void
+	 */
+	function splitResponse($response)
+	{
+		$r = array();
+		$response = explode("\n", $response);
+		foreach($response as $line) {
+			$line = trim($line);
+			if ($line != "") {
+				list($key, $value) = explode(":", $line, 2);
+				$r[trim($key)] = trim($value);
+			}
+		}
+		return $r;
+	}
+
+	/**
+	 * OpenID_Standarize
+	 *
+	 * @param	string	$openid_identity		Server
+	 * @return	string
+	 */
+	function OpenID_Standarize($openid_identity = null)
+	{
+		if ($openid_identity === null)
+		$openid_identity = $this->openid_url_identity;
+
+		$u = parse_url(strtolower(trim($openid_identity)));
+
+		if (!isset($u['path']) || ($u['path'] == '/')) {
+			$u['path'] = '';
+		}
+		if(substr($u['path'],-1,1) == '/'){
+			$u['path'] = substr($u['path'], 0, strlen($u['path'])-1);
+		}
+		if (isset($u['query'])){ // If there is a query string, then use identity as is
+			return $u['host'] . $u['path'] . '?' . $u['query'];
+		}else{
+			return $u['host'] . $u['path'];
+		}
+	}
+
+	/**
+	 * array2url
+	 *
+	 * @param 	array	$arr		An array
+	 * @return false|string		false if KO, string of url if OK
+	 */
+	function array2url($arr)
+	{ // converts associated array to URL Query String
+		if (!is_array($arr)){
+			return false;
+		}
+		$query = '';
+		foreach($arr as $key => $value){
+			$query .= $key . "=" . $value . "&";
+		}
+		return $query;
+	}
+
+	/**
+	 * FSOCK_Request
+	 *
+	 * @param string 	$url		URL
+	 * @param string	$method		Method
+	 * @param string	$params		Params
+	 * @return boolean|unknown
+	 */
+	function FSOCK_Request($url, $method="GET", $params = "")
+	{
+		$fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds
+		if (!$fp) {
+			$this->ErrorStore('OPENID_SOCKETERROR', $errstr);
+			return false;
+		} else {
+			$request = $method . " /server HTTP/1.0\r\n";
+			$request .= "User-Agent: Dolibarr\r\n";
+			$request .= "Connection: close\r\n\r\n";
+			fwrite($fp, $request);
+			stream_set_timeout($fp, 4); // Connection response timeout is 4 seconds
+			$res = fread($fp, 2000);
+			$info = stream_get_meta_data($fp);
+			fclose($fp);
+
+			if ($info['timed_out']) {
+				$this->ErrorStore('OPENID_SOCKETTIMEOUT');
+			} else {
+				return $res;
+			}
+		}
+	}
+
+	/**
+	 * CURL_Request
+	 *
+	 * @param 	string	$url		URL
+	 * @param 	string	$method		Method
+	 * @param 	string	$params		Params
+	 * @return string
+	 */
+	function CURL_Request($url, $method="GET", $params = "")
+	{ // Remember, SSL MUST BE SUPPORTED
+		if (is_array($params)) $params = $this->array2url($params);
+
+		$curl = curl_init($url . ($method == "GET" && $params != "" ? "?" . $params : ""));
+		@curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($curl, CURLOPT_HEADER, false);
+		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
+		curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
+		if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		$response = curl_exec($curl);
+
+		if (curl_errno($curl) == 0){
+			$response;
+		}else{
+			$this->ErrorStore('OPENID_CURL', curl_error($curl));
+		}
+		return $response;
+	}
+
+	/**
+	 * HTML2OpenIDServer
+	 *
+	 * @param string	$content	Content
+	 * @return array				Array of servers
+	 */
+	function HTML2OpenIDServer($content)
+	{
+		$get = array();
+
+		// Get details of their OpenID server and (optional) delegate
+		preg_match_all('/<link[^>]*rel=[\'"]openid.server[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
+		preg_match_all('/<link[^>]*href=\'"([^\'"]+)[\'"][^>]*rel=[\'"]openid.server[\'"][^>]*\/?>/i', $content, $matches2);
+		$servers = array_merge($matches1[1], $matches2[1]);
+
+		preg_match_all('/<link[^>]*rel=[\'"]openid.delegate[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
+
+		preg_match_all('/<link[^>]*href=[\'"]([^\'"]+)[\'"][^>]*rel=[\'"]openid.delegate[\'"][^>]*\/?>/i', $content, $matches2);
+
+		$delegates = array_merge($matches1[1], $matches2[1]);
+
+		$ret = array($servers, $delegates);
+		return $ret;
+	}
+
+
+	/**
+	 * Get openid server
+	 *
+	 * @param	string	$url	Url to found endpoint
+	 * @return 	string			Endpoint
+	 */
+	function GetOpenIDServer($url='')
+	{
+		global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
-        $response = getURLContent($url);
-
-        list($servers, $delegates) = $this->HTML2OpenIDServer($response);
-        if (count($servers) == 0){
-            $this->ErrorStore('OPENID_NOSERVERSFOUND');
-            return false;
-        }
-        if (isset($delegates[0])
-        && ($delegates[0] != "")){
-            $this->SetIdentity($delegates[0]);
-        }
-        $this->SetOpenIDServer($servers[0]);
-        return $servers[0];
-    }
-
-    /**
-     * GetRedirectURL
-     *
-     * @return	string
-     */
-    function GetRedirectURL()
-    {
-        $params = array();
-        $params['openid.return_to'] = urlencode($this->URLs['approved']);
-        $params['openid.mode'] = 'checkid_setup';
-        $params['openid.identity'] = urlencode($this->openid_url_identity);
-        $params['openid.trust_root'] = urlencode($this->URLs['trust_root']);
-
-        if (isset($this->fields['required'])
-        && (count($this->fields['required']) > 0)) {
-            $params['openid.sreg.required'] = implode(',',$this->fields['required']);
-        }
-        if (isset($this->fields['optional'])
-        && (count($this->fields['optional']) > 0)) {
-            $params['openid.sreg.optional'] = implode(',',$this->fields['optional']);
-        }
-        return $this->URLs['openid_server'] . "?". $this->array2url($params);
-    }
-
-    /**
-     * Redirect
-     *
-     * @return	void
-     */
-    function Redirect()
-    {
-        $redirect_to = $this->GetRedirectURL();
-        if (headers_sent())
-        { // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)
-            echo '<script language="JavaScript" type="text/javascript">window.location=\'';
-            echo $redirect_to;
-            echo '\';</script>';
-        }
-        else
-        {	// Default Header Redirect
-            header('Location: ' . $redirect_to);
-        }
-    }
-
-    /**
-     * ValidateWithServer
-     *
-     * @return	boolean
-     */
-    function ValidateWithServer()
-    {
-        $params = array(
+		$response = getURLContent($url);
+
+		list($servers, $delegates) = $this->HTML2OpenIDServer($response);
+		if (count($servers) == 0){
+			$this->ErrorStore('OPENID_NOSERVERSFOUND');
+			return false;
+		}
+		if (isset($delegates[0])
+		&& ($delegates[0] != "")){
+			$this->SetIdentity($delegates[0]);
+		}
+		$this->SetOpenIDServer($servers[0]);
+		return $servers[0];
+	}
+
+	/**
+	 * GetRedirectURL
+	 *
+	 * @return	string
+	 */
+	function GetRedirectURL()
+	{
+		$params = array();
+		$params['openid.return_to'] = urlencode($this->URLs['approved']);
+		$params['openid.mode'] = 'checkid_setup';
+		$params['openid.identity'] = urlencode($this->openid_url_identity);
+		$params['openid.trust_root'] = urlencode($this->URLs['trust_root']);
+
+		if (isset($this->fields['required'])
+		&& (count($this->fields['required']) > 0)) {
+			$params['openid.sreg.required'] = implode(',',$this->fields['required']);
+		}
+		if (isset($this->fields['optional'])
+		&& (count($this->fields['optional']) > 0)) {
+			$params['openid.sreg.optional'] = implode(',',$this->fields['optional']);
+		}
+		return $this->URLs['openid_server'] . "?". $this->array2url($params);
+	}
+
+	/**
+	 * Redirect
+	 *
+	 * @return	void
+	 */
+	function Redirect()
+	{
+		$redirect_to = $this->GetRedirectURL();
+		if (headers_sent())
+		{ // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)
+			echo '<script language="JavaScript" type="text/javascript">window.location=\'';
+			echo $redirect_to;
+			echo '\';</script>';
+		}
+		else
+		{	// Default Header Redirect
+			header('Location: ' . $redirect_to);
+		}
+	}
+
+	/**
+	 * ValidateWithServer
+	 *
+	 * @return	boolean
+	 */
+	function ValidateWithServer()
+	{
+		$params = array(
 			'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),
 			'openid.signed' => urlencode($_GET['openid_signed']),
 			'openid.sig' => urlencode($_GET['openid_sig'])
-        );
-        // Send only required parameters to confirm validity
-        $arr_signed = explode(",",str_replace('sreg.','sreg_',$_GET['openid_signed']));
-        $num = count($arr_signed);
-        for ($i = 0; $i < $num; $i++)
-        {
-            $s = str_replace('sreg_','sreg.', $arr_signed[$i]);
-            $c = $_GET['openid_' . $arr_signed[$i]];
-            // if ($c != ""){
-            $params['openid.' . $s] = urlencode($c);
-            // }
-        }
-        $params['openid.mode'] = "check_authentication";
-
-        $openid_server = $this->GetOpenIDServer();
-        if ($openid_server == false)
-        {
-            return false;
-        }
-        $response = $this->CURL_Request($openid_server,'POST',$params);
-        $data = $this->splitResponse($response);
-        if ($data['is_valid'] == "true")
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-
-
-
-    /**
-     * Get XRDS response and set possible servers.
-     *
-     * @param	string	$url	Url of endpoint to request
-     * @return 	string			First endpoint OpenID server found. False if it failed to found.
-     */
-    function sendDiscoveryRequestToGetXRDS($url='')
-    {
-    	global $conf;
+		);
+		// Send only required parameters to confirm validity
+		$arr_signed = explode(",",str_replace('sreg.','sreg_',$_GET['openid_signed']));
+		$num = count($arr_signed);
+		for ($i = 0; $i < $num; $i++)
+		{
+			$s = str_replace('sreg_','sreg.', $arr_signed[$i]);
+			$c = $_GET['openid_' . $arr_signed[$i]];
+			// if ($c != ""){
+			$params['openid.' . $s] = urlencode($c);
+			// }
+		}
+		$params['openid.mode'] = "check_authentication";
+
+		$openid_server = $this->GetOpenIDServer();
+		if ($openid_server == false)
+		{
+			return false;
+		}
+		$response = $this->CURL_Request($openid_server,'POST',$params);
+		$data = $this->splitResponse($response);
+		if ($data['is_valid'] == "true")
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+
+
+
+	/**
+	 * Get XRDS response and set possible servers.
+	 *
+	 * @param	string	$url	Url of endpoint to request
+	 * @return 	string			First endpoint OpenID server found. False if it failed to found.
+	 */
+	function sendDiscoveryRequestToGetXRDS($url='')
+	{
+		global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
@@ -486,7 +486,7 @@ 
 		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
 		$addheaders=array('Accept: application/xrds+xml');
-        $response = getURLContent($url, 'GET', '', 1, $addheaders);
+		$response = getURLContent($url, 'GET', '', 1, $addheaders);
 		/* response should like this:
 		<?xml version="1.0" encoding="UTF-8"?>
 		<xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
@@ -502,24 +502,24 @@ 
 		*/
 		$content=$response['content'];
 
-        $server='';
-        if (preg_match('/'.preg_quote('<URI>','/').'(.*)'.preg_quote('</URI>','/').'/is', $content, $reg))
-        {
-        	$server=$reg[1];
-        }
-
-        if (empty($server))
-        {
-            $this->ErrorStore('OPENID_NOSERVERSFOUND');
-            return false;
-        }
-        else
-       {
-       		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
-        	$this->SetOpenIDServer($server);
-        	return $server;
-	    }
-    }
+		$server='';
+		if (preg_match('/'.preg_quote('<URI>','/').'(.*)'.preg_quote('</URI>','/').'/is', $content, $reg))
+		{
+			$server=$reg[1];
+		}
+
+		if (empty($server))
+		{
+			$this->ErrorStore('OPENID_NOSERVERSFOUND');
+			return false;
+		}
+		else
+	   {
+	   		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
+			$this->SetOpenIDServer($server);
+			return $server;
+		}
+	}
 
 }
 

Spacing +44 added lines, -44 removed lines

@@ -97,9 +97,9 @@ 
      */
     function SetRequiredFields($a)
     {
-        if (is_array($a)){
+        if (is_array($a)) {
             $this->fields['required'] = $a;
-        }else{
+        } else {
             $this->fields['required'][] = $a;
         }
     }
@@ -112,9 +112,9 @@ 
      */
     function SetOptionalFields($a)
     {
-        if (is_array($a)){
+        if (is_array($a)) {
             $this->fields['optional'] = $a;
-        }else{
+        } else {
             $this->fields['optional'][] = $a;
         }
     }
@@ -128,7 +128,7 @@ 
     function SetIdentity($a)
     { 	// Set Identity URL
         if ((stripos($a, 'http://') === false)
-        && (stripos($a, 'https://') === false)){
+        && (stripos($a, 'https://') === false)) {
             $a = 'http://'.$a;
         }
         /*
@@ -165,7 +165,7 @@ 
     function GetError()
     {
         $e = $this->error;
-        return array('code'=>$e[0],'description'=>$e[1]);
+        return array('code'=>$e[0], 'description'=>$e[1]);
     }
 
     /**
@@ -178,10 +178,10 @@ 
     function ErrorStore($code, $desc = null)
     {
         $errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
-        if ($desc == null){
+        if ($desc == null) {
             $desc = $errs[$code];
         }
-        $this->error = array($code,$desc);
+        $this->error = array($code, $desc);
     }
 
     /**
@@ -211,7 +211,7 @@ 
     {
         $r = array();
         $response = explode("\n", $response);
-        foreach($response as $line) {
+        foreach ($response as $line) {
             $line = trim($line);
             if ($line != "") {
                 list($key, $value) = explode(":", $line, 2);
@@ -237,13 +237,13 @@ 
         if (!isset($u['path']) || ($u['path'] == '/')) {
             $u['path'] = '';
         }
-        if(substr($u['path'],-1,1) == '/'){
-            $u['path'] = substr($u['path'], 0, strlen($u['path'])-1);
+        if (substr($u['path'], -1, 1) == '/') {
+            $u['path'] = substr($u['path'], 0, strlen($u['path']) - 1);
         }
-        if (isset($u['query'])){ // If there is a query string, then use identity as is
-            return $u['host'] . $u['path'] . '?' . $u['query'];
-        }else{
-            return $u['host'] . $u['path'];
+        if (isset($u['query'])) { // If there is a query string, then use identity as is
+            return $u['host'].$u['path'].'?'.$u['query'];
+        } else {
+            return $u['host'].$u['path'];
         }
     }
 
@@ -255,12 +255,12 @@ 
      */
     function array2url($arr)
     { // converts associated array to URL Query String
-        if (!is_array($arr)){
+        if (!is_array($arr)) {
             return false;
         }
         $query = '';
-        foreach($arr as $key => $value){
-            $query .= $key . "=" . $value . "&";
+        foreach ($arr as $key => $value) {
+            $query .= $key."=".$value."&";
         }
         return $query;
     }
@@ -273,14 +273,14 @@ 
      * @param string	$params		Params
      * @return boolean|unknown
      */
-    function FSOCK_Request($url, $method="GET", $params = "")
+    function FSOCK_Request($url, $method = "GET", $params = "")
     {
         $fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds
         if (!$fp) {
             $this->ErrorStore('OPENID_SOCKETERROR', $errstr);
             return false;
         } else {
-            $request = $method . " /server HTTP/1.0\r\n";
+            $request = $method." /server HTTP/1.0\r\n";
             $request .= "User-Agent: Dolibarr\r\n";
             $request .= "Connection: close\r\n\r\n";
             fwrite($fp, $request);
@@ -305,11 +305,11 @@ 
      * @param 	string	$params		Params
      * @return string
      */
-    function CURL_Request($url, $method="GET", $params = "")
+    function CURL_Request($url, $method = "GET", $params = "")
     { // Remember, SSL MUST BE SUPPORTED
         if (is_array($params)) $params = $this->array2url($params);
 
-        $curl = curl_init($url . ($method == "GET" && $params != "" ? "?" . $params : ""));
+        $curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));
         @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($curl, CURLOPT_HEADER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
@@ -319,9 +319,9 @@ 
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         $response = curl_exec($curl);
 
-        if (curl_errno($curl) == 0){
+        if (curl_errno($curl) == 0) {
             $response;
-        }else{
+        } else {
             $this->ErrorStore('OPENID_CURL', curl_error($curl));
         }
         return $response;
@@ -359,22 +359,22 @@ 
      * @param	string	$url	Url to found endpoint
      * @return 	string			Endpoint
      */
-    function GetOpenIDServer($url='')
+    function GetOpenIDServer($url = '')
     {
     	global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
         $response = getURLContent($url);
 
         list($servers, $delegates) = $this->HTML2OpenIDServer($response);
-        if (count($servers) == 0){
+        if (count($servers) == 0) {
             $this->ErrorStore('OPENID_NOSERVERSFOUND');
             return false;
         }
         if (isset($delegates[0])
-        && ($delegates[0] != "")){
+        && ($delegates[0] != "")) {
             $this->SetIdentity($delegates[0]);
         }
         $this->SetOpenIDServer($servers[0]);
@@ -396,13 +396,13 @@ 
 
         if (isset($this->fields['required'])
         && (count($this->fields['required']) > 0)) {
-            $params['openid.sreg.required'] = implode(',',$this->fields['required']);
+            $params['openid.sreg.required'] = implode(',', $this->fields['required']);
         }
         if (isset($this->fields['optional'])
         && (count($this->fields['optional']) > 0)) {
-            $params['openid.sreg.optional'] = implode(',',$this->fields['optional']);
+            $params['openid.sreg.optional'] = implode(',', $this->fields['optional']);
         }
-        return $this->URLs['openid_server'] . "?". $this->array2url($params);
+        return $this->URLs['openid_server']."?".$this->array2url($params);
     }
 
     /**
@@ -421,7 +421,7 @@ 
         }
         else
         {	// Default Header Redirect
-            header('Location: ' . $redirect_to);
+            header('Location: '.$redirect_to);
         }
     }
 
@@ -438,14 +438,14 @@ 
 			'openid.sig' => urlencode($_GET['openid_sig'])
         );
         // Send only required parameters to confirm validity
-        $arr_signed = explode(",",str_replace('sreg.','sreg_',$_GET['openid_signed']));
+        $arr_signed = explode(",", str_replace('sreg.', 'sreg_', $_GET['openid_signed']));
         $num = count($arr_signed);
         for ($i = 0; $i < $num; $i++)
         {
-            $s = str_replace('sreg_','sreg.', $arr_signed[$i]);
-            $c = $_GET['openid_' . $arr_signed[$i]];
+            $s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);
+            $c = $_GET['openid_'.$arr_signed[$i]];
             // if ($c != ""){
-            $params['openid.' . $s] = urlencode($c);
+            $params['openid.'.$s] = urlencode($c);
             // }
         }
         $params['openid.mode'] = "check_authentication";
@@ -455,7 +455,7 @@ 
         {
             return false;
         }
-        $response = $this->CURL_Request($openid_server,'POST',$params);
+        $response = $this->CURL_Request($openid_server, 'POST', $params);
         $data = $this->splitResponse($response);
         if ($data['is_valid'] == "true")
         {
@@ -476,16 +476,16 @@ 
      * @param	string	$url	Url of endpoint to request
      * @return 	string			First endpoint OpenID server found. False if it failed to found.
      */
-    function sendDiscoveryRequestToGetXRDS($url='')
+    function sendDiscoveryRequestToGetXRDS($url = '')
     {
     	global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
 		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
-		$addheaders=array('Accept: application/xrds+xml');
+		$addheaders = array('Accept: application/xrds+xml');
         $response = getURLContent($url, 'GET', '', 1, $addheaders);
 		/* response should like this:
 		<?xml version="1.0" encoding="UTF-8"?>
@@ -500,12 +500,12 @@ 
 		</XRD>
 		</xrds:XRDS>
 		*/
-		$content=$response['content'];
+		$content = $response['content'];
 
-        $server='';
-        if (preg_match('/'.preg_quote('<URI>','/').'(.*)'.preg_quote('</URI>','/').'/is', $content, $reg))
+        $server = '';
+        if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg))
         {
-        	$server=$reg[1];
+        	$server = $reg[1];
         }
 
         if (empty($server))

Braces +23 added lines, -18 removed lines

@@ -99,7 +99,7 @@ 
     {
         if (is_array($a)){
             $this->fields['required'] = $a;
-        }else{
+        } else{
             $this->fields['required'][] = $a;
         }
     }
@@ -114,7 +114,7 @@ 
     {
         if (is_array($a)){
             $this->fields['optional'] = $a;
-        }else{
+        } else{
             $this->fields['optional'][] = $a;
         }
     }
@@ -194,8 +194,7 @@ 
         if (count($this->error) > 0)
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -229,8 +228,9 @@ 
      */
     function OpenID_Standarize($openid_identity = null)
     {
-        if ($openid_identity === null)
-        $openid_identity = $this->openid_url_identity;
+        if ($openid_identity === null) {
+                $openid_identity = $this->openid_url_identity;
+        }
 
         $u = parse_url(strtolower(trim($openid_identity)));
 
@@ -242,7 +242,7 @@ 
         }
         if (isset($u['query'])){ // If there is a query string, then use identity as is
             return $u['host'] . $u['path'] . '?' . $u['query'];
-        }else{
+        } else{
             return $u['host'] . $u['path'];
         }
     }
@@ -307,7 +307,9 @@ 
      */
     function CURL_Request($url, $method="GET", $params = "")
     { // Remember, SSL MUST BE SUPPORTED
-        if (is_array($params)) $params = $this->array2url($params);
+        if (is_array($params)) {
+        	$params = $this->array2url($params);
+        }
 
         $curl = curl_init($url . ($method == "GET" && $params != "" ? "?" . $params : ""));
         @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
@@ -315,13 +317,15 @@ 
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
         curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
-        if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+        if ($method == "POST") {
+        	curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+        }
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         $response = curl_exec($curl);
 
         if (curl_errno($curl) == 0){
             $response;
-        }else{
+        } else{
             $this->ErrorStore('OPENID_CURL', curl_error($curl));
         }
         return $response;
@@ -364,7 +368,9 @@ 
     	global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) {
+			$url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		}
 
         $response = getURLContent($url);
 
@@ -418,8 +424,7 @@ 
             echo '<script language="JavaScript" type="text/javascript">window.location=\'';
             echo $redirect_to;
             echo '\';</script>';
-        }
-        else
+        } else
         {	// Default Header Redirect
             header('Location: ' . $redirect_to);
         }
@@ -460,8 +465,7 @@ 
         if ($data['is_valid'] == "true")
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -481,7 +485,9 @@ 
     	global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) {
+			$url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		}
 
 		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
@@ -512,8 +518,7 @@ 
         {
             $this->ErrorStore('OPENID_NOSERVERSFOUND');
             return false;
-        }
-        else
+        } else
        {
        		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
         	$this->SetOpenIDServer($server);

htdocs/core/class/antivir.class.php

Braces +13 added lines, -5 removed lines

@@ -113,15 +113,19 @@ 
 		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',',$output));
 
 		$returncodevirus=1;
-		if ($return_var == $returncodevirus)	// Virus found
+		if ($return_var == $returncodevirus) {
+			// Virus found
 		{
 			$this->errors=$output;
+		}
 			return -99;
 		}
 
-		if ($return_var > 0)					// If other error
+		if ($return_var > 0) {
+			// If other error
 		{
 			$this->errors=$output;
+		}
 			return -98;
 		}
 
@@ -157,10 +161,14 @@ 
 		$param=preg_replace('/%maxfilesize/',$maxfilesize,$param);
 		$param=preg_replace('/%file/',trim($file),$param);
 
-		if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM))
-			$param=$param." ".escapeshellarg(trim($file));
+		if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM)) {
+					$param=$param." ".escapeshellarg(trim($file));
+		}
 
-		if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command. Using escapeshellcmd fails.
+		if (preg_match("/\s/",$command)) {
+			$command=escapeshellarg($command);
+		}
+		// Use quotes on command. Using escapeshellcmd fails.
 
 		$ret=$command.' '.$param;
 		//$ret=$command.' '.$param.' 2>&1';

Indentation +6 added lines, -6 removed lines

@@ -62,23 +62,23 @@ 
 
 		if (preg_match('/\.virus$/i', $file))
 		{
-		    $this->errors='File has an extension saying file is a virus';
-		    return -97;
+			$this->errors='File has an extension saying file is a virus';
+			return -97;
 		}
 
 		$fullcommand=$this->getCliCommand($file);
 		//$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
-        $fullcommand.=' 2>&1';      // This is to get error output
+		$fullcommand.=' 2>&1';      // This is to get error output
 
 		$output=array();
 		$return_var=0;
-        $safemode=ini_get("safe_mode");
+		$safemode=ini_get("safe_mode");
 		// Create a clean fullcommand
 		dol_syslog("AntiVir::dol_avscan_file Run command=".$fullcommand." with safe_mode ".($safemode?"on":"off"));
 		// Run CLI command. If run of Windows, you can get return with echo %ERRORLEVEL%
 		$lastline=exec($fullcommand, $output, $return_var);
 
-        //print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;
+		//print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;
 
 		/*
         $outputfile=$conf->admin->dir_temp.'/dol_avscan_file.out.'.session_id();
@@ -164,7 +164,7 @@ 
 
 		$ret=$command.' '.$param;
 		//$ret=$command.' '.$param.' 2>&1';
-        //print "xx".$ret."xx";exit;
+		//print "xx".$ret."xx";exit;
 
 		return $ret;
 	}

Spacing +30 added lines, -30 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 	/**
@@ -62,21 +62,21 @@ 
 
 		if (preg_match('/\.virus$/i', $file))
 		{
-		    $this->errors='File has an extension saying file is a virus';
+		    $this->errors = 'File has an extension saying file is a virus';
 		    return -97;
 		}
 
-		$fullcommand=$this->getCliCommand($file);
+		$fullcommand = $this->getCliCommand($file);
 		//$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
-        $fullcommand.=' 2>&1';      // This is to get error output
+        $fullcommand .= ' 2>&1'; // This is to get error output
 
-		$output=array();
-		$return_var=0;
-        $safemode=ini_get("safe_mode");
+		$output = array();
+		$return_var = 0;
+        $safemode = ini_get("safe_mode");
 		// Create a clean fullcommand
-		dol_syslog("AntiVir::dol_avscan_file Run command=".$fullcommand." with safe_mode ".($safemode?"on":"off"));
+		dol_syslog("AntiVir::dol_avscan_file Run command=".$fullcommand." with safe_mode ".($safemode ? "on" : "off"));
 		// Run CLI command. If run of Windows, you can get return with echo %ERRORLEVEL%
-		$lastline=exec($fullcommand, $output, $return_var);
+		$lastline = exec($fullcommand, $output, $return_var);
 
         //print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;
 
@@ -110,18 +110,18 @@ 
 		}
 		*/
 
-		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',',$output));
+		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',', $output));
 
-		$returncodevirus=1;
+		$returncodevirus = 1;
 		if ($return_var == $returncodevirus)	// Virus found
 		{
-			$this->errors=$output;
+			$this->errors = $output;
 			return -99;
 		}
 
 		if ($return_var > 0)					// If other error
 		{
-			$this->errors=$output;
+			$this->errors = $output;
 			return -98;
 		}
 
@@ -141,28 +141,28 @@ 
 	{
 		global $conf;
 
-		$maxreclevel = 5 ; 			// maximal recursion level
-		$maxfiles = 1000; 			// maximal number of files to be scanned within archive
-		$maxratio = 200; 			// maximal compression ratio
-		$bz2archivememlim = 0; 		// limit memory usage for bzip2 (0/1)
-		$maxfilesize = 10485760; 	// archived files larger than this value (in bytes) will not be scanned
+		$maxreclevel = 5; // maximal recursion level
+		$maxfiles = 1000; // maximal number of files to be scanned within archive
+		$maxratio = 200; // maximal compression ratio
+		$bz2archivememlim = 0; // limit memory usage for bzip2 (0/1)
+		$maxfilesize = 10485760; // archived files larger than this value (in bytes) will not be scanned
 
-		$command=$conf->global->MAIN_ANTIVIRUS_COMMAND;
-		$param=$conf->global->MAIN_ANTIVIRUS_PARAM;
+		$command = $conf->global->MAIN_ANTIVIRUS_COMMAND;
+		$param = $conf->global->MAIN_ANTIVIRUS_PARAM;
 
-		$param=preg_replace('/%maxreclevel/',$maxreclevel,$param);
-		$param=preg_replace('/%maxfiles/',$maxfiles,$param);
-		$param=preg_replace('/%maxratio/',$maxratio,$param);
-		$param=preg_replace('/%bz2archivememlim/',$bz2archivememlim,$param);
-		$param=preg_replace('/%maxfilesize/',$maxfilesize,$param);
-		$param=preg_replace('/%file/',trim($file),$param);
+		$param = preg_replace('/%maxreclevel/', $maxreclevel, $param);
+		$param = preg_replace('/%maxfiles/', $maxfiles, $param);
+		$param = preg_replace('/%maxratio/', $maxratio, $param);
+		$param = preg_replace('/%bz2archivememlim/', $bz2archivememlim, $param);
+		$param = preg_replace('/%maxfilesize/', $maxfilesize, $param);
+		$param = preg_replace('/%file/', trim($file), $param);
 
-		if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM))
-			$param=$param." ".escapeshellarg(trim($file));
+		if (!preg_match('/%file/', $conf->global->MAIN_ANTIVIRUS_PARAM))
+			$param = $param." ".escapeshellarg(trim($file));
 
-		if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command. Using escapeshellcmd fails.
+		if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // Use quotes on command. Using escapeshellcmd fails.
 
-		$ret=$command.' '.$param;
+		$ret = $command.' '.$param;
 		//$ret=$command.' '.$param.' 2>&1';
         //print "xx".$ret."xx";exit;
 

htdocs/core/class/dolgeoip.class.php

Indentation +16 added lines, -16 removed lines

@@ -45,13 +45,13 @@ 
 	{
 		if ($type == 'country')
 		{
-		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
+			// geoip may have been already included with PEAR
+			if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
 		}
 		else if ($type == 'city')
 		{
-		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc';
+			// geoip may have been already included with PEAR
+			if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc';
 		}
 		else { print 'ErrorBadParameterInConstructor'; return 0; }
 
@@ -76,9 +76,9 @@ 
 		}
 		else
 		{
-		    $this->gi = 'NOGI';    // We are using embedded php geoip functions
-		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
-		    //print geoip_database_info();
+			$this->gi = 'NOGI';    // We are using embedded php geoip functions
+			//print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
+			//print geoip_database_info();
 		}
 	}
 
@@ -96,13 +96,13 @@ 
 		}
 		if ($this->gi == 'NOGI')
 		{
-		    // geoip_country_code_by_addr does not exists
-    		return strtolower(geoip_country_code_by_name($ip));
+			// geoip_country_code_by_addr does not exists
+			return strtolower(geoip_country_code_by_name($ip));
 		}
 		else
 		{
-		    if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
-		    return strtolower(geoip_country_code_by_addr($this->gi, $ip));
+			if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+			return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 		}
 	}
 
@@ -128,7 +128,7 @@ 
 	 */
 	function getVersion()
 	{
-	    if ($this->gi == 'NOGI') return geoip_database_info();
+		if ($this->gi == 'NOGI') return geoip_database_info();
 		return 'Not available (not using PHP internal geo functions)';
 	}
 
@@ -139,9 +139,9 @@ 
 	 */
 	function close()
 	{
-	    if (function_exists('geoip_close'))    // With some geoip with PEAR, geoip_close function may not exists
-	    {
-	        geoip_close($this->gi);
-	    }
+		if (function_exists('geoip_close'))    // With some geoip with PEAR, geoip_close function may not exists
+		{
+			geoip_close($this->gi);
+		}
 	}
 }

Spacing +10 added lines, -10 removed lines

@@ -41,42 +41,42 @@ 
 	 * @param 	string	$type		'country' or 'city'
 	 * @param	string	$datfile	Data file
 	 */
-	function __construct($type,$datfile)
+	function __construct($type, $datfile)
 	{
 		if ($type == 'country')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
+		    if (!function_exists('geoip_country_code_by_name')) $res = include_once GEOIP_PATH.'geoip.inc';
 		}
 		else if ($type == 'city')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc';
+		    if (!function_exists('geoip_country_code_by_name')) $res = include_once GEOIP_PATH.'geoipcity.inc';
 		}
 		else { print 'ErrorBadParameterInConstructor'; return 0; }
 
 		// Here, function exists (embedded into PHP or exists because we made include)
 		if (empty($type) || empty($datfile))
 		{
-			$this->errorlabel='Constructor was called with no datafile parameter';
+			$this->errorlabel = 'Constructor was called with no datafile parameter';
 			dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 			return 0;
 		}
-		if (! file_exists($datfile) || ! is_readable($datfile))
+		if (!file_exists($datfile) || !is_readable($datfile))
 		{
-			$this->error='ErrorGeoIPClassNotInitialized';
-			$this->errorlabel="Datafile ".$datfile." not found";
+			$this->error = 'ErrorGeoIPClassNotInitialized';
+			$this->errorlabel = "Datafile ".$datfile." not found";
 			dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 			return 0;
 		}
 
 		if (function_exists('geoip_open'))
 		{
-			$this->gi = geoip_open($datfile,GEOIP_STANDARD);
+			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
 		}
 		else
 		{
-		    $this->gi = 'NOGI';    // We are using embedded php geoip functions
+		    $this->gi = 'NOGI'; // We are using embedded php geoip functions
 		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
 		    //print geoip_database_info();
 		}
@@ -101,7 +101,7 @@ 
 		}
 		else
 		{
-		    if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+		    if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
 		    return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 		}
 	}

Braces +19 added lines, -13 removed lines

@@ -46,14 +46,16 @@ 
 		if ($type == 'country')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
-		}
-		else if ($type == 'city')
+		    if (! function_exists('geoip_country_code_by_name')) {
+		    	$res=include_once GEOIP_PATH.'geoip.inc';
+		    }
+		} else if ($type == 'city')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc';
-		}
-		else { print 'ErrorBadParameterInConstructor'; return 0; }
+		    if (! function_exists('geoip_country_code_by_name')) {
+		    	$res=include_once GEOIP_PATH.'geoipcity.inc';
+		    }
+		} else { print 'ErrorBadParameterInConstructor'; return 0; }
 
 		// Here, function exists (embedded into PHP or exists because we made include)
 		if (empty($type) || empty($datfile))
@@ -73,8 +75,7 @@ 
 		if (function_exists('geoip_open'))
 		{
 			$this->gi = geoip_open($datfile,GEOIP_STANDARD);
-		}
-		else
+		} else
 		{
 		    $this->gi = 'NOGI';    // We are using embedded php geoip functions
 		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
@@ -98,10 +99,11 @@ 
 		{
 		    // geoip_country_code_by_addr does not exists
     		return strtolower(geoip_country_code_by_name($ip));
-		}
-		else
+		} else
 		{
-		    if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+		    if (! function_exists('geoip_country_code_by_addr')) {
+		    	return strtolower(geoip_country_code_by_name($this->gi, $ip));
+		    }
 		    return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 		}
 	}
@@ -128,7 +130,9 @@ 
 	 */
 	function getVersion()
 	{
-	    if ($this->gi == 'NOGI') return geoip_database_info();
+	    if ($this->gi == 'NOGI') {
+	    	return geoip_database_info();
+	    }
 		return 'Not available (not using PHP internal geo functions)';
 	}
 
@@ -139,9 +143,11 @@ 
 	 */
 	function close()
 	{
-	    if (function_exists('geoip_close'))    // With some geoip with PEAR, geoip_close function may not exists
+	    if (function_exists('geoip_close')) {
+	    	// With some geoip with PEAR, geoip_close function may not exists
 	    {
 	        geoip_close($this->gi);
 	    }
+	    }
 	}
 }

htdocs/core/class/html.formorder.class.php

Indentation +33 added lines, -33 removed lines

@@ -32,38 +32,38 @@ 
 {
 
 	/**
-     *    Return combo list of differents status of a orders
-     *
-     *    @param	string	$selected   Preselected value
-     *    @param	int		$short		Use short labels
-     *    @param	string	$hmlname	Name of HTML select element
-     *    @return	void
-     */
-    public function selectSupplierOrderStatus($selected='', $short=0, $hmlname='order_status')
-    {
-	    $options = array();
-
-	    // 7 is same label than 6. 8 does not exists (billed is another field)
-	    $statustohow = array(
-		    '0' => '0',
-		    '1' => '1',
-		    '2' => '2',
-		    '3' => '3',
-		    '4' => '4',
-		    '5' => '5',
-		    '6' => '6,7',
-		    '9' => '9'
-	    );
-
-	    $tmpsupplierorder = new CommandeFournisseur($this->db);
-
-	    foreach ($statustohow as $key => $value) {
-		    $tmpsupplierorder->statut = $key;
-		    $options[$value] = $tmpsupplierorder->getLibStatut($short);
-	    }
-
-	    print Form::selectarray($hmlname, $options, $selected, 1);
-    }
+	 *    Return combo list of differents status of a orders
+	 *
+	 *    @param	string	$selected   Preselected value
+	 *    @param	int		$short		Use short labels
+	 *    @param	string	$hmlname	Name of HTML select element
+	 *    @return	void
+	 */
+	public function selectSupplierOrderStatus($selected='', $short=0, $hmlname='order_status')
+	{
+		$options = array();
+
+		// 7 is same label than 6. 8 does not exists (billed is another field)
+		$statustohow = array(
+			'0' => '0',
+			'1' => '1',
+			'2' => '2',
+			'3' => '3',
+			'4' => '4',
+			'5' => '5',
+			'6' => '6,7',
+			'9' => '9'
+		);
+
+		$tmpsupplierorder = new CommandeFournisseur($this->db);
+
+		foreach ($statustohow as $key => $value) {
+			$tmpsupplierorder->statut = $key;
+			$options[$value] = $tmpsupplierorder->getLibStatut($short);
+		}
+
+		print Form::selectarray($hmlname, $options, $selected, 1);
+	}
 
 	/**
 	 *	Return list of input method (mode used to receive order, like order received by email, fax, online)
@@ -78,7 +78,7 @@ 
 	{
 		global $langs;
 
-        $listofmethods=array();
+		$listofmethods=array();
 
 		$sql = "SELECT rowid, code, libelle as label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";

Spacing +8 added lines, -8 removed lines

@@ -22,7 +22,7 @@ 
  *	\brief      File of predefined functions for HTML forms for order module
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 /**
  *	Class to manage HTML output components for orders
@@ -39,7 +39,7 @@ 
      *    @param	string	$hmlname	Name of HTML select element
      *    @return	void
      */
-    public function selectSupplierOrderStatus($selected='', $short=0, $hmlname='order_status')
+    public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status')
     {
 	    $options = array();
 
@@ -74,18 +74,18 @@ 
 	 *  @param  int		$addempty		0=list with no empty value, 1=list with empty value
 	 *  @return	array					Tableau des sources de commandes
 	 */
-	public function selectInputMethod($selected='',$htmlname='source_id',$addempty=0)
+	public function selectInputMethod($selected = '', $htmlname = 'source_id', $addempty = 0)
 	{
 		global $langs;
 
-        $listofmethods=array();
+        $listofmethods = array();
 
 		$sql = "SELECT rowid, code, libelle as label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
-		$sql.= " WHERE active = 1";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_method";
+		$sql .= " WHERE active = 1";
 
 		dol_syslog(get_class($this)."::selectInputMethod", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 
 		if (!$resql) {
 			dol_print_error($this->db);
@@ -96,7 +96,7 @@ 
 			$listofmethods[$obj->rowid] = $langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : $obj->label;
 		}
 
-		print Form::selectarray($htmlname,$listofmethods,$selected,$addempty);
+		print Form::selectarray($htmlname, $listofmethods, $selected, $addempty);
 
 		return 1;
 	}

htdocs/core/class/events.class.php

Indentation +6 added lines, -6 removed lines

@@ -52,7 +52,7 @@ 
 	var $eventstolog=array(
 		array('id'=>'USER_LOGIN',             'test'=>1),
 		array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
-	    array('id'=>'USER_LOGOUT',            'test'=>1),
+		array('id'=>'USER_LOGOUT',            'test'=>1),
 		array('id'=>'USER_CREATE',            'test'=>1),
 		array('id'=>'USER_MODIFY',            'test'=>1),
 		array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
@@ -265,11 +265,11 @@ 
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	function initAsSpecimen()
 	{

Braces +2 added lines, -4 removed lines

@@ -141,8 +141,7 @@ 
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -230,8 +229,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;

Spacing +66 added lines, -66 removed lines

@@ -34,8 +34,8 @@ 
  */
 class Events // extends CommonObject
 {
-	public $element='events';				//!< Id that identify managed objects
-	public $table_element='events';		//!< Name of table without prefix where object is stored
+	public $element = 'events'; //!< Id that identify managed objects
+	public $table_element = 'events'; //!< Name of table without prefix where object is stored
 
 	var $id;
 	var $db;
@@ -49,20 +49,20 @@ 
 	var $description;
 
 	// List of all Audit/Security events supported by triggers
-	var $eventstolog=array(
-		array('id'=>'USER_LOGIN',             'test'=>1),
-		array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
-	    array('id'=>'USER_LOGOUT',            'test'=>1),
-		array('id'=>'USER_CREATE',            'test'=>1),
-		array('id'=>'USER_MODIFY',            'test'=>1),
-		array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
-		array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
-		array('id'=>'USER_DELETE',            'test'=>1),
+	var $eventstolog = array(
+		array('id'=>'USER_LOGIN', 'test'=>1),
+		array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
+	    array('id'=>'USER_LOGOUT', 'test'=>1),
+		array('id'=>'USER_CREATE', 'test'=>1),
+		array('id'=>'USER_MODIFY', 'test'=>1),
+		array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
+		array('id'=>'USER_ENABLEDISABLE', 'test'=>1),
+		array('id'=>'USER_DELETE', 'test'=>1),
 	/*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
 	    array('id'=>'USER_REMOVEFROMGROUP',   'test'=>1), deprecated. Replace with USER_MODIFY */
-		array('id'=>'GROUP_CREATE',           'test'=>1),
-		array('id'=>'GROUP_MODIFY',           'test'=>1),
-		array('id'=>'GROUP_DELETE',           'test'=>1),
+		array('id'=>'GROUP_CREATE', 'test'=>1),
+		array('id'=>'GROUP_MODIFY', 'test'=>1),
+		array('id'=>'GROUP_DELETE', 'test'=>1),
 	/*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
 		array('id'=>'COMPANY_CREATE',         'test'=>$conf->societe->enabled),
 		array('id'=>'CONTRACT_VALIDATE',      'test'=>$conf->contrat->enabled),
@@ -111,32 +111,32 @@ 
 		global $conf, $langs;
 
 		// Clean parameters
-		$this->description=trim($this->description);
+		$this->description = trim($this->description);
 
 		// Check parameters
-		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
+		if (empty($this->description)) { $this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1; }
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
-		$sql.= "type,";
-		$sql.= "entity,";
-		$sql.= "ip,";
-		$sql.= "user_agent,";
-		$sql.= "dateevent,";
-		$sql.= "fk_user,";
-		$sql.= "description";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->type)."',";
-		$sql.= " ".$conf->entity.",";
-		$sql.= " '".$this->db->escape($_SERVER['REMOTE_ADDR'])."',";
-		$sql.= " ".($_SERVER['HTTP_USER_AGENT']?"'".$this->db->escape(dol_trunc($_SERVER['HTTP_USER_AGENT'],250))."'":'NULL').",";
-		$sql.= " '".$this->db->idate($this->dateevent)."',";
-		$sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
-		$sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
-		$sql.= ")";
+		$sql .= "type,";
+		$sql .= "entity,";
+		$sql .= "ip,";
+		$sql .= "user_agent,";
+		$sql .= "dateevent,";
+		$sql .= "fk_user,";
+		$sql .= "description";
+		$sql .= ") VALUES (";
+		$sql .= " '".$this->db->escape($this->type)."',";
+		$sql .= " ".$conf->entity.",";
+		$sql .= " '".$this->db->escape($_SERVER['REMOTE_ADDR'])."',";
+		$sql .= " ".($_SERVER['HTTP_USER_AGENT'] ? "'".$this->db->escape(dol_trunc($_SERVER['HTTP_USER_AGENT'], 250))."'" : 'NULL').",";
+		$sql .= " '".$this->db->idate($this->dateevent)."',";
+		$sql .= " ".($user->id ? "'".$this->db->escape($user->id)."'" : 'NULL').",";
+		$sql .= " '".$this->db->escape(dol_trunc($this->description, 250))."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
@@ -144,7 +144,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -157,30 +157,30 @@ 
 	 * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
 	 * @return  int         			<0 if KO, >0 if OK
 	 */
-	function update($user=null, $notrigger=0)
+	function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
 
 		// Clean parameters
-		$this->id=trim($this->id);
-		$this->type=trim($this->type);
-		$this->description=trim($this->description);
+		$this->id = trim($this->id);
+		$this->type = trim($this->type);
+		$this->description = trim($this->description);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-		$sql.= " type='".$this->db->escape($this->type)."',";
-		$sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
-		$sql.= " description='".$this->db->escape($this->description)."'";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " type='".$this->db->escape($this->type)."',";
+		$sql .= " dateevent='".$this->db->idate($this->dateevent)."',";
+		$sql .= " description='".$this->db->escape($this->description)."'";
+		$sql .= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 		return 1;
@@ -194,31 +194,31 @@ 
 	 *  @param  User	$user       User that load
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-	function fetch($id, $user=null)
+	function fetch($id, $user = null)
 	{
 		global $langs;
 
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.tms,";
-		$sql.= " t.type,";
-		$sql.= " t.entity,";
-		$sql.= " t.dateevent,";
-		$sql.= " t.description,";
-		$sql.= " t.ip,";
-		$sql.= " t.user_agent";
-		$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
-		$sql.= " WHERE t.rowid = ".$id;
+		$sql .= " t.rowid,";
+		$sql .= " t.tms,";
+		$sql .= " t.type,";
+		$sql .= " t.entity,";
+		$sql .= " t.dateevent,";
+		$sql .= " t.description,";
+		$sql .= " t.ip,";
+		$sql .= " t.user_agent";
+		$sql .= " FROM ".MAIN_DB_PREFIX."events as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id    = $obj->rowid;
+				$this->id = $obj->rowid;
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->type = $obj->type;
 				$this->entity = $obj->entity;
@@ -233,7 +233,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -250,13 +250,13 @@ 
 		global $conf, $langs;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
@@ -273,12 +273,12 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$this->id=0;
+		$this->id = 0;
 
-		$this->tms=time();
-		$this->type='';
-		$this->dateevent=time();
-		$this->description='This is a specimen event';
+		$this->tms = time();
+		$this->type = '';
+		$this->dateevent = time();
+		$this->description = 'This is a specimen event';
 	}
 
 }

htdocs/core/class/menu.class.php

Indentation +83 added lines, -83 removed lines

@@ -28,94 +28,94 @@
  */
 class Menu
 {
-    var $liste;
+	var $liste;
 
-    /**
+	/**
 	 *	Constructor
-     */
-    function __construct()
-    {
-      	$this->liste = array();
-    }
+	 */
+	function __construct()
+	{
+	  	$this->liste = array();
+	}
 
-    /**
-     * Clear property ->liste
-     *
-     * @return	void
-     */
-    function clear()
-    {
-        $this->liste = array();
-    }
+	/**
+	 * Clear property ->liste
+	 *
+	 * @return	void
+	 */
+	function clear()
+	{
+		$this->liste = array();
+	}
 
-    /**
-     * Add a menu entry into this->liste (at end)
-     *
-     * @param	string	$url        Url to follow on click (does not include DOL_URL_ROOT)
-     * @param   string	$titre      Label of menu to add
-     * @param   integer	$level      Level of menu to add
-     * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)
-     * @param   string	$target		Target link
-     * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
-     * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
-     * @param	int		$position	Position (not used yet)
-     * @param	string	$id			Id
-     * @param	string	$idsel		Id sel
-     * @param	string	$classname	Class name
-     * @return	void
-     */
-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='')
-    {
-        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname);
-    }
+	/**
+	 * Add a menu entry into this->liste (at end)
+	 *
+	 * @param	string	$url        Url to follow on click (does not include DOL_URL_ROOT)
+	 * @param   string	$titre      Label of menu to add
+	 * @param   integer	$level      Level of menu to add
+	 * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)
+	 * @param   string	$target		Target link
+	 * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
+	 * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
+	 * @param	int		$position	Position (not used yet)
+	 * @param	string	$id			Id
+	 * @param	string	$idsel		Id sel
+	 * @param	string	$classname	Class name
+	 * @return	void
+	 */
+	function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='')
+	{
+		$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname);
+	}
 
-    /**
-     * Insert a menu entry into this->liste
-     *
-     * @param	int		$idafter	Array key after which inserting new entry
-     * @param	string	$url        Url to follow on click
-     * @param   string	$titre      Label of menu to add
-     * @param   integer	$level      Level of menu to add
-     * @param   int		$enabled    Menu active or not
-     * @param   string	$target		Target link
-     * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
-     * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
-     * @param	int		$position	Position (not used yet)
-     * @param	string	$id			Id
-     * @param	string	$idsel		Id sel
-     * @param	string	$classname	Class name
-     * @return	void
-     */
-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='')
-    {
-        $array_start = array_slice($this->liste,0,($idafter+1));
-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname));
-        $array_end   = array_slice($this->liste,($idafter+1));
-        $this->liste=array_merge($array_start,$array_new,$array_end);
-    }
+	/**
+	 * Insert a menu entry into this->liste
+	 *
+	 * @param	int		$idafter	Array key after which inserting new entry
+	 * @param	string	$url        Url to follow on click
+	 * @param   string	$titre      Label of menu to add
+	 * @param   integer	$level      Level of menu to add
+	 * @param   int		$enabled    Menu active or not
+	 * @param   string	$target		Target link
+	 * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
+	 * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
+	 * @param	int		$position	Position (not used yet)
+	 * @param	string	$id			Id
+	 * @param	string	$idsel		Id sel
+	 * @param	string	$classname	Class name
+	 * @return	void
+	 */
+	function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='')
+	{
+		$array_start = array_slice($this->liste,0,($idafter+1));
+		$array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname));
+		$array_end   = array_slice($this->liste,($idafter+1));
+		$this->liste=array_merge($array_start,$array_new,$array_end);
+	}
 
-    /**
-     * Remove a menu entry from this->liste
-     *
-     * @return	void
-     */
-    function remove_last()
-    {
-    	if (count($this->liste) > 1) array_pop($this->liste);
-    }
+	/**
+	 * Remove a menu entry from this->liste
+	 *
+	 * @return	void
+	 */
+	function remove_last()
+	{
+		if (count($this->liste) > 1) array_pop($this->liste);
+	}
 
-    /**
-     * Return number of visible entries (gray or not)
-     *
-     *  @return int     Number of visible (gray or not) menu entries
-     */
-    function getNbOfVisibleMenuEntries()
-    {
-        $nb=0;
-        foreach($this->liste as $val)
-        {
-            if (! empty($val['enabled'])) $nb++;
-        }
-        return $nb;
-    }
+	/**
+	 * Return number of visible entries (gray or not)
+	 *
+	 *  @return int     Number of visible (gray or not) menu entries
+	 */
+	function getNbOfVisibleMenuEntries()
+	{
+		$nb=0;
+		foreach($this->liste as $val)
+		{
+			if (! empty($val['enabled'])) $nb++;
+		}
+		return $nb;
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -64,9 +64,9 @@ 
      * @param	string	$classname	Class name
      * @return	void
      */
-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='')
+    function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '')
     {
-        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname);
+        $this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname);
     }
 
     /**
@@ -86,12 +86,12 @@ 
      * @param	string	$classname	Class name
      * @return	void
      */
-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='')
+    function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '')
     {
-        $array_start = array_slice($this->liste,0,($idafter+1));
-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname));
-        $array_end   = array_slice($this->liste,($idafter+1));
-        $this->liste=array_merge($array_start,$array_new,$array_end);
+        $array_start = array_slice($this->liste, 0, ($idafter + 1));
+        $array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname));
+        $array_end   = array_slice($this->liste, ($idafter + 1));
+        $this->liste = array_merge($array_start, $array_new, $array_end);
     }
 
     /**
@@ -111,10 +111,10 @@ 
      */
     function getNbOfVisibleMenuEntries()
     {
-        $nb=0;
-        foreach($this->liste as $val)
+        $nb = 0;
+        foreach ($this->liste as $val)
         {
-            if (! empty($val['enabled'])) $nb++;
+            if (!empty($val['enabled'])) $nb++;
         }
         return $nb;
     }

Braces +6 added lines, -2 removed lines

@@ -101,7 +101,9 @@ 
      */
     function remove_last()
     {
-    	if (count($this->liste) > 1) array_pop($this->liste);
+    	if (count($this->liste) > 1) {
+    		array_pop($this->liste);
+    	}
     }
 
     /**
@@ -114,7 +116,9 @@ 
         $nb=0;
         foreach($this->liste as $val)
         {
-            if (! empty($val['enabled'])) $nb++;
+            if (! empty($val['enabled'])) {
+            	$nb++;
+            }
         }
         return $nb;
     }

htdocs/core/class/commonstickergenerator.class.php

Indentation +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 	 * @param 	int		$nbPointilles		Nb pointilles
 	 * @return	void
 	 */
-    function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15)
+	function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15)
 	{
 		$pdf->SetLineWidth($epaisseur);
 		$length=abs($x1-$x2);

Spacing +49 added lines, -49 removed lines

@@ -62,23 +62,23 @@ 
 abstract class CommonStickerGenerator
 {
 
-	public $code;		// Code of format
-	public $format;	// Array with informations
+	public $code; // Code of format
+	public $format; // Array with informations
 
 	// protected
-	var $_Avery_Name	= '';	// Nom du format de l'etiquette
-	var $_Margin_Left	= 0;	// Marge de gauche de l'etiquette
-	var $_Margin_Top	= 0;	// marge en haut de la page avant la premiere etiquette
-	var $_X_Space 	= 0;	// Espace horizontal entre 2 bandes d'etiquettes
-	var $_Y_Space 	= 0;	// Espace vertical entre 2 bandes d'etiquettes
-	var $_X_Number 	= 0;	// NX Nombre d'etiquettes sur la largeur de la page
-	var $_Y_Number 	= 0;	// NY Nombre d'etiquettes sur la hauteur de la page
-	var $_Width 		= 0;	// Largeur de chaque etiquette
-	var $_Height 		= 0;	// Hauteur de chaque etiquette
-	var $_Char_Size	= 10;	// Hauteur des caracteres
-	var $_Line_Height	= 10;	// Hauteur par defaut d'une ligne
-	var $_Metric 		= 'mm';	// Type of metric.. Will help to calculate good values
-	var $_Metric_Doc 	= 'mm';	// Type of metric for the doc..
+	var $_Avery_Name	= ''; // Nom du format de l'etiquette
+	var $_Margin_Left = 0; // Marge de gauche de l'etiquette
+	var $_Margin_Top	= 0; // marge en haut de la page avant la premiere etiquette
+	var $_X_Space 	= 0; // Espace horizontal entre 2 bandes d'etiquettes
+	var $_Y_Space 	= 0; // Espace vertical entre 2 bandes d'etiquettes
+	var $_X_Number 	= 0; // NX Nombre d'etiquettes sur la largeur de la page
+	var $_Y_Number 	= 0; // NY Nombre d'etiquettes sur la hauteur de la page
+	var $_Width = 0; // Largeur de chaque etiquette
+	var $_Height 		= 0; // Hauteur de chaque etiquette
+	var $_Char_Size	= 10; // Hauteur des caracteres
+	var $_Line_Height	= 10; // Hauteur par defaut d'une ligne
+	var $_Metric 		= 'mm'; // Type of metric.. Will help to calculate good values
+	var $_Metric_Doc 	= 'mm'; // Type of metric for the doc..
 	var $_COUNTX = 1;
 	var $_COUNTY = 1;
 	var $_First = 1;
@@ -103,7 +103,7 @@ 
 	 *	@param	string		$outputdir			Output directory for pdf file
 	 *  @return int             				1=OK, 0=KO
 	 */
-	abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='');
+	abstract function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');
 
 	/**
 	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
@@ -113,7 +113,7 @@ 
 	 * @param   array     	$param          Associative array containing label content and optional parameters
 	 * @return  void
 	 */
-	abstract function addSticker(&$pdf,$outputlangs,$param);
+	abstract function addSticker(&$pdf, $outputlangs, $param);
 	
 	/**
 	 * Methode qui permet de modifier la taille des caracteres
@@ -123,12 +123,12 @@ 
 	 * @param    int        $pt    point
 	 * @return   void
 	 */
-	function Set_Char_Size(&$pdf,$pt)
+	function Set_Char_Size(&$pdf, $pt)
 	{
 		if ($pt > 3) {
 			$this->_Char_Size = $pt;
 			$this->_Line_Height = $this->_Get_Height_Chars($pt);
-			$pdf->SetFont('','',$pt);
+			$pdf->SetFont('', '', $pt);
 		}
 	}	
 
@@ -144,30 +144,30 @@ 
 	 * @param 	int		$nbPointilles		Nb pointilles
 	 * @return	void
 	 */
-    function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15)
+    function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)
 	{
 		$pdf->SetLineWidth($epaisseur);
-		$length=abs($x1-$x2);
-		$hauteur=abs($y1-$y2);
-		if($length>$hauteur) {
-			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
+		$length = abs($x1 - $x2);
+		$hauteur = abs($y1 - $y2);
+		if ($length > $hauteur) {
+			$Pointilles = ($length / $nbPointilles) / 2; // taille des pointilles
 		}
 		else {
-			$Pointilles=($hauteur/$nbPointilles)/2;
+			$Pointilles = ($hauteur / $nbPointilles) / 2;
 		}
-		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($x2-1)) {
-		$pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point
-		$pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point
+		for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) {
+			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
+				if ($j <= ($x2 - 1)) {
+		$pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point
+		$pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
-		for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($y2-1)) {
-		$pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point
-		$pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point
+		for ($i = $y1; $i <= $y2; $i += $Pointilles + $Pointilles) {
+			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
+				if ($j <= ($y2 - 1)) {
+		$pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point
+		$pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
@@ -185,26 +185,26 @@ 
 	 * @param int	$taille             Size
 	 * @return void
 	 */
-	function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4)
+	function _Croix(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $taille = 4)
 	{
-		$pdf->SetDrawColor(192,192,192);
+		$pdf->SetDrawColor(192, 192, 192);
 
 		$pdf->SetLineWidth($epaisseur);
-		$lg=$taille/2;
+		$lg = $taille / 2;
 		// croix haut gauche
-		$pdf->Line($x1,$y1-$lg,$x1,$y1+$lg);
-		$pdf->Line($x1-$lg,$y1,$x1+$lg,$y1);
+		$pdf->Line($x1, $y1 - $lg, $x1, $y1 + $lg);
+		$pdf->Line($x1 - $lg, $y1, $x1 + $lg, $y1);
 		// croix bas gauche
-		$pdf->Line($x1,$y2-$lg,$x1,$y2+$lg);
-		$pdf->Line($x1-$lg,$y2,$x1+$lg,$y2);
+		$pdf->Line($x1, $y2 - $lg, $x1, $y2 + $lg);
+		$pdf->Line($x1 - $lg, $y2, $x1 + $lg, $y2);
 		// croix haut droit
-		$pdf->Line($x2,$y1-$lg,$x2,$y1+$lg);
-		$pdf->Line($x2-$lg,$y1,$x2+$lg,$y1);
+		$pdf->Line($x2, $y1 - $lg, $x2, $y1 + $lg);
+		$pdf->Line($x2 - $lg, $y1, $x2 + $lg, $y1);
 		// croix bas droit
-		$pdf->Line($x2,$y2-$lg,$x2,$y2+$lg);
-		$pdf->Line($x2-$lg,$y2,$x2+$lg,$y2);
+		$pdf->Line($x2, $y2 - $lg, $x2, $y2 + $lg);
+		$pdf->Line($x2 - $lg, $y2, $x2 + $lg, $y2);
 
-		$pdf->SetDrawColor(0,0,0);
+		$pdf->SetDrawColor(0, 0, 0);
 	}
 
 	/**
@@ -216,7 +216,7 @@ 
 	 * @param string    $dest   to
 	 * @return float    value   value after conversion
 	 */
-	function _Convert_Metric ($value, $src, $dest)
+	function _Convert_Metric($value, $src, $dest)
 	{
 		if ($src != $dest) {
 			$tab['in'] = 39.37008;
@@ -253,7 +253,7 @@ 
 	 */
 	function _Set_Format(&$pdf, $format)  
 	{
-		$this->_Metric 	= $format['metric'];
+		$this->_Metric = $format['metric'];
 		$this->_Avery_Name 	= $format['name'];
 		$this->_Avery_Code	= $format['code'];
 		$this->_Margin_Left	= $this->_Convert_Metric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);

Braces +1 added lines, -2 removed lines

@@ -151,8 +151,7 @@
 		$hauteur=abs($y1-$y2);
 		if($length>$hauteur) {
 			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
-		}
-		else {
+		} else {
 			$Pointilles=($hauteur/$nbPointilles)/2;
 		}
 		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {