alxarafe / alixar

dolibarr/htdocs/core/triggers/dolibarrtriggers.class.php

Indentation +122 added lines, -122 removed lines

@@ -21,129 +21,129 @@
 abstract class DolibarrTriggers
 {
 
-	/**
-	 * Database handler
-	 * @var DoliDB
-	 */
-	protected $db;
-
-	/**
-	 * Name of the trigger
-	 * @var mixed|string
-	 */
-	public $name = '';
-
-	/**
-	 * Description of the trigger
-	 * @var string
-	 */
-	public $description = '';
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DEVELOPMENT;
-
-	/**
-	 * Image of the trigger
-	 * @var string
-	 */
-	public $picto = 'technic';
-
-	/**
-	 * Category of the trigger
-	 * @var string
-	 */
-	public $family = '';
-
-	/**
-	 * Error reported by the trigger
-	 * @var string
-	 * @deprecated Use $this->errors
-	 * @see errors
-	 */
-	public $error = '';
-
-	/**
-	 * Errors reported by the trigger
-	 * @var array
-	 */
-	public $errors = array();
-
-	const VERSION_DEVELOPMENT = 'development';
-	const VERSION_EXPERIMENTAL = 'experimental';
-	const VERSION_DOLIBARR = 'dolibarr';
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDB $db Database handler
-	 */
+    /**
+     * Database handler
+     * @var DoliDB
+     */
+    protected $db;
+
+    /**
+     * Name of the trigger
+     * @var mixed|string
+     */
+    public $name = '';
+
+    /**
+     * Description of the trigger
+     * @var string
+     */
+    public $description = '';
+
+    /**
+     * Version of the trigger
+     * @var string
+     */
+    public $version = self::VERSION_DEVELOPMENT;
+
+    /**
+     * Image of the trigger
+     * @var string
+     */
+    public $picto = 'technic';
+
+    /**
+     * Category of the trigger
+     * @var string
+     */
+    public $family = '';
+
+    /**
+     * Error reported by the trigger
+     * @var string
+     * @deprecated Use $this->errors
+     * @see errors
+     */
+    public $error = '';
+
+    /**
+     * Errors reported by the trigger
+     * @var array
+     */
+    public $errors = array();
+
+    const VERSION_DEVELOPMENT = 'development';
+    const VERSION_EXPERIMENTAL = 'experimental';
+    const VERSION_DOLIBARR = 'dolibarr';
+
+    /**
+     * Constructor
+     *
+     * @param DoliDB $db Database handler
+     */
     public function __construct(DoliDB $db)
     {
 
-		$this->db = $db;
-
-		if (empty($this->name))
-		{
-			$this->name = preg_replace('/^Interface/i', '', get_class($this));
-		}
-	}
-
-	/**
-	 * Returns the name of the trigger file
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Returns the description of trigger file
-	 *
-	 * @return string
-	 */
-	public function getDesc()
-	{
-		return $this->description;
-	}
-
-	/**
-	 * Returns the version of the trigger file
-	 *
-	 * @return string Version of trigger file
-	 */
-	public function getVersion()
-	{
-		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == self::VERSION_DEVELOPMENT) {
-			return $langs->trans("VersionDevelopment");
-		} elseif ($this->version == self::VERSION_EXPERIMENTAL) {
-			return $langs->trans("VersionExperimental");
-		} elseif ($this->version == self::VERSION_DOLIBARR) {
-			return DOL_VERSION;
-		} elseif ($this->version) {
-			return $this->version;
-		} else {
-			return $langs->trans("Unknown");
-		}
-	}
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User		    $user       Object user
-	 * @param Translate 	$langs      Object langs
-	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
+        $this->db = $db;
+
+        if (empty($this->name))
+        {
+            $this->name = preg_replace('/^Interface/i', '', get_class($this));
+        }
+    }
+
+    /**
+     * Returns the name of the trigger file
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Returns the description of trigger file
+     *
+     * @return string
+     */
+    public function getDesc()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Returns the version of the trigger file
+     *
+     * @return string Version of trigger file
+     */
+    public function getVersion()
+    {
+        global $langs;
+        $langs->load("admin");
+
+        if ($this->version == self::VERSION_DEVELOPMENT) {
+            return $langs->trans("VersionDevelopment");
+        } elseif ($this->version == self::VERSION_EXPERIMENTAL) {
+            return $langs->trans("VersionExperimental");
+        } elseif ($this->version == self::VERSION_DOLIBARR) {
+            return DOL_VERSION;
+        } elseif ($this->version) {
+            return $this->version;
+        } else {
+            return $langs->trans("Unknown");
+        }
+    }
+
+    /**
+     * Function called when a Dolibarrr business event is done.
+     * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+     *
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+     */
+    abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
 }

dolibarr/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php

Indentation +219 added lines, -219 removed lines

@@ -107,233 +107,233 @@
      */
     public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
-		$ok = 0;
-
-    	switch ($action) {
-    		case 'TICKET_ASSIGNED':
-	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-
-	            if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id)
-	            {
-	                $userstat = new User($this->db);
-	                $res = $userstat->fetch($object->fk_user_assign);
-	                if ($res > 0)
-	                {
-	                	if (empty($conf->global->TICKET_DISABLE_ALL_MAILS))
-	                	{
-	                		// Init to avoid errors
-	                		$filepath = array();
-	                		$filename = array();
-	                		$mimetype = array();
-
-	                		// Send email to assigned user
-		                    $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketAssignedToYou');
-		                    $message = '<p>' . $langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname)) . "</p>";
-		                    $message .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
-		                    $message .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
-		                    $message .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
-		                    $message .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
-		                    // Extrafields
-		                    if (is_array($object->array_options) && count($object->array_options) > 0) {
-		                        foreach ($object->array_options as $key => $value) {
-	                                $message .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
-		                        }
-		                    }
-
-		                    $message .= '</ul>';
-		                    $message .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
-		                    $message .= '<p><a href="' . dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
-
-		                    $sendto = $userstat->email;
-		                    $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>';
-
-	                        $message = dol_nl2br($message);
-
-	                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-	                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-	                        }
-	                        include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
-		                    $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
-		                    if ($mailfile->error) {
-	                            setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-		                    } else {
-		                        $result = $mailfile->sendfile();
-		                    }
-	                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-	                        }
-	                	}
+        $ok = 0;
+
+        switch ($action) {
+            case 'TICKET_ASSIGNED':
+                dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+
+                if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id)
+                {
+                    $userstat = new User($this->db);
+                    $res = $userstat->fetch($object->fk_user_assign);
+                    if ($res > 0)
+                    {
+                        if (empty($conf->global->TICKET_DISABLE_ALL_MAILS))
+                        {
+                            // Init to avoid errors
+                            $filepath = array();
+                            $filename = array();
+                            $mimetype = array();
+
+                            // Send email to assigned user
+                            $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketAssignedToYou');
+                            $message = '<p>' . $langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname)) . "</p>";
+                            $message .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
+                            $message .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
+                            $message .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
+                            $message .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
+                            // Extrafields
+                            if (is_array($object->array_options) && count($object->array_options) > 0) {
+                                foreach ($object->array_options as $key => $value) {
+                                    $message .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+                                }
+                            }
+
+                            $message .= '</ul>';
+                            $message .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
+                            $message .= '<p><a href="' . dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
+
+                            $sendto = $userstat->email;
+                            $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>';
+
+                            $message = dol_nl2br($message);
+
+                            if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                                $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+                                $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+                            }
+                            include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+                            $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
+                            if ($mailfile->error) {
+                                setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+                            } else {
+                                $result = $mailfile->sendfile();
+                            }
+                            if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                                $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+                            }
+                        }
 
                         $ok = 1;
-	                }
-	                else
-	                {
-	                	$this->error = $userstat->error;
-	                	$this->errors = $userstat->errors;
-	                }
-	            }
-	            break;
-
-    		case 'TICKET_CREATE':
-	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-
-	            $langs->load('ticket');
-
-	            $object->fetch('', $object->track_id);	// Should be useless
-
-
-	            // Send email to notification email
-
-	            if (empty($conf->global->TICKET_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']))
-	            {
-		            $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
-
-		            if ($sendto)
-					{
-						// Init to avoid errors
-						$filepath = array();
-						$filename = array();
-						$mimetype = array();
-
-						/* Send email to admin */
-			            $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
-			            $message_admin= $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
-			            $message_admin.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('From').' : '.( $object->email_from ? $object->email_from : ( $object->fk_user_create > 0 ? $langs->trans('Internal') : '') ).'</li>';
-			            // Extrafields
-			            if (is_array($object->array_options) && count($object->array_options) > 0) {
-			                foreach ($object->array_options as $key => $value) {
-			                      $message_admin.='<li>'.$langs->trans($key).' : '.$value.'</li>';
-			                }
-			            }
-			            $message_admin.='</ul>';
-
-			            if ($object->fk_soc > 0) {
-			                      $object->fetch_thirdparty();
-			                      $message_admin.='<p>'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'</p>';
-			            }
-
-			            $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $message_admin.='<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
-
-			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
-			            $replyto = $from;
-
-		                $message_admin = dol_nl2br($message_admin);
-
-		                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-		                    $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-		                }
-		                include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-			            $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
-			            if ($mailfile->error) {
-		                    dol_syslog($mailfile->error, LOG_DEBUG);
-			            } else {
-			                     $result=$mailfile->sendfile();
-			            }
-		                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-		                }
-					}
-	            }
-
-				// Send email to customer
-
-				if (empty($conf->global->TICKET_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create)
-	            {
-		            $sendto = '';
-		            if (empty($user->socid) && empty($user->email)) {
-		                      $object->fetch_thirdparty();
-		                      $sendto = $object->thirdparty->email;
-		            } else {
-		                $sendto = $user->email;
-		            }
-
-		            if ($sendto) {
-		            	// Init to avoid errors
-		            	$filepath = array();
-		            	$filename = array();
-		            	$mimetype = array();
-
-		            	$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
-			            $message_customer= $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
-			            $message_customer.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-
-			            // Extrafields
-			            foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
-			            {
-			            	$enabled = 1;
-			            	if ($enabled && isset($this->attributes[$object->table_element]['list'][$key]))
-			            	{
-			            		$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
-			            	}
-			            	$perms = 1;
-			            	if ($perms && isset($this->attributes[$object->table_element]['perms'][$key]))
-			            	{
-			            		$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
-			            	}
-
-			            	$qualified = true;
-			            	if (empty($enabled)) $qualified = false;
-			            	if (empty($perms)) $qualified = false;
-
-			            	if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
-			            }
-
-			            $message_customer.='</ul>';
-			            $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE?$conf->global->TICKET_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
-			            $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
-			            $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
-
-			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
-			            $replyto = $from;
-
-	                    $message_customer = dol_nl2br($message_customer);
-
-	                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-	                        $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-	                    }
-	                    include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-			            $mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
-			            if ($mailfile->error) {
-	                        dol_syslog($mailfile->error, LOG_DEBUG);
-			            } else {
-			                      $result=$mailfile->sendfile();
-			            }
-	                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-	                    }
-	                }
-	            }
+                    }
+                    else
+                    {
+                        $this->error = $userstat->error;
+                        $this->errors = $userstat->errors;
+                    }
+                }
+                break;
+
+            case 'TICKET_CREATE':
+                dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+
+                $langs->load('ticket');
+
+                $object->fetch('', $object->track_id);	// Should be useless
+
+
+                // Send email to notification email
+
+                if (empty($conf->global->TICKET_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']))
+                {
+                    $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+
+                    if ($sendto)
+                    {
+                        // Init to avoid errors
+                        $filepath = array();
+                        $filename = array();
+                        $mimetype = array();
+
+                        /* Send email to admin */
+                        $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
+                        $message_admin= $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
+                        $message_admin.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+                        $message_admin.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+                        $message_admin.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+                        $message_admin.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+                        $message_admin.='<li>'.$langs->trans('From').' : '.( $object->email_from ? $object->email_from : ( $object->fk_user_create > 0 ? $langs->trans('Internal') : '') ).'</li>';
+                        // Extrafields
+                        if (is_array($object->array_options) && count($object->array_options) > 0) {
+                            foreach ($object->array_options as $key => $value) {
+                                    $message_admin.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+                            }
+                        }
+                        $message_admin.='</ul>';
+
+                        if ($object->fk_soc > 0) {
+                                    $object->fetch_thirdparty();
+                                    $message_admin.='<p>'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'</p>';
+                        }
+
+                        $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+                        $message_admin.='<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+
+                        $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+                        $replyto = $from;
+
+                        $message_admin = dol_nl2br($message_admin);
+
+                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+                        }
+                        include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+                        $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
+                        if ($mailfile->error) {
+                            dol_syslog($mailfile->error, LOG_DEBUG);
+                        } else {
+                                    $result=$mailfile->sendfile();
+                        }
+                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+                        }
+                    }
+                }
+
+                // Send email to customer
+
+                if (empty($conf->global->TICKET_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create)
+                {
+                    $sendto = '';
+                    if (empty($user->socid) && empty($user->email)) {
+                                $object->fetch_thirdparty();
+                                $sendto = $object->thirdparty->email;
+                    } else {
+                        $sendto = $user->email;
+                    }
+
+                    if ($sendto) {
+                        // Init to avoid errors
+                        $filepath = array();
+                        $filename = array();
+                        $mimetype = array();
+
+                        $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
+                        $message_customer= $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
+                        $message_customer.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+                        $message_customer.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+                        $message_customer.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+                        $message_customer.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+
+                        // Extrafields
+                        foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
+                        {
+                            $enabled = 1;
+                            if ($enabled && isset($this->attributes[$object->table_element]['list'][$key]))
+                            {
+                                $enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
+                            }
+                            $perms = 1;
+                            if ($perms && isset($this->attributes[$object->table_element]['perms'][$key]))
+                            {
+                                $perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
+                            }
+
+                            $qualified = true;
+                            if (empty($enabled)) $qualified = false;
+                            if (empty($perms)) $qualified = false;
+
+                            if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+                        }
+
+                        $message_customer.='</ul>';
+                        $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+                        $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE?$conf->global->TICKET_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+                        $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
+                        $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
+
+                        $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+                        $replyto = $from;
+
+                        $message_customer = dol_nl2br($message_customer);
+
+                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+                        }
+                        include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+                        $mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
+                        if ($mailfile->error) {
+                            dol_syslog($mailfile->error, LOG_DEBUG);
+                        } else {
+                                    $result=$mailfile->sendfile();
+                        }
+                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+                        }
+                    }
+                }
                 $ok = 1;
-	            break;
+                break;
 
             case 'TICKET_DELETE':
-            	dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-            	break;
+                dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+                break;
 
-           	case 'TICKET_MODIFY':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-           		break;
+                case 'TICKET_MODIFY':
+                   dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+                    break;
 
-           	case 'TICKET_MARK_READ':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-           		break;
+                case 'TICKET_MARK_READ':
+                   dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+                    break;
 
-           	case 'TICKET_CLOSE':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-           		break;
-    	}
+                case 'TICKET_CLOSE':
+                   dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+                    break;
+        }
 
 
         return $ok;

Spacing +42 added lines, -42 removed lines

@@ -111,7 +111,7 @@ 
 
     	switch ($action) {
     		case 'TICKET_ASSIGNED':
-	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+	            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 	            if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id)
 	            {
@@ -127,25 +127,25 @@ 
 	                		$mimetype = array();
 
 	                		// Send email to assigned user
-		                    $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketAssignedToYou');
-		                    $message = '<p>' . $langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname)) . "</p>";
-		                    $message .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
-		                    $message .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
-		                    $message .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
-		                    $message .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
+		                    $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketAssignedToYou');
+		                    $message = '<p>'.$langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname))."</p>";
+		                    $message .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+		                    $message .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+		                    $message .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+		                    $message .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
 		                    // Extrafields
 		                    if (is_array($object->array_options) && count($object->array_options) > 0) {
 		                        foreach ($object->array_options as $key => $value) {
-	                                $message .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+	                                $message .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
 		                        }
 		                    }
 
 		                    $message .= '</ul>';
-		                    $message .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
-		                    $message .= '<p><a href="' . dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
+		                    $message .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+		                    $message .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
 		                    $sendto = $userstat->email;
-		                    $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>';
+		                    $from = dolGetFirstLastname($user->firstname, $user->lastname).'<'.$user->email.'>';
 
 	                        $message = dol_nl2br($message);
 
@@ -153,7 +153,7 @@ 
 	                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 	                        }
-	                        include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+	                        include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 		                    $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
 		                    if ($mailfile->error) {
 	                            setEventMessages($mailfile->error, $mailfile->errors, 'errors');
@@ -176,11 +176,11 @@ 
 	            break;
 
     		case 'TICKET_CREATE':
-	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+	            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 	            $langs->load('ticket');
 
-	            $object->fetch('', $object->track_id);	// Should be useless
+	            $object->fetch('', $object->track_id); // Should be useless
 
 
 	            // Send email to notification email
@@ -198,27 +198,27 @@ 
 
 						/* Send email to admin */
 			            $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
-			            $message_admin= $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
-			            $message_admin.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('From').' : '.( $object->email_from ? $object->email_from : ( $object->fk_user_create > 0 ? $langs->trans('Internal') : '') ).'</li>';
+			            $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
+			            $message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('From').' : '.($object->email_from ? $object->email_from : ($object->fk_user_create > 0 ? $langs->trans('Internal') : '')).'</li>';
 			            // Extrafields
 			            if (is_array($object->array_options) && count($object->array_options) > 0) {
 			                foreach ($object->array_options as $key => $value) {
-			                      $message_admin.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			                      $message_admin .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
 			                }
 			            }
-			            $message_admin.='</ul>';
+			            $message_admin .= '</ul>';
 
 			            if ($object->fk_soc > 0) {
 			                      $object->fetch_thirdparty();
-			                      $message_admin.='<p>'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'</p>';
+			                      $message_admin .= '<p>'.$langs->trans('Company').' : '.$object->thirdparty->name.'</p>';
 			            }
 
-			            $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $message_admin.='<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+			            $message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+			            $message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
 			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 			            $replyto = $from;
@@ -234,7 +234,7 @@ 
 			            if ($mailfile->error) {
 		                    dol_syslog($mailfile->error, LOG_DEBUG);
 			            } else {
-			                     $result=$mailfile->sendfile();
+			                     $result = $mailfile->sendfile();
 			            }
 		                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
@@ -261,11 +261,11 @@ 
 		            	$mimetype = array();
 
 		            	$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
-			            $message_customer= $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
-			            $message_customer.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+			            $message_customer = $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
+			            $message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+			            $message_customer .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+			            $message_customer .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+			            $message_customer .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
 
 			            // Extrafields
 			            foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
@@ -285,14 +285,14 @@ 
 			            	if (empty($enabled)) $qualified = false;
 			            	if (empty($perms)) $qualified = false;
 
-			            	if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			            	if ($qualified) $message_customer .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
 			            }
 
-			            $message_customer.='</ul>';
-			            $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE?$conf->global->TICKET_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
-			            $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
-			            $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
+			            $message_customer .= '</ul>';
+			            $message_customer .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+			            $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+			            $message_customer .= '<p>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
+			            $message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
 
 			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 			            $replyto = $from;
@@ -308,7 +308,7 @@ 
 			            if ($mailfile->error) {
 	                        dol_syslog($mailfile->error, LOG_DEBUG);
 			            } else {
-			                      $result=$mailfile->sendfile();
+			                      $result = $mailfile->sendfile();
 			            }
 	                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
@@ -319,19 +319,19 @@ 
 	            break;
 
             case 'TICKET_DELETE':
-            	dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+            	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             	break;
 
            	case 'TICKET_MODIFY':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+           		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
            		break;
 
            	case 'TICKET_MARK_READ':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+           		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
            		break;
 
            	case 'TICKET_CLOSE':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+           		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
            		break;
     	}
 

Braces +10 added lines, -5 removed lines

@@ -166,8 +166,7 @@ 
 	                	}
 
                         $ok = 1;
-	                }
-	                else
+	                } else
 	                {
 	                	$this->error = $userstat->error;
 	                	$this->errors = $userstat->errors;
@@ -282,10 +281,16 @@ 
 			            	}
 
 			            	$qualified = true;
-			            	if (empty($enabled)) $qualified = false;
-			            	if (empty($perms)) $qualified = false;
+			            	if (empty($enabled)) {
+			            	    $qualified = false;
+			            	}
+			            	if (empty($perms)) {
+			            	    $qualified = false;
+			            	}
 
-			            	if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			            	if ($qualified) {
+			            	    $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			            	}
 			            }
 
 			            $message_customer.='</ul>';

dolibarr/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

Indentation +111 added lines, -111 removed lines

@@ -30,121 +30,121 @@
  */
 class InterfaceActionsBlockedLog extends DolibarrTriggers
 {
-	public $family = 'system';
-	public $description = "Triggers of this module add action for BlockedLog module.";
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'technic';
-
-	/**
-	 * Function called on Dolibarrr payment or invoice event.
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User		    $user       Object user
-	 * @param Translate 	$langs      Object langs
-	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-	{
-		if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
-
-		// Test if event/record is qualified
-		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (! in_array($object->element, $listofqualifiedelement)) return 1;
-
-		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-		$b=new BlockedLog($this->db);
-
-		// Tracked events
-		if (! in_array($action, array_keys($b->trackedevents)))
-		{
-			return 0;
-		}
-
-		// Event/record is qualified
-		$qualified = 0;
-		$amounts = 0;
-		if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
-			|| $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
-			|| $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
-			|| $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
-			|| $action==='CASHCONTROL_VALIDATE'
-			|| (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
-		)
-		{
-			$qualified++;
-
-			if (in_array($action, array(
-				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
-			elseif ($action == 'CASHCONTROL_VALIDATE')
-			{
-				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
-			}
-			else $amounts = (double) $object->total_ttc;
-		}
-		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
+    public $family = 'system';
+    public $description = "Triggers of this module add action for BlockedLog module.";
+
+    /**
+     * Version of the trigger
+     * @var string
+     */
+    public $version = self::VERSION_DOLIBARR;
+
+    /**
+     * @var string Image of the trigger
+     */
+    public $picto = 'technic';
+
+    /**
+     * Function called on Dolibarrr payment or invoice event.
+     *
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+     */
+    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+    {
+        if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+
+        // Test if event/record is qualified
+        $listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
+        if (! in_array($object->element, $listofqualifiedelement)) return 1;
+
+        dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+        require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+        $b=new BlockedLog($this->db);
+
+        // Tracked events
+        if (! in_array($action, array_keys($b->trackedevents)))
+        {
+            return 0;
+        }
+
+        // Event/record is qualified
+        $qualified = 0;
+        $amounts = 0;
+        if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
+            || $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
+            || $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
+            || $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
+            || $action==='CASHCONTROL_VALIDATE'
+            || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
+        )
+        {
+            $qualified++;
+
+            if (in_array($action, array(
+                'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
+                'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
+            elseif ($action == 'CASHCONTROL_VALIDATE')
+            {
+                $amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
+            }
+            else $amounts = (double) $object->total_ttc;
+        }
+        /*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
 		{
 			$qualified++;
 			$amounts=  (double) $object->total_ttc;
 		}*/
-		if ($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_SUPPLIER_CREATE' || $action === 'DONATION_PAYMENT_CREATE'
-			|| $action === 'PAYMENT_CUSTOMER_DELETE' || $action === 'PAYMENT_SUPPLIER_DELETE' || $action === 'DONATION_PAYMENT_DELETE')
-		{
-			$qualified++;
-			$amounts = 0;
-			if(!empty($object->amounts)) {
-				foreach($object->amounts as $amount) {
-					$amounts += price2num($amount);
-				}
-			}
-		}
-		elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
-		{
-			$qualified++;
-			$amounts = (double) $object->amount;
-		}
-
-		// Another protection.
-		// May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
-		if (! $qualified)
-		{
-			return 0; // not implemented action log
-		}
-
-		$result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
-
-		if ($result < 0)
-		{
-			$this->error = $b->error;
-			$this->errors = $b->errors;
-			return -1;
-		}
-
-		$res = $b->create($user);
-
-		if ($res < 0)
-		{
-			$this->error = $b->error;
-			$this->errors = $b->errors;
-			return -1;
-		}
-		else
-		{
-			return 1;
-		}
+        if ($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_SUPPLIER_CREATE' || $action === 'DONATION_PAYMENT_CREATE'
+            || $action === 'PAYMENT_CUSTOMER_DELETE' || $action === 'PAYMENT_SUPPLIER_DELETE' || $action === 'DONATION_PAYMENT_DELETE')
+        {
+            $qualified++;
+            $amounts = 0;
+            if(!empty($object->amounts)) {
+                foreach($object->amounts as $amount) {
+                    $amounts += price2num($amount);
+                }
+            }
+        }
+        elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
+        {
+            $qualified++;
+            $amounts = (double) $object->amount;
+        }
+
+        // Another protection.
+        // May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
+        if (! $qualified)
+        {
+            return 0; // not implemented action log
+        }
+
+        $result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
+
+        if ($result < 0)
+        {
+            $this->error = $b->error;
+            $this->errors = $b->errors;
+            return -1;
+        }
+
+        $res = $b->create($user);
+
+        if ($res < 0)
+        {
+            $this->error = $b->error;
+            $this->errors = $b->errors;
+            return -1;
+        }
+        else
+        {
+            return 1;
+        }
     }
 }

Spacing +17 added lines, -17 removed lines

@@ -56,19 +56,19 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->blockedlog->enabled)) return 0; // Module not active, we do nothing
 
 		// Test if event/record is qualified
 		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (! in_array($object->element, $listofqualifiedelement)) return 1;
+		if (!in_array($object->element, $listofqualifiedelement)) return 1;
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-		$b=new BlockedLog($this->db);
+		$b = new BlockedLog($this->db);
 
 		// Tracked events
-		if (! in_array($action, array_keys($b->trackedevents)))
+		if (!in_array($action, array_keys($b->trackedevents)))
 		{
 			return 0;
 		}
@@ -76,19 +76,19 @@ 
 		// Event/record is qualified
 		$qualified = 0;
 		$amounts = 0;
-		if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
-			|| $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
-			|| $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
-			|| $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
-			|| $action==='CASHCONTROL_VALIDATE'
-			|| (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
+		if ($action === 'BILL_VALIDATE' || $action === 'BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
+			|| $action === 'BILL_SUPPLIER_VALIDATE' || $action === 'BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
+			|| $action === 'MEMBER_SUBSCRIPTION_CREATE' || $action === 'MEMBER_SUBSCRIPTION_MODIFY' || $action === 'MEMBER_SUBSCRIPTION_DELETE'
+			|| $action === 'DON_VALIDATE' || $action === 'DON_MODIFY' || $action === 'DON_DELETE'
+			|| $action === 'CASHCONTROL_VALIDATE'
+			|| (in_array($object->element, array('facture', 'suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture', 'suplier_invoice')) && $action === 'DOC_PREVIEW')
 		)
 		{
 			$qualified++;
 
 			if (in_array($action, array(
-				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
+				'MEMBER_SUBSCRIPTION_CREATE', 'MEMBER_SUBSCRIPTION_MODIFY', 'MEMBER_SUBSCRIPTION_DELETE',
+				'DON_VALIDATE', 'DON_MODIFY', 'DON_DELETE'))) $amounts = (double) $object->amount;
 			elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
@@ -106,13 +106,13 @@ 
 		{
 			$qualified++;
 			$amounts = 0;
-			if(!empty($object->amounts)) {
-				foreach($object->amounts as $amount) {
+			if (!empty($object->amounts)) {
+				foreach ($object->amounts as $amount) {
 					$amounts += price2num($amount);
 				}
 			}
 		}
-		elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
+		elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
 		{
 			$qualified++;
 			$amounts = (double) $object->amount;
@@ -120,12 +120,12 @@ 
 
 		// Another protection.
 		// May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
-		if (! $qualified)
+		if (!$qualified)
 		{
 			return 0; // not implemented action log
 		}
 
-		$result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
+		$result = $b->setObjectData($object, $action, $amounts, $user); // Set field date_object, ref_object, fk_object, element, object_data
 
 		if ($result < 0)
 		{

Braces +14 added lines, -9 removed lines

@@ -56,11 +56,16 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->blockedlog->enabled)) {
+		    return 0;
+		}
+		// Module not active, we do nothing
 
 		// Test if event/record is qualified
 		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (! in_array($object->element, $listofqualifiedelement)) return 1;
+		if (! in_array($object->element, $listofqualifiedelement)) {
+		    return 1;
+		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -88,12 +93,14 @@ 
 
 			if (in_array($action, array(
 				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
-			elseif ($action == 'CASHCONTROL_VALIDATE')
+				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) {
+			    $amounts = (double) $object->amount;
+			} elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
+			} else {
+			    $amounts = (double) $object->total_ttc;
 			}
-			else $amounts = (double) $object->total_ttc;
 		}
 		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
@@ -111,8 +118,7 @@ 
 					$amounts += price2num($amount);
 				}
 			}
-		}
-		elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
+		} elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
 		{
 			$qualified++;
 			$amounts = (double) $object->amount;
@@ -141,8 +147,7 @@ 
 			$this->error = $b->error;
 			$this->errors = $b->errors;
 			return -1;
-		}
-		else
+		} else
 		{
 			return 1;
 		}

dolibarr/htdocs/core/db/Database.interface.php

Indentation +390 added lines, -390 removed lines

@@ -25,479 +25,479 @@
  */
 interface Database
 {
-	/**
-	 * Format a SQL IF
-	 *
-	 * @param   string $test Test string (example: 'cd.statut=0', 'field IS NULL')
-	 * @param   string $resok resultat si test egal
-	 * @param   string $resko resultat si test non egal
-	 * @return	string                SQL string
-	 */
-	function ifsql($test, $resok, $resko);
+    /**
+     * Format a SQL IF
+     *
+     * @param   string $test Test string (example: 'cd.statut=0', 'field IS NULL')
+     * @param   string $resok resultat si test egal
+     * @param   string $resko resultat si test non egal
+     * @return	string                SQL string
+     */
+    function ifsql($test, $resok, $resko);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return datas as an array
-	 *
-	 * @param   resource $resultset Resultset of request
-	 * @return  array                    Array
-	 */
+    /**
+     * Return datas as an array
+     *
+     * @param   resource $resultset Resultset of request
+     * @return  array                    Array
+     */
     function fetch_row($resultset);
     // phpcs:enable
 
-	/**
-	 * Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
-	 * Function to use to build INSERT, UPDATE or WHERE predica
-	 *
-	 * @param   int		$param 		Date TMS to convert
-	 * @return  string            	Date in a string YYYYMMDDHHMMSS
-	 */
-	function idate($param);
-
-	/**
-	 * Return last error code
-	 *
-	 * @return  string    lasterrno
-	 */
-	function lasterrno();
-
-	/**
-	 * Start transaction
-	 *
-	 * @return  int         1 if transaction successfuly opened or already opened, 0 if error
-	 */
-	function begin();
+    /**
+     * Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
+     * Function to use to build INSERT, UPDATE or WHERE predica
+     *
+     * @param   int		$param 		Date TMS to convert
+     * @return  string            	Date in a string YYYYMMDDHHMMSS
+     */
+    function idate($param);
+
+    /**
+     * Return last error code
+     *
+     * @return  string    lasterrno
+     */
+    function lasterrno();
+
+    /**
+     * Start transaction
+     *
+     * @return  int         1 if transaction successfuly opened or already opened, 0 if error
+     */
+    function begin();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create a new database
-	 * Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
-	 * We force to create database with charset this->forcecharset and collate this->forcecollate
-	 *
-	 * @param   string 		$database 		Database name to create
-	 * @param   string 		$charset 		Charset used to store data
-	 * @param   string 		$collation 		Charset used to sort data
-	 * @param   string 		$owner 			Username of database owner
-	 * @return  resource                	resource defined if OK, null if KO
-	 */
+    /**
+     * Create a new database
+     * Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
+     * We force to create database with charset this->forcecharset and collate this->forcecollate
+     *
+     * @param   string 		$database 		Database name to create
+     * @param   string 		$charset 		Charset used to store data
+     * @param   string 		$collation 		Charset used to sort data
+     * @param   string 		$owner 			Username of database owner
+     * @return  resource                	resource defined if OK, null if KO
+     */
     function DDLCreateDb($database, $charset = '', $collation = '', $owner = '');
     // phpcs:enable
 
-	/**
-	 * Return version of database server into an array
-	 *
-	 * @return	array        Version array
-	 */
-	function getVersionArray();
-
-	/**
-	 *  Convert a SQL request in Mysql syntax to native syntax
-	 *
-	 * @param   string $line SQL request line to convert
-	 * @param   string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-	 * @return  string        SQL request line converted
-	 */
-	static function convertSQLFromMysql($line, $type = 'ddl');
+    /**
+     * Return version of database server into an array
+     *
+     * @return	array        Version array
+     */
+    function getVersionArray();
+
+    /**
+     *  Convert a SQL request in Mysql syntax to native syntax
+     *
+     * @param   string $line SQL request line to convert
+     * @param   string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+     * @return  string        SQL request line converted
+     */
+    static function convertSQLFromMysql($line, $type = 'ddl');
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
-	 *
-	 * @param   resource $resultset Curseur de la requete voulue
-	 * @return 	int            Nombre de lignes
-	 * @see    	num_rows
-	 */
+    /**
+     * Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
+     *
+     * @param   resource $resultset Curseur de la requete voulue
+     * @return 	int            Nombre de lignes
+     * @see    	num_rows
+     */
     function affected_rows($resultset);
     // phpcs:enable
 
-	/**
-	 * Return description of last error
-	 *
-	 * @return  string        Error text
-	 */
-	function error();
+    /**
+     * Return description of last error
+     *
+     * @return  string        Error text
+     */
+    function error();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  List tables into a database
-	 *
-	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
-	 *  @return	array					List of tables in an array
-	 */
+    /**
+     *  List tables into a database
+     *
+     *  @param	string		$database	Name of database
+     *  @param	string		$table		Nmae of table filter ('xxx%')
+     *  @return	array					List of tables in an array
+     */
     function DDLListTables($database, $table = '');
     // phpcs:enable
 
-	/**
-	 * Return last request executed with query()
-	 *
-	 * @return	string                    Last query
-	 */
-	function lastquery();
-
-	/**
-	 * Define sort criteria of request
-	 *
-	 * @param   string $sortfield List of sort fields
-	 * @param   string $sortorder Sort order
-	 * @return  string            String to provide syntax of a sort sql string
-	 */
-	function order($sortfield = null, $sortorder = null);
-
-	/**
-	 * Decrypt sensitive data in database
-	 *
-	 * @param    string $value Value to decrypt
-	 * @return   string                    Decrypted value if used
-	 */
-	function decrypt($value);
+    /**
+     * Return last request executed with query()
+     *
+     * @return	string                    Last query
+     */
+    function lastquery();
+
+    /**
+     * Define sort criteria of request
+     *
+     * @param   string $sortfield List of sort fields
+     * @param   string $sortorder Sort order
+     * @return  string            String to provide syntax of a sort sql string
+     */
+    function order($sortfield = null, $sortorder = null);
+
+    /**
+     * Decrypt sensitive data in database
+     *
+     * @param    string $value Value to decrypt
+     * @return   string                    Decrypted value if used
+     */
+    function decrypt($value);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return datas as an array
-	 *
-	 * @param   resource $resultset Resultset of request
-	 * @return  array                    Array
-	 */
+    /**
+     *    Return datas as an array
+     *
+     * @param   resource $resultset Resultset of request
+     * @return  array                    Array
+     */
     function fetch_array($resultset);
     // phpcs:enable
 
-	/**
-	 * Return last error label
-	 *
-	 * @return	string    lasterror
-	 */
-	function lasterror();
-
-	/**
-	 * Escape a string to insert data
-	 *
-	 * @param   string $stringtoencode String to escape
-	 * @return  string                        String escaped
-	 */
-	function escape($stringtoencode);
+    /**
+     * Return last error label
+     *
+     * @return	string    lasterror
+     */
+    function lasterror();
+
+    /**
+     * Escape a string to insert data
+     *
+     * @param   string $stringtoencode String to escape
+     * @return  string                        String escaped
+     */
+    function escape($stringtoencode);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Get last ID after an insert INSERT
-	 *
-	 * @param	string 	$tab 		Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
-	 * @param   string 	$fieldid 	Field name
-	 * @return  int                	Id of row
-	 */
+    /**
+     * Get last ID after an insert INSERT
+     *
+     * @param	string 	$tab 		Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
+     * @param   string 	$fieldid 	Field name
+     * @return  int                	Id of row
+     */
     function last_insert_id($tab, $fieldid = 'rowid');
     // phpcs:enable
 
-	/**
-	 *    Return full path of restore program
-	 *
-	 * @return        string        Full path of restore program
-	 */
-	function getPathOfRestore();
-
-	/**
-	 *    Annulation d'une transaction et retour aux anciennes valeurs
-	 *
-	 * @param	string $log Add more log to default log line
-	 * @return  int                1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
-	 */
-	function rollback($log = '');
-
-	/**
-	 * Execute a SQL request and return the resultset
-	 *
-	 * @param   string $query SQL query string
-	 * @param   int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
-	 *                            Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
-	 * @param   string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-	 * @return  resource                Resultset of answer
-	 */
-	function query($query, $usesavepoint = 0, $type = 'auto');
-
-	/**
-	 *    Connexion to server
-	 *
-	 * @param   string $host database server host
-	 * @param   string $login login
-	 * @param   string $passwd password
-	 * @param   string $name name of database (not used for mysql, used for pgsql)
-	 * @param   int    $port Port of database server
-	 * @return  resource            Database access handler
-	 * @see     close
-	 */
-	function connect($host, $login, $passwd, $name, $port = 0);
-
-	/**
-	 *    Define limits and offset of request
-	 *
-	 * @param   int $limit Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
-	 * @param   int $offset Numero of line from where starting fetch
-	 * @return  string            String with SQL syntax to add a limit and offset
-	 */
-	function plimit($limit = 0, $offset = 0);
-
-	/**
-	 * Return value of server parameters
-	 *
-	 * @param   string	$filter		Filter list on a particular value
-	 * @return  array				Array of key-values (key=>value)
-	 */
-	function getServerParametersValues($filter = '');
-
-	/**
-	 * Return value of server status
-	 *
-	 * @param   string $filter 		Filter list on a particular value
-	 * @return  array				Array of key-values (key=>value)
-	 */
-	function getServerStatusValues($filter = '');
-
-	/**
-	 * Return collation used in database
-	 *
-	 * @return  string        Collation value
-	 */
-	function getDefaultCollationDatabase();
+    /**
+     *    Return full path of restore program
+     *
+     * @return        string        Full path of restore program
+     */
+    function getPathOfRestore();
+
+    /**
+     *    Annulation d'une transaction et retour aux anciennes valeurs
+     *
+     * @param	string $log Add more log to default log line
+     * @return  int                1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
+     */
+    function rollback($log = '');
+
+    /**
+     * Execute a SQL request and return the resultset
+     *
+     * @param   string $query SQL query string
+     * @param   int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
+     *                            Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
+     * @param   string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+     * @return  resource                Resultset of answer
+     */
+    function query($query, $usesavepoint = 0, $type = 'auto');
+
+    /**
+     *    Connexion to server
+     *
+     * @param   string $host database server host
+     * @param   string $login login
+     * @param   string $passwd password
+     * @param   string $name name of database (not used for mysql, used for pgsql)
+     * @param   int    $port Port of database server
+     * @return  resource            Database access handler
+     * @see     close
+     */
+    function connect($host, $login, $passwd, $name, $port = 0);
+
+    /**
+     *    Define limits and offset of request
+     *
+     * @param   int $limit Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
+     * @param   int $offset Numero of line from where starting fetch
+     * @return  string            String with SQL syntax to add a limit and offset
+     */
+    function plimit($limit = 0, $offset = 0);
+
+    /**
+     * Return value of server parameters
+     *
+     * @param   string	$filter		Filter list on a particular value
+     * @return  array				Array of key-values (key=>value)
+     */
+    function getServerParametersValues($filter = '');
+
+    /**
+     * Return value of server status
+     *
+     * @param   string $filter 		Filter list on a particular value
+     * @return  array				Array of key-values (key=>value)
+     */
+    function getServerStatusValues($filter = '');
+
+    /**
+     * Return collation used in database
+     *
+     * @return  string        Collation value
+     */
+    function getDefaultCollationDatabase();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return number of lines for result of a SELECT
-	 *
-	 * @param   resource $resultset Resulset of requests
-	 * @return 	int                        Nb of lines
-	 * @see    	affected_rows
-	 */
+    /**
+     * Return number of lines for result of a SELECT
+     *
+     * @param   resource $resultset Resulset of requests
+     * @return 	int                        Nb of lines
+     * @see    	affected_rows
+     */
     function num_rows($resultset);
     // phpcs:enable
 
-	/**
-	 * Return full path of dump program
-	 *
-	 * @return        string        Full path of dump program
-	 */
-	function getPathOfDump();
-
-	/**
-	 * Return version of database client driver
-	 *
-	 * @return            string      Version string
-	 */
-	function getDriverInfo();
-
-	/**
-	 * Return generic error code of last operation.
-	 *
-	 * @return    string        Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
-	 */
-	function errno();
+    /**
+     * Return full path of dump program
+     *
+     * @return        string        Full path of dump program
+     */
+    function getPathOfDump();
+
+    /**
+     * Return version of database client driver
+     *
+     * @return            string      Version string
+     */
+    function getDriverInfo();
+
+    /**
+     * Return generic error code of last operation.
+     *
+     * @return    string        Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+     */
+    function errno();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create a table into database
-	 *
-	 * @param        string $table 			Name of table
-	 * @param        array 	$fields 		Tableau associatif [nom champ][tableau des descriptions]
-	 * @param        string $primary_key 	Nom du champ qui sera la clef primaire
-	 * @param        string $type 			Type de la table
-	 * @param        array 	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
-	 * @param        array 	$fulltext_keys 	Tableau des Nom de champs qui seront indexes en fulltext
-	 * @param        array $keys 			Tableau des champs cles noms => valeur
-	 * @return       int                    <0 if KO, >=0 if OK
-	 */
+    /**
+     * Create a table into database
+     *
+     * @param        string $table 			Name of table
+     * @param        array 	$fields 		Tableau associatif [nom champ][tableau des descriptions]
+     * @param        string $primary_key 	Nom du champ qui sera la clef primaire
+     * @param        string $type 			Type de la table
+     * @param        array 	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
+     * @param        array 	$fulltext_keys 	Tableau des Nom de champs qui seront indexes en fulltext
+     * @param        array $keys 			Tableau des champs cles noms => valeur
+     * @return       int                    <0 if KO, >=0 if OK
+     */
     function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null);
     // phpcs:enable
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Drop a table into database
-	 *
-	 * @param        string $table 			Name of table
-	 * @return       int                    <0 if KO, >=0 if OK
-	 */
+    /**
+     * Drop a table into database
+     *
+     * @param        string $table 			Name of table
+     * @return       int                    <0 if KO, >=0 if OK
+     */
     function DDLDropTable($table);
     // phpcs:enable
 
-	/**
-	 * Return list of available charset that can be used to store data in database
-	 *
-	 * @return        array        List of Charset
-	 */
-	function getListOfCharacterSet();
+    /**
+     * Return list of available charset that can be used to store data in database
+     *
+     * @return        array        List of Charset
+     */
+    function getListOfCharacterSet();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create a new field into table
-	 *
-	 * @param    string $table 				Name of table
-	 * @param    string $field_name 		Name of field to add
-	 * @param    string $field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
-	 * @param    string $field_position 	Optionnel ex.: "after champtruc"
-	 * @return   int                        <0 if KO, >0 if OK
-	 */
+    /**
+     * Create a new field into table
+     *
+     * @param    string $table 				Name of table
+     * @param    string $field_name 		Name of field to add
+     * @param    string $field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
+     * @param    string $field_position 	Optionnel ex.: "after champtruc"
+     * @return   int                        <0 if KO, >0 if OK
+     */
     function DDLAddField($table, $field_name, $field_desc, $field_position = "");
     // phpcs:enable
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Drop a field from table
-	 *
-	 * @param    string $table 				Name of table
-	 * @param    string $field_name 		Name of field to drop
-	 * @return   int                        <0 if KO, >0 if OK
-	 */
+    /**
+     * Drop a field from table
+     *
+     * @param    string $table 				Name of table
+     * @param    string $field_name 		Name of field to drop
+     * @return   int                        <0 if KO, >0 if OK
+     */
     function DDLDropField($table, $field_name);
     // phpcs:enable
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Update format of a field into a table
-	 *
-	 * @param    string 	$table 			Name of table
-	 * @param    string 	$field_name 	Name of field to modify
-	 * @param    string 	$field_desc 	Array with description of field format
-	 * @return   int                        <0 if KO, >0 if OK
-	 */
+    /**
+     * Update format of a field into a table
+     *
+     * @param    string 	$table 			Name of table
+     * @param    string 	$field_name 	Name of field to modify
+     * @param    string 	$field_desc 	Array with description of field format
+     * @return   int                        <0 if KO, >0 if OK
+     */
     function DDLUpdateField($table, $field_name, $field_desc);
     // phpcs:enable
 
-	/**
-	 * Return list of available collation that can be used for database
-	 *
-	 * @return        array        			List of Collation
-	 */
-	function getListOfCollation();
+    /**
+     * Return list of available collation that can be used for database
+     *
+     * @return        array        			List of Collation
+     */
+    function getListOfCollation();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return a pointer of line with description of a table or field
-	 *
-	 * @param    string 	$table 			Name of table
-	 * @param    string 	$field 			Optionnel : Name of field if we want description of field
-	 * @return   resource            		Resource
-	 */
+    /**
+     * Return a pointer of line with description of a table or field
+     *
+     * @param    string 	$table 			Name of table
+     * @param    string 	$field 			Optionnel : Name of field if we want description of field
+     * @return   resource            		Resource
+     */
     function DDLDescTable($table, $field = "");
     // phpcs:enable
 
-	/**
-	 * Return version of database server
-	 *
-	 * @return            string      		Version string
-	 */
-	function getVersion();
+    /**
+     * Return version of database server
+     *
+     * @return            string      		Version string
+     */
+    function getVersion();
 
-	/**
-	 * Return charset used to store data in database
-	 *
-	 * @return        string        		Charset
-	 */
-	function getDefaultCharacterSetDatabase();
+    /**
+     * Return charset used to store data in database
+     *
+     * @return        string        		Charset
+     */
+    function getDefaultCharacterSetDatabase();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create a user and privileges to connect to database (even if database does not exists yet)
-	 *
-	 * @param    string $dolibarr_main_db_host 	Ip serveur
-	 * @param    string $dolibarr_main_db_user 	Nom user a creer
-	 * @param    string $dolibarr_main_db_pass 	Mot de passe user a creer
-	 * @param    string $dolibarr_main_db_name 	Database name where user must be granted
-	 * @return   int                            <0 if KO, >=0 if OK
-	 */
-	function DDLCreateUser(
-		$dolibarr_main_db_host,
-		$dolibarr_main_db_user,
-		$dolibarr_main_db_pass,
-		$dolibarr_main_db_name
+    /**
+     * Create a user and privileges to connect to database (even if database does not exists yet)
+     *
+     * @param    string $dolibarr_main_db_host 	Ip serveur
+     * @param    string $dolibarr_main_db_user 	Nom user a creer
+     * @param    string $dolibarr_main_db_pass 	Mot de passe user a creer
+     * @param    string $dolibarr_main_db_name 	Database name where user must be granted
+     * @return   int                            <0 if KO, >=0 if OK
+     */
+    function DDLCreateUser(
+        $dolibarr_main_db_host,
+        $dolibarr_main_db_user,
+        $dolibarr_main_db_pass,
+        $dolibarr_main_db_name
     );
     // phpcs:enable
 
-	/**
-	 * Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-	 * 19700101020000 -> 3600 with TZ+1 and gmt=0
-	 * 19700101020000 -> 7200 whaterver is TZ if gmt=1
-	 *
-	 * @param	string			$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
-	 * @param	bool			$gm			1=Input informations are GMT values, otherwise local to server TZ
-	 * @return	int|string					Date TMS or ''
-	 */
-	function jdate($string, $gm=false);
-
-	/**
-	 * Encrypt sensitive data in database
-	 * Warning: This function includes the escape, so it must use direct value
-	 *
-	 * @param   string 			$fieldorvalue 	Field name or value to encrypt
-	 * @param  	int 			$withQuotes 	Return string with quotes
-	 * @return 	string                     		XXX(field) or XXX('value') or field or 'value'
-	 */
-	function encrypt($fieldorvalue, $withQuotes = 0);
-
-	/**
-	 * Validate a database transaction
-	 *
-	 * @param   string 			$log 			Add more log to default log line
-	 * @return	int                				1 if validation is OK or transaction level no started, 0 if ERROR
-	 */
-	function commit($log = '');
+    /**
+     * Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
+     * 19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 19700101020000 -> 7200 whaterver is TZ if gmt=1
+     *
+     * @param	string			$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+     * @param	bool			$gm			1=Input informations are GMT values, otherwise local to server TZ
+     * @return	int|string					Date TMS or ''
+     */
+    function jdate($string, $gm=false);
+
+    /**
+     * Encrypt sensitive data in database
+     * Warning: This function includes the escape, so it must use direct value
+     *
+     * @param   string 			$fieldorvalue 	Field name or value to encrypt
+     * @param  	int 			$withQuotes 	Return string with quotes
+     * @return 	string                     		XXX(field) or XXX('value') or field or 'value'
+     */
+    function encrypt($fieldorvalue, $withQuotes = 0);
+
+    /**
+     * Validate a database transaction
+     *
+     * @param   string 			$log 			Add more log to default log line
+     * @return	int                				1 if validation is OK or transaction level no started, 0 if ERROR
+     */
+    function commit($log = '');
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * List information of columns into a table.
-	 *
-	 * @param   string 			$table 			Name of table
-	 * @return  array                			Array with inforation on table
-	 */
+    /**
+     * List information of columns into a table.
+     *
+     * @param   string 			$table 			Name of table
+     * @return  array                			Array with inforation on table
+     */
     function DDLInfoTable($table);
     // phpcs:enable
 
-	/**
-	 * Free last resultset used.
-	 *
-	 * @param  	resource 		$resultset 		Fre cursor
-	 * @return  void
-	 */
-	function free($resultset = null);
-
-	/**
-	 * Close database connexion
-	 *
-	 * @return  boolean     					True if disconnect successfull, false otherwise
-	 * @see     connect
-	 */
-	function close();
-
-	/**
-	 * Return last query in error
-	 *
-	 * @return  string    lastqueryerror
-	 */
-	function lastqueryerror();
+    /**
+     * Free last resultset used.
+     *
+     * @param  	resource 		$resultset 		Fre cursor
+     * @return  void
+     */
+    function free($resultset = null);
+
+    /**
+     * Close database connexion
+     *
+     * @return  boolean     					True if disconnect successfull, false otherwise
+     * @see     connect
+     */
+    function close();
+
+    /**
+     * Return last query in error
+     *
+     * @return  string    lastqueryerror
+     */
+    function lastqueryerror();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return connexion ID
-	 *
-	 * @return  string      Id connexion
-	 */
+    /**
+     * Return connexion ID
+     *
+     * @return  string      Id connexion
+     */
     function DDLGetConnectId();
     // phpcs:enable
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Renvoie la ligne courante (comme un objet) pour le curseur resultset
-	 *
-	 * @param   resource $resultset Curseur de la requete voulue
-	 * @return  Object                    Object result line or false if KO or end of cursor
-	 */
+    /**
+     * Renvoie la ligne courante (comme un objet) pour le curseur resultset
+     *
+     * @param   resource $resultset Curseur de la requete voulue
+     * @return  Object                    Object result line or false if KO or end of cursor
+     */
     function fetch_object($resultset);
     // phpcs:enable
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Select a database
-	 *
-	 * @param	string $database Name of database
-	 * @return  boolean            true if OK, false if KO
-	 */
+    /**
+     * Select a database
+     *
+     * @param	string $database Name of database
+     * @return  boolean            true if OK, false if KO
+     */
     function select_db($database);
     // phpcs:enable
 }

Spacing +1 added lines, -1 removed lines

@@ -419,7 +419,7 @@
 	 * @param	bool			$gm			1=Input informations are GMT values, otherwise local to server TZ
 	 * @return	int|string					Date TMS or ''
 	 */
-	function jdate($string, $gm=false);
+	function jdate($string, $gm = false);
 
 	/**
 	 * Encrypt sensitive data in database

dolibarr/htdocs/core/db/DoliDB.class.php

Indentation +250 added lines, -250 removed lines

@@ -29,273 +29,273 @@
  */
 abstract class DoliDB implements Database
 {
-	/** @var resource Database handler */
-	public $db;
-	/** @var string Database type */
-	public $type;
-	/** @var string Charset used to force charset when creating database */
-	public $forcecharset='utf8';
-	/** @var string Collate used to force collate when creating database */
-	public $forcecollate='utf8_unicode_ci';
-	/** @var resource Resultset of last query */
-	private $_results;
-	/** @var bool true if connected, else false */
-	public $connected;
-	/** @var bool true if database selected, else false */
-	public $database_selected;
-	/** @var string Selected database name */
-	public $database_name;
-	/** @var string Database username */
-	public $database_user;
-	/** @var string Database host */
-	public $database_host;
-	/** @var int Database port */
-	public $database_port;
-	/** @var int >=1 if a transaction is opened, 0 otherwise */
-	public $transaction_opened;
-	/** @var string Last successful query */
-	public $lastquery;
-	/** @var string Last failed query */
-	public $lastqueryerror;
-	/** @var string Last error message */
-	public $lasterror;
-	/** @var string Last error number. For example: 'DB_ERROR_RECORD_ALREADY_EXISTS', '12345', ... */
-	public $lasterrno;
+    /** @var resource Database handler */
+    public $db;
+    /** @var string Database type */
+    public $type;
+    /** @var string Charset used to force charset when creating database */
+    public $forcecharset='utf8';
+    /** @var string Collate used to force collate when creating database */
+    public $forcecollate='utf8_unicode_ci';
+    /** @var resource Resultset of last query */
+    private $_results;
+    /** @var bool true if connected, else false */
+    public $connected;
+    /** @var bool true if database selected, else false */
+    public $database_selected;
+    /** @var string Selected database name */
+    public $database_name;
+    /** @var string Database username */
+    public $database_user;
+    /** @var string Database host */
+    public $database_host;
+    /** @var int Database port */
+    public $database_port;
+    /** @var int >=1 if a transaction is opened, 0 otherwise */
+    public $transaction_opened;
+    /** @var string Last successful query */
+    public $lastquery;
+    /** @var string Last failed query */
+    public $lastqueryerror;
+    /** @var string Last error message */
+    public $lasterror;
+    /** @var string Last error number. For example: 'DB_ERROR_RECORD_ALREADY_EXISTS', '12345', ... */
+    public $lasterrno;
 
-	/** @var bool Status */
-	public $ok;
-	/** @var string */
-	public $error;
+    /** @var bool Status */
+    public $ok;
+    /** @var string */
+    public $error;
 
-	/**
-	 *	Format a SQL IF
-	 *
-	 *	@param	string	$test           Test string (example: 'cd.statut=0', 'field IS NULL')
-	 *	@param	string	$resok          resultat si test egal
-	 *	@param	string	$resko          resultat si test non egal
-	 *	@return	string          		SQL string
-	 */
-	function ifsql($test,$resok,$resko)
-	{
-		return 'IF('.$test.','.$resok.','.$resko.')';
-	}
+    /**
+     *	Format a SQL IF
+     *
+     *	@param	string	$test           Test string (example: 'cd.statut=0', 'field IS NULL')
+     *	@param	string	$resok          resultat si test egal
+     *	@param	string	$resko          resultat si test non egal
+     *	@return	string          		SQL string
+     */
+    function ifsql($test,$resok,$resko)
+    {
+        return 'IF('.$test.','.$resok.','.$resko.')';
+    }
 
-	/**
-	 *   Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
-	 *   Function to use to build INSERT, UPDATE or WHERE predica
-	 *
-	 *   @param	    int		$param      	Date TMS to convert
-	 *   @return	string      			Date in a string YYYY-MM-DD HH:MM:SS
-	 */
-	function idate($param)
-	{
-		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
-	}
+    /**
+     *   Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
+     *   Function to use to build INSERT, UPDATE or WHERE predica
+     *
+     *   @param	    int		$param      	Date TMS to convert
+     *   @return	string      			Date in a string YYYY-MM-DD HH:MM:SS
+     */
+    function idate($param)
+    {
+        // TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
+        return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+    }
 
-	/**
-	 *	Return last error code
-	 *
-	 *	@return	    string	lasterrno
-	 */
-	function lasterrno()
-	{
-		return $this->lasterrno;
-	}
+    /**
+     *	Return last error code
+     *
+     *	@return	    string	lasterrno
+     */
+    function lasterrno()
+    {
+        return $this->lasterrno;
+    }
 
-	/**
-	 * Start transaction
-	 *
-	 * @return	    int         1 if transaction successfuly opened or already opened, 0 if error
-	 */
-	function begin()
-	{
-		if (! $this->transaction_opened)
-		{
-			$ret=$this->query("BEGIN");
-			if ($ret)
-			{
-				$this->transaction_opened++;
-				dol_syslog("BEGIN Transaction",LOG_DEBUG);
-				dol_syslog('',0,1);
-			}
-			return $ret;
-		}
-		else
-		{
-			$this->transaction_opened++;
-			dol_syslog('',0,1);
-			return 1;
-		}
-	}
+    /**
+     * Start transaction
+     *
+     * @return	    int         1 if transaction successfuly opened or already opened, 0 if error
+     */
+    function begin()
+    {
+        if (! $this->transaction_opened)
+        {
+            $ret=$this->query("BEGIN");
+            if ($ret)
+            {
+                $this->transaction_opened++;
+                dol_syslog("BEGIN Transaction",LOG_DEBUG);
+                dol_syslog('',0,1);
+            }
+            return $ret;
+        }
+        else
+        {
+            $this->transaction_opened++;
+            dol_syslog('',0,1);
+            return 1;
+        }
+    }
 
-	/**
-	 * Validate a database transaction
-	 *
-	 * @param	string	$log		Add more log to default log line
-	 * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
-	 */
-	function commit($log='')
-	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
-		{
-			$ret=$this->query("COMMIT");
-			if ($ret)
-			{
-				$this->transaction_opened=0;
-				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
-				return 1;
-			}
-			else
-			{
-				return 0;
-			}
-		}
-		else
-		{
-			$this->transaction_opened--;
-			return 1;
-		}
-	}
+    /**
+     * Validate a database transaction
+     *
+     * @param	string	$log		Add more log to default log line
+     * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
+     */
+    function commit($log='')
+    {
+        dol_syslog('',0,-1);
+        if ($this->transaction_opened<=1)
+        {
+            $ret=$this->query("COMMIT");
+            if ($ret)
+            {
+                $this->transaction_opened=0;
+                dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        else
+        {
+            $this->transaction_opened--;
+            return 1;
+        }
+    }
 
-	/**
-	 *	Annulation d'une transaction et retour aux anciennes valeurs
-	 *
-	 * 	@param	string			$log		Add more log to default log line
-	 * 	@return	resource|int         		1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
-	 */
-	function rollback($log='')
-	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
-		{
-			$ret=$this->query("ROLLBACK");
-			$this->transaction_opened=0;
-			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
-			return $ret;
-		}
-		else
-		{
-			$this->transaction_opened--;
-			return 1;
-		}
-	}
+    /**
+     *	Annulation d'une transaction et retour aux anciennes valeurs
+     *
+     * 	@param	string			$log		Add more log to default log line
+     * 	@return	resource|int         		1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
+     */
+    function rollback($log='')
+    {
+        dol_syslog('',0,-1);
+        if ($this->transaction_opened<=1)
+        {
+            $ret=$this->query("ROLLBACK");
+            $this->transaction_opened=0;
+            dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
+            return $ret;
+        }
+        else
+        {
+            $this->transaction_opened--;
+            return 1;
+        }
+    }
 
-	/**
-	 *	Define limits and offset of request
-	 *
-	 *	@param	int		$limit      Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
-	 *	@param	int		$offset     Numero of line from where starting fetch
-	 *	@return	string      		String with SQL syntax to add a limit and offset
-	 */
-	function plimit($limit=0,$offset=0)
-	{
-		global $conf;
-		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT $offset,$limit ";
-		else return " LIMIT $limit ";
-	}
+    /**
+     *	Define limits and offset of request
+     *
+     *	@param	int		$limit      Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
+     *	@param	int		$offset     Numero of line from where starting fetch
+     *	@return	string      		String with SQL syntax to add a limit and offset
+     */
+    function plimit($limit=0,$offset=0)
+    {
+        global $conf;
+        if (empty($limit)) return "";
+        if ($limit < 0) $limit=$conf->liste_limit;
+        if ($offset > 0) return " LIMIT $offset,$limit ";
+        else return " LIMIT $limit ";
+    }
 
-	/**
-	 *	Return version of database server into an array
-	 *
-	 *	@return	        array  		Version array
-	 */
-	function getVersionArray()
-	{
-		return preg_split("/[\.,-]/",$this->getVersion());
-	}
+    /**
+     *	Return version of database server into an array
+     *
+     *	@return	        array  		Version array
+     */
+    function getVersionArray()
+    {
+        return preg_split("/[\.,-]/",$this->getVersion());
+    }
 
-	/**
-	 *	Return last request executed with query()
-	 *
-	 *	@return	string					Last query
-	 */
-	function lastquery()
-	{
-		return $this->lastquery;
-	}
+    /**
+     *	Return last request executed with query()
+     *
+     *	@return	string					Last query
+     */
+    function lastquery()
+    {
+        return $this->lastquery;
+    }
 
-	/**
-	 * Define sort criteria of request
-	 *
-	 * @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
-	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
-	 * @return	string						String to provide syntax of a sort sql string
-	 */
-	function order($sortfield=null,$sortorder=null)
-	{
-		if (! empty($sortfield))
-		{
-			$return='';
-			$fields=explode(',',$sortfield);
-			$orders=explode(',',$sortorder);
-			$i=0;
-			foreach($fields as $val)
-			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+    /**
+     * Define sort criteria of request
+     *
+     * @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
+     * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
+     * @return	string						String to provide syntax of a sort sql string
+     */
+    function order($sortfield=null,$sortorder=null)
+    {
+        if (! empty($sortfield))
+        {
+            $return='';
+            $fields=explode(',',$sortfield);
+            $orders=explode(',',$sortorder);
+            $i=0;
+            foreach($fields as $val)
+            {
+                if (! $return) $return.=' ORDER BY ';
+                else $return.=', ';
 
-				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
+                $return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
 
-				$tmpsortorder = trim($orders[$i]);
+                $tmpsortorder = trim($orders[$i]);
 
-				// Only ASC and DESC values are valid SQL
-				if (strtoupper($tmpsortorder) === 'ASC') {
-					$return .= ' ASC';
-				} elseif (strtoupper($tmpsortorder) === 'DESC') {
-					$return .= ' DESC';
-				}
+                // Only ASC and DESC values are valid SQL
+                if (strtoupper($tmpsortorder) === 'ASC') {
+                    $return .= ' ASC';
+                } elseif (strtoupper($tmpsortorder) === 'DESC') {
+                    $return .= ' DESC';
+                }
 
-				$i++;
-			}
-			return $return;
-		}
-		else
-		{
-			return '';
-		}
-	}
+                $i++;
+            }
+            return $return;
+        }
+        else
+        {
+            return '';
+        }
+    }
 
-	/**
-	 *	Return last error label
-	 *
-	 *	@return	    string		Last error
-	 */
-	function lasterror()
-	{
-		return $this->lasterror;
-	}
+    /**
+     *	Return last error label
+     *
+     *	@return	    string		Last error
+     */
+    function lasterror()
+    {
+        return $this->lasterror;
+    }
 
-	/**
-	 *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-	 * 	19700101020000 -> 3600 with TZ+1 and gmt=0
-	 * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
-	 *
-	 * 	@param	string				$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
-	 *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
-	 *	@return	int|string						Date TMS or ''
-	 */
-	function jdate($string, $gm=false)
-	{
-		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
-		$string=preg_replace('/([^0-9])/i','',$string);
-		$tmp=$string.'000000';
-		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
-		return $date;
-	}
+    /**
+     *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
+     * 	19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
+     *
+     * 	@param	string				$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+     *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
+     *	@return	int|string						Date TMS or ''
+     */
+    function jdate($string, $gm=false)
+    {
+        // TODO GMT must set param gm to true by default
+        if ($string==0 || $string=="0000-00-00 00:00:00") return '';
+        $string=preg_replace('/([^0-9])/i','',$string);
+        $tmp=$string.'000000';
+        $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
+        return $date;
+    }
 
-	/**
-	 *	Return last query in error
-	 *
-	 *	@return	    string	lastqueryerror
-	 */
-	function lastqueryerror()
-	{
-		return $this->lastqueryerror;
-	}
+    /**
+     *	Return last query in error
+     *
+     *	@return	    string	lastqueryerror
+     */
+    function lastqueryerror()
+    {
+        return $this->lastqueryerror;
+    }
 }
 

Braces +24 added lines, -17 removed lines

@@ -120,8 +120,7 @@ 
 				dol_syslog('',0,1);
 			}
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened++;
 			dol_syslog('',0,1);
@@ -146,13 +145,11 @@ 
 				$this->transaction_opened=0;
 				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
 				return 1;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -174,8 +171,7 @@ 
 			$this->transaction_opened=0;
 			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -192,10 +188,17 @@ 
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
-		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT $offset,$limit ";
-		else return " LIMIT $limit ";
+		if (empty($limit)) {
+		    return "";
+		}
+		if ($limit < 0) {
+		    $limit=$conf->liste_limit;
+		}
+		if ($offset > 0) {
+		    return " LIMIT $offset,$limit ";
+		} else {
+		    return " LIMIT $limit ";
+		}
 	}
 
 	/**
@@ -235,8 +238,11 @@ 
 			$i=0;
 			foreach($fields as $val)
 			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+				if (! $return) {
+				    $return.=' ORDER BY ';
+				} else {
+				    $return.=', ';
+				}
 
 				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
 
@@ -252,8 +258,7 @@ 
 				$i++;
 			}
 			return $return;
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -281,7 +286,9 @@ 
 	function jdate($string, $gm=false)
 	{
 		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
+		if ($string==0 || $string=="0000-00-00 00:00:00") {
+		    return '';
+		}
 		$string=preg_replace('/([^0-9])/i','',$string);
 		$tmp=$string.'000000';
 		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);

Spacing +40 added lines, -40 removed lines

@@ -26,7 +26,7 @@ 
  * \brief 		Class file to manage Dolibarr database access
  */
 
-require_once DOL_BASE_PATH . '/core/db/Database.interface.php';
+require_once DOL_BASE_PATH.'/core/db/Database.interface.php';
 
 /**
  * Class to manage Dolibarr database access
@@ -38,9 +38,9 @@ 
 	/** @var string Database type */
 	public $type;
 	/** @var string Charset used to force charset when creating database */
-	public $forcecharset='utf8';
+	public $forcecharset = 'utf8';
 	/** @var string Collate used to force collate when creating database */
-	public $forcecollate='utf8_unicode_ci';
+	public $forcecollate = 'utf8_unicode_ci';
 	/** @var resource Resultset of last query */
 	private $_results;
 	/** @var bool true if connected, else false */
@@ -79,7 +79,7 @@ 
 	 *	@param	string	$resko          resultat si test non egal
 	 *	@return	string          		SQL string
 	 */
-	function ifsql($test,$resok,$resko)
+	function ifsql($test, $resok, $resko)
 	{
 		return 'IF('.$test.','.$resok.','.$resko.')';
 	}
@@ -94,7 +94,7 @@ 
 	function idate($param)
 	{
 		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
 	}
 
 	/**
@@ -114,21 +114,21 @@ 
 	 */
 	function begin()
 	{
-		if (! $this->transaction_opened)
+		if (!$this->transaction_opened)
 		{
-			$ret=$this->query("BEGIN");
+			$ret = $this->query("BEGIN");
 			if ($ret)
 			{
 				$this->transaction_opened++;
-				dol_syslog("BEGIN Transaction",LOG_DEBUG);
-				dol_syslog('',0,1);
+				dol_syslog("BEGIN Transaction", LOG_DEBUG);
+				dol_syslog('', 0, 1);
 			}
 			return $ret;
 		}
 		else
 		{
 			$this->transaction_opened++;
-			dol_syslog('',0,1);
+			dol_syslog('', 0, 1);
 			return 1;
 		}
 	}
@@ -139,16 +139,16 @@ 
 	 * @param	string	$log		Add more log to default log line
 	 * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
 	 */
-	function commit($log='')
+	function commit($log = '')
 	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
+		dol_syslog('', 0, -1);
+		if ($this->transaction_opened <= 1)
 		{
-			$ret=$this->query("COMMIT");
+			$ret = $this->query("COMMIT");
 			if ($ret)
 			{
-				$this->transaction_opened=0;
-				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
+				$this->transaction_opened = 0;
+				dol_syslog("COMMIT Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 				return 1;
 			}
 			else
@@ -169,14 +169,14 @@ 
 	 * 	@param	string			$log		Add more log to default log line
 	 * 	@return	resource|int         		1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
 	 */
-	function rollback($log='')
+	function rollback($log = '')
 	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
+		dol_syslog('', 0, -1);
+		if ($this->transaction_opened <= 1)
 		{
-			$ret=$this->query("ROLLBACK");
-			$this->transaction_opened=0;
-			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
+			$ret = $this->query("ROLLBACK");
+			$this->transaction_opened = 0;
+			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 			return $ret;
 		}
 		else
@@ -193,11 +193,11 @@ 
 	 *	@param	int		$offset     Numero of line from where starting fetch
 	 *	@return	string      		String with SQL syntax to add a limit and offset
 	 */
-	function plimit($limit=0,$offset=0)
+	function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
 		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
+		if ($limit < 0) $limit = $conf->liste_limit;
 		if ($offset > 0) return " LIMIT $offset,$limit ";
 		else return " LIMIT $limit ";
 	}
@@ -209,7 +209,7 @@ 
 	 */
 	function getVersionArray()
 	{
-		return preg_split("/[\.,-]/",$this->getVersion());
+		return preg_split("/[\.,-]/", $this->getVersion());
 	}
 
 	/**
@@ -229,20 +229,20 @@ 
 	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
 	 * @return	string						String to provide syntax of a sort sql string
 	 */
-	function order($sortfield=null,$sortorder=null)
+	function order($sortfield = null, $sortorder = null)
 	{
-		if (! empty($sortfield))
+		if (!empty($sortfield))
 		{
-			$return='';
-			$fields=explode(',',$sortfield);
-			$orders=explode(',',$sortorder);
-			$i=0;
-			foreach($fields as $val)
+			$return = '';
+			$fields = explode(',', $sortfield);
+			$orders = explode(',', $sortorder);
+			$i = 0;
+			foreach ($fields as $val)
 			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+				if (!$return) $return .= ' ORDER BY ';
+				else $return .= ', ';
 
-				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
+				$return .= preg_replace('/[^0-9a-z_\.]/i', '', $val);
 
 				$tmpsortorder = trim($orders[$i]);
 
@@ -282,13 +282,13 @@ 
 	 *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
 	 *	@return	int|string						Date TMS or ''
 	 */
-	function jdate($string, $gm=false)
+	function jdate($string, $gm = false)
 	{
 		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
-		$string=preg_replace('/([^0-9])/i','',$string);
-		$tmp=$string.'000000';
-		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
+		if ($string == 0 || $string == "0000-00-00 00:00:00") return '';
+		$string = preg_replace('/([^0-9])/i', '', $string);
+		$tmp = $string.'000000';
+		$date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), $gm);
 		return $date;
 	}
 

dolibarr/htdocs/core/actions_builddoc.inc.php

Indentation +14 added lines, -14 removed lines

@@ -40,7 +40,7 @@ 
     }
     else
     {
-   		// Reload to get all modified line records and be ready for hooks
+            // Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
         $ret = $object->fetch_thirdparty();
         /*if (empty($object->id) || ! $object->id > 0)
@@ -50,10 +50,10 @@ 
         }*/
 
         // Save last template used to generate document
-    	if (GETPOST('model','alpha'))
-    	{
-    	    $object->setDocModel($user, GETPOST('model','alpha'));
-    	}
+        if (GETPOST('model','alpha'))
+        {
+            $object->setDocModel($user, GETPOST('model','alpha'));
+        }
 
         // Special case to force bank account
         //if (property_exists($object, 'fk_bank'))
@@ -91,17 +91,17 @@ 
         }
         else
         {
-        	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
-        	{
-	            setEventMessages($langs->trans("FileGenerated"), null);
+            if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
+            {
+                setEventMessages($langs->trans("FileGenerated"), null);
 
-	            $urltoredirect = $_SERVER['REQUEST_URI'];
-	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
-	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect);	// To avoid infinite loop
+                $urltoredirect = $_SERVER['REQUEST_URI'];
+                $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
+                $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect);	// To avoid infinite loop
 
-	            header('Location: '.$urltoredirect.'#builddoc');
-	            exit;
-        	}
+                header('Location: '.$urltoredirect.'#builddoc');
+                exit;
+            }
         }
     }
 }

Spacing +24 added lines, -24 removed lines

@@ -34,9 +34,9 @@ 
 if ($action == 'builddoc' && $permissioncreate)
 {
 
-    if (is_numeric(GETPOST('model','alpha')))
+    if (is_numeric(GETPOST('model', 'alpha')))
     {
-        $error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
+        $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
     }
     else
     {
@@ -50,44 +50,44 @@ 
         }*/
 
         // Save last template used to generate document
-    	if (GETPOST('model','alpha'))
+    	if (GETPOST('model', 'alpha'))
     	{
-    	    $object->setDocModel($user, GETPOST('model','alpha'));
+    	    $object->setDocModel($user, GETPOST('model', 'alpha'));
     	}
 
         // Special case to force bank account
         //if (property_exists($object, 'fk_bank'))
         //{
-            if (GETPOST('fk_bank','int')) { // this field may come from an external module
-                $object->fk_bank = GETPOST('fk_bank','int');
-            } else if (! empty($object->fk_account)) {
+            if (GETPOST('fk_bank', 'int')) { // this field may come from an external module
+                $object->fk_bank = GETPOST('fk_bank', 'int');
+            } else if (!empty($object->fk_account)) {
                 $object->fk_bank = $object->fk_account;
             }
         //}
 
         $outputlangs = $langs;
-        $newlang='';
+        $newlang = '';
 
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang;  // for proposal, order, invoice, ...
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang;                  // for thirdparty
-        if (! empty($newlang))
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ...
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang = $object->default_lang; // for thirdparty
+        if (!empty($newlang))
         {
-            $outputlangs = new Translate("",$conf);
+            $outputlangs = new Translate("", $conf);
             $outputlangs->setDefaultLang($newlang);
         }
 
         // To be sure vars is defined
-        if (empty($hidedetails)) $hidedetails=0;
-        if (empty($hidedesc)) $hidedesc=0;
-        if (empty($hideref)) $hideref=0;
-        if (empty($moreparams)) $moreparams=null;
+        if (empty($hidedetails)) $hidedetails = 0;
+        if (empty($hidedesc)) $hidedesc = 0;
+        if (empty($hideref)) $hideref = 0;
+        if (empty($moreparams)) $moreparams = null;
 
-        $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+        $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
         if ($result <= 0)
         {
             setEventMessages($object->error, $object->errors, 'errors');
-            $action='';
+            $action = '';
         }
         else
         {
@@ -97,7 +97,7 @@ 
 
 	            $urltoredirect = $_SERVER['REQUEST_URI'];
 	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
-	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect);	// To avoid infinite loop
+	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop
 
 	            header('Location: '.$urltoredirect.'#builddoc');
 	            exit;
@@ -111,7 +111,7 @@ 
 {
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    if (empty($object->id) || ! $object->id > 0)
+    if (empty($object->id) || !$object->id > 0)
     {
         // Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
@@ -119,9 +119,9 @@ 
     }
 
     $langs->load("other");
-    $filetodelete=GETPOST('file','alpha');
-    $file =	$upload_dir	. '/' .	$filetodelete;
-    $ret=dol_delete_file($file,0,0,0,$object);
+    $filetodelete = GETPOST('file', 'alpha');
+    $file = $upload_dir.'/'.$filetodelete;
+    $ret = dol_delete_file($file, 0, 0, 0, $object);
     if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
     else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
 

Braces +33 added lines, -14 removed lines

@@ -37,8 +37,7 @@ 
     if (is_numeric(GETPOST('model','alpha')))
     {
         $error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
-    }
-    else
+    } else
     {
    		// Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
@@ -68,9 +67,17 @@ 
         $outputlangs = $langs;
         $newlang='';
 
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang;  // for proposal, order, invoice, ...
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang;                  // for thirdparty
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+            $newlang=GETPOST('lang_id','aZ09');
+        }
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) {
+            $newlang=$object->thirdparty->default_lang;
+        }
+        // for proposal, order, invoice, ...
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) {
+            $newlang=$object->default_lang;
+        }
+        // for thirdparty
         if (! empty($newlang))
         {
             $outputlangs = new Translate("",$conf);
@@ -78,22 +85,31 @@ 
         }
 
         // To be sure vars is defined
-        if (empty($hidedetails)) $hidedetails=0;
-        if (empty($hidedesc)) $hidedesc=0;
-        if (empty($hideref)) $hideref=0;
-        if (empty($moreparams)) $moreparams=null;
+        if (empty($hidedetails)) {
+            $hidedetails=0;
+        }
+        if (empty($hidedesc)) {
+            $hidedesc=0;
+        }
+        if (empty($hideref)) {
+            $hideref=0;
+        }
+        if (empty($moreparams)) {
+            $moreparams=null;
+        }
 
         $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
         if ($result <= 0)
         {
             setEventMessages($object->error, $object->errors, 'errors');
             $action='';
-        }
-        else
+        } else
         {
-        	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
+        	if (empty($donotredirect)) {
+        	    // This is set when include is done by bulk action "Bill Orders"
         	{
 	            setEventMessages($langs->trans("FileGenerated"), null);
+        	}
 
 	            $urltoredirect = $_SERVER['REQUEST_URI'];
 	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
@@ -122,8 +138,11 @@ 
     $filetodelete=GETPOST('file','alpha');
     $file =	$upload_dir	. '/' .	$filetodelete;
     $ret=dol_delete_file($file,0,0,0,$object);
-    if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
-    else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+    if ($ret) {
+        setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
+    } else {
+        setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+    }
 
     // Make a redirect to avoid to keep the remove_file into the url that create side effects
     $urltoredirect = $_SERVER['REQUEST_URI'];

dolibarr/htdocs/core/search_page.php

Indentation +3 added lines, -3 removed lines

@@ -78,8 +78,8 @@ 
 else
 {
     $usedbyinclude = 1; // Used into next include
-	$showtitlebefore = GETPOST('showtitlebefore','int');
-	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
+    $showtitlebefore = GETPOST('showtitlebefore','int');
+    include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
 
     $accesskeyalreadyassigned=array();
     foreach($arrayresult as $key => $val)
@@ -103,7 +103,7 @@ 
 $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
 if (empty($reshook))
 {
-	$searchform.=$hookmanager->resPrint;
+    $searchform.=$hookmanager->resPrint;
 }
 else $searchform=$hookmanager->resPrint;
 

Spacing +29 added lines, -29 removed lines

@@ -27,32 +27,32 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
 
 /*
  * View
  */
 
-$title=$langs->trans("Search");
+$title = $langs->trans("Search");
 
 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
-$head='<!-- Quick access -->'."\n";
-$arrayofjs=array();
-$arrayofcss=array();
+$head = '<!-- Quick access -->'."\n";
+$arrayofjs = array();
+$arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
 
 
@@ -61,7 +61,7 @@ 
 print '<div>';
 //print '<br>';
 
-$nbofsearch=0;
+$nbofsearch = 0;
 
 // Instantiate hooks of thirdparty module
 $hookmanager->initHooks(array('searchform'));
@@ -71,41 +71,41 @@ 
 
 if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 {
-    if (! is_object($form)) $form=new Form($db);
-    $selected=-1;
-    $searchform.='<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
+    if (!is_object($form)) $form = new Form($db);
+    $selected = -1;
+    $searchform .= '<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
 }
 else
 {
     $usedbyinclude = 1; // Used into next include
-	$showtitlebefore = GETPOST('showtitlebefore','int');
+	$showtitlebefore = GETPOST('showtitlebefore', 'int');
 	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
 
-    $accesskeyalreadyassigned=array();
-    foreach($arrayresult as $key => $val)
+    $accesskeyalreadyassigned = array();
+    foreach ($arrayresult as $key => $val)
     {
-        $tmp=explode('?', $val['url']);
-        $urlaction=$tmp[0];
-        $keysearch='search_all';
+        $tmp = explode('?', $val['url']);
+        $urlaction = $tmp[0];
+        $keysearch = 'search_all';
 
-        $accesskey='';
-        if (! $accesskeyalreadyassigned[$val['label'][0]])
+        $accesskey = '';
+        if (!$accesskeyalreadyassigned[$val['label'][0]])
         {
-            $accesskey=$val['label'][0];
-            $accesskeyalreadyassigned[$accesskey]=$accesskey;
+            $accesskey = $val['label'][0];
+            $accesskeyalreadyassigned[$accesskey] = $accesskey;
         }
-        $searchform.=printSearchForm($urlaction, $urlaction, $val['label'], 'minwidth200', $keysearch, $accesskey, $key, img_picto('',$val['img'],'', 0, 1), $showtitlebefore);
+        $searchform .= printSearchForm($urlaction, $urlaction, $val['label'], 'minwidth200', $keysearch, $accesskey, $key, img_picto('', $val['img'], '', 0, 1), $showtitlebefore);
     }
 }
 
 // Execute hook printSearchForm
-$parameters=array('searchform'=>$searchform);
-$reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('searchform'=>$searchform);
+$reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
 if (empty($reshook))
 {
-	$searchform.=$hookmanager->resPrint;
+	$searchform .= $hookmanager->resPrint;
 }
-else $searchform=$hookmanager->resPrint;
+else $searchform = $hookmanager->resPrint;
 
 
 print "\n";

Braces +19 added lines, -8 removed lines

@@ -27,15 +27,24 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU',1);
+}
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+    $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
+}
+// If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 
@@ -69,13 +78,14 @@ 
 // Define $searchform
 $searchform = '';
 
-if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
+if ($conf->use_javascript_ajax && 1 == 2) {
+    // select2 is ko with jmobile
 {
     if (! is_object($form)) $form=new Form($db);
+}
     $selected=-1;
     $searchform.='<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
-}
-else
+} else
 {
     $usedbyinclude = 1; // Used into next include
 	$showtitlebefore = GETPOST('showtitlebefore','int');
@@ -104,8 +114,9 @@ 
 if (empty($reshook))
 {
 	$searchform.=$hookmanager->resPrint;
+} else {
+    $searchform=$hookmanager->resPrint;
 }
-else $searchform=$hookmanager->resPrint;
 
 
 print "\n";

dolibarr/htdocs/core/actions_extrafields.inc.php

Indentation +262 added lines, -262 removed lines

@@ -40,23 +40,23 @@ 
 // Add attribute
 if ($action == 'add')
 {
-	if ($_POST["button"] != $langs->trans("Cancel"))
-	{
-	    // Check values
-		if (! $type)
-		{
-			$error++;
-			$langs->load("errors");
-			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
-			$action = 'create';
-		}
-		if ($type=='varchar' && $extrasize <= 0)
-		{
-		    $error++;
-		    $langs->load("errors");
-		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
-		    $action = 'edit';
-		}
+    if ($_POST["button"] != $langs->trans("Cancel"))
+    {
+        // Check values
+        if (! $type)
+        {
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
+            $action = 'create';
+        }
+        if ($type=='varchar' && $extrasize <= 0)
+        {
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
+            $action = 'edit';
+        }
         if ($type=='varchar' && $extrasize > $maxsizestring)
         {
             $error++;
@@ -73,168 +73,168 @@ 
         }
         if ($type=='select' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
-        	$action = 'create';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForSelectType");
+            $action = 'create';
         }
         if ($type=='sellist' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
-        	$action = 'create';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForSelectListType");
+            $action = 'create';
         }
         if ($type=='checkbox' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
-        	$action = 'create';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
+            $action = 'create';
         }
         if ($type=='link' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForLinkType");
-        	$action = 'create';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForLinkType");
+            $action = 'create';
         }
         if ($type=='radio' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
-        	$action = 'create';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForRadioType");
+            $action = 'create';
         }
         if  ((($type=='radio') || ($type=='checkbox')) && $param)
         {
-        	// Construct array for parameter (value of select list)
-    		$parameters = $param;
-    		$parameters_array = explode("\r\n",$parameters);
-    		foreach($parameters_array as $param_ligne)
-    		{
-    			if (!empty($param_ligne)) {
-	    			if (preg_match_all('/,/',$param_ligne,$matches))
-	    			{
-	    				if (count($matches[0])>1) {
-	    					$error++;
-	    					$langs->load("errors");
-	    					$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
-	    					$action = 'create';
-	    				}
-	    			}
-	    			else
-	    			{
-	    				$error++;
-	    				$langs->load("errors");
-	    				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
-	    				$action = 'create';
-	    			}
-    			}
-    		}
+            // Construct array for parameter (value of select list)
+            $parameters = $param;
+            $parameters_array = explode("\r\n",$parameters);
+            foreach($parameters_array as $param_ligne)
+            {
+                if (!empty($param_ligne)) {
+                    if (preg_match_all('/,/',$param_ligne,$matches))
+                    {
+                        if (count($matches[0])>1) {
+                            $error++;
+                            $langs->load("errors");
+                            $mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+                            $action = 'create';
+                        }
+                    }
+                    else
+                    {
+                        $error++;
+                        $langs->load("errors");
+                        $mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+                        $action = 'create';
+                    }
+                }
+            }
         }
 
-	    if (! $error)
-	    {
-    		// attrname must be alphabetical and lower case only
-    		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname']) && !is_numeric($_POST["attrname"]))
-    		{
-    			// Construct array for parameter (value of select list)
-        		$default_value = GETPOST('default_value','alpha');
-    			$parameters = $param;
-    			$parameters_array = explode("\r\n",$parameters);
-    			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type=='sellist') {
-    				foreach($parameters_array as $param_ligne)
-    				{
-    					$params['options'] = array($parameters=>null);
-    				}
-    			}
-    			else
-    			{
-    				//Esle it's separated key/value and coma list
-    				foreach($parameters_array as $param_ligne)
-    				{
-    					list($key,$value) = explode(',',$param_ligne);
-    					$params['options'][$key] = $value;
-    				}
-    			}
+        if (! $error)
+        {
+            // attrname must be alphabetical and lower case only
+            if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname']) && !is_numeric($_POST["attrname"]))
+            {
+                // Construct array for parameter (value of select list)
+                $default_value = GETPOST('default_value','alpha');
+                $parameters = $param;
+                $parameters_array = explode("\r\n",$parameters);
+                //In sellist we have only one line and it can have come to do SQL expression
+                if ($type=='sellist') {
+                    foreach($parameters_array as $param_ligne)
+                    {
+                        $params['options'] = array($parameters=>null);
+                    }
+                }
+                else
+                {
+                    //Esle it's separated key/value and coma list
+                    foreach($parameters_array as $param_ligne)
+                    {
+                        list($key,$value) = explode(',',$param_ligne);
+                        $params['options'][$key] = $value;
+                    }
+                }
 
-    			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
-    			$visibility = GETPOST('list', 'alpha');
-				if ($type == 'separate') $visibility=3;
+                // Visibility: -1=not visible by default in list, 1=visible, 0=hidden
+                $visibility = GETPOST('list', 'alpha');
+                if ($type == 'separate') $visibility=3;
 
                 $result=$extrafields->addExtraField(
-                	GETPOST('attrname', 'alpha'),
-                	GETPOST('label', 'alpha'),
-                	$type,
-                	GETPOST('pos', 'int'),
-                	$extrasize,
-                	$elementtype,
-                	(GETPOST('unique', 'alpha')?1:0),
-                	(GETPOST('required', 'alpha')?1:0),
-                	$default_value,
-                	$params,
-                	(GETPOST('alwayseditable', 'alpha')?1:0),
-                	(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
-                	$visibility,
-					GETPOST('help','alpha'),
+                    GETPOST('attrname', 'alpha'),
+                    GETPOST('label', 'alpha'),
+                    $type,
+                    GETPOST('pos', 'int'),
+                    $extrasize,
+                    $elementtype,
+                    (GETPOST('unique', 'alpha')?1:0),
+                    (GETPOST('required', 'alpha')?1:0),
+                    $default_value,
+                    $params,
+                    (GETPOST('alwayseditable', 'alpha')?1:0),
+                    (GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                    $visibility,
+                    GETPOST('help','alpha'),
                     GETPOST('computed_value','alpha'),
-                	(GETPOST('entitycurrentorall', 'alpha')?0:''),
+                    (GETPOST('entitycurrentorall', 'alpha')?0:''),
                     GETPOST('langfile', 'alpha'),
                     1,
                     (GETPOST('totalizable', 'alpha')?1:0)
                 );
-    			if ($result > 0)
-    			{
-    				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]);
-    				exit;
-    			}
-    			else
-    			{
+                if ($result > 0)
+                {
+                    setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+                    header("Location: ".$_SERVER["PHP_SELF"]);
+                    exit;
+                }
+                else
+                {
                     $error++;
-    			    $mesg=$extrafields->error;
+                    $mesg=$extrafields->error;
                     setEventMessages($mesg, null, 'errors');
-    			}
-    		}
-    		else
-    		{
+                }
+            }
+            else
+            {
                 $error++;
-    		    $langs->load("errors");
-    			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters",$langs->transnoentities("AttributeCode"));
-    			setEventMessages($mesg, null, 'errors');
-    			$action = 'create';
-    		}
-	    }
-	    else
-	    {
-	    	setEventMessages($mesg, null, 'errors');
-	    }
-	}
+                $langs->load("errors");
+                $mesg=$langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters",$langs->transnoentities("AttributeCode"));
+                setEventMessages($mesg, null, 'errors');
+                $action = 'create';
+            }
+        }
+        else
+        {
+            setEventMessages($mesg, null, 'errors');
+        }
+    }
 }
 
 // Rename field
 if ($action == 'update')
 {
-	if ($_POST["button"] != $langs->trans("Cancel"))
-	{
+    if ($_POST["button"] != $langs->trans("Cancel"))
+    {
         // Check values
-		if (! $type)
-		{
-			$error++;
-			$langs->load("errors");
-			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
-			$action = 'edit';
-		}
-		if ($type=='varchar' && $extrasize <= 0)
-		{
-		    $error++;
-		    $langs->load("errors");
-		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
-		    $action = 'edit';
-		}
-		if ($type=='varchar' && $extrasize > $maxsizestring)
+        if (! $type)
+        {
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
+            $action = 'edit';
+        }
+        if ($type=='varchar' && $extrasize <= 0)
+        {
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
+            $action = 'edit';
+        }
+        if ($type=='varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
@@ -250,143 +250,143 @@ 
         }
         if ($type=='select' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
-        	$action = 'edit';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForSelectType");
+            $action = 'edit';
         }
         if ($type=='sellist' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
-        	$action = 'edit';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForSelectListType");
+            $action = 'edit';
         }
         if ($type=='checkbox' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
-        	$action = 'edit';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
+            $action = 'edit';
         }
         if ($type=='radio' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
-        	$action = 'edit';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForRadioType");
+            $action = 'edit';
         }
         if  ((($type=='radio') || ($type=='checkbox')) && $param)
         {
-        	// Construct array for parameter (value of select list)
-        	$parameters = $param;
-        	$parameters_array = explode("\r\n",$parameters);
-        	foreach($parameters_array as $param_ligne)
-        	{
-        		if (!empty($param_ligne)) {
-	        		if (preg_match_all('/,/',$param_ligne,$matches))
-	        		{
-	        			if (count($matches[0])>1) {
-	        				$error++;
-	        				$langs->load("errors");
-	        				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
-	        				$action = 'edit';
-	        			}
-	        		}
-	        		else
-	        		{
-	        			$error++;
-	        			$langs->load("errors");
-	        			$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
-	        			$action = 'edit';
-	        		}
-        		}
-        	}
+            // Construct array for parameter (value of select list)
+            $parameters = $param;
+            $parameters_array = explode("\r\n",$parameters);
+            foreach($parameters_array as $param_ligne)
+            {
+                if (!empty($param_ligne)) {
+                    if (preg_match_all('/,/',$param_ligne,$matches))
+                    {
+                        if (count($matches[0])>1) {
+                            $error++;
+                            $langs->load("errors");
+                            $mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+                            $action = 'edit';
+                        }
+                    }
+                    else
+                    {
+                        $error++;
+                        $langs->load("errors");
+                        $mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+                        $action = 'edit';
+                    }
+                }
+            }
         }
 
-	    if (! $error)
-	    {
+        if (! $error)
+        {
             if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname']))
-    		{
-    			$pos = GETPOST('pos','int');
-    			// Construct array for parameter (value of select list)
-    			$parameters = $param;
-    			$parameters_array = explode("\r\n",$parameters);
-    			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type=='sellist') {
-    				foreach($parameters_array as $param_ligne)
-    				{
-    					$params['options'] = array($parameters=>null);
-    				}
-    			}
-    			else
-    			{
-    				//Esle it's separated key/value and coma list
-    				foreach($parameters_array as $param_ligne)
-    				{
-    					list($key,$value) = explode(',',$param_ligne);
-    					$params['options'][$key] = $value;
-    				}
-    			}
+            {
+                $pos = GETPOST('pos','int');
+                // Construct array for parameter (value of select list)
+                $parameters = $param;
+                $parameters_array = explode("\r\n",$parameters);
+                //In sellist we have only one line and it can have come to do SQL expression
+                if ($type=='sellist') {
+                    foreach($parameters_array as $param_ligne)
+                    {
+                        $params['options'] = array($parameters=>null);
+                    }
+                }
+                else
+                {
+                    //Esle it's separated key/value and coma list
+                    foreach($parameters_array as $param_ligne)
+                    {
+                        list($key,$value) = explode(',',$param_ligne);
+                        $params['options'][$key] = $value;
+                    }
+                }
 
-    			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
-    			$visibility = GETPOST('list', 'alpha');
-    			if ($type == 'separate') $visibility=3;
+                // Visibility: -1=not visible by default in list, 1=visible, 0=hidden
+                $visibility = GETPOST('list', 'alpha');
+                if ($type == 'separate') $visibility=3;
 
                 $result=$extrafields->update(
-    				GETPOST('attrname', 'alpha'),
-    				GETPOST('label', 'alpha'),
-    				$type,
-    				$extrasize,
-    				$elementtype,
-    				(GETPOST('unique', 'alpha')?1:0),
-    				(GETPOST('required', 'alpha')?1:0),
-    				$pos,
-    				$params,
-    				(GETPOST('alwayseditable', 'alpha')?1:0),
-    				(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
-                	$visibility,
-					GETPOST('help','alpha'),
-    			    GETPOST('default_value','alpha'),
-    				GETPOST('computed_value','alpha'),
-    				(GETPOST('entitycurrentorall', 'alpha')?0:''),
+                    GETPOST('attrname', 'alpha'),
+                    GETPOST('label', 'alpha'),
+                    $type,
+                    $extrasize,
+                    $elementtype,
+                    (GETPOST('unique', 'alpha')?1:0),
+                    (GETPOST('required', 'alpha')?1:0),
+                    $pos,
+                    $params,
+                    (GETPOST('alwayseditable', 'alpha')?1:0),
+                    (GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                    $visibility,
+                    GETPOST('help','alpha'),
+                    GETPOST('default_value','alpha'),
+                    GETPOST('computed_value','alpha'),
+                    (GETPOST('entitycurrentorall', 'alpha')?0:''),
                     GETPOST('langfile'),
                     1,
                     (GETPOST('totalizable', 'alpha')?1:0)
-    			);
-    			if ($result > 0)
-    			{
-    				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]);
-    				exit;
-    			}
-    			else
-    			{
+                );
+                if ($result > 0)
+                {
+                    setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+                    header("Location: ".$_SERVER["PHP_SELF"]);
+                    exit;
+                }
+                else
+                {
                     $error++;
-    			    $mesg=$extrafields->error;
-    			    setEventMessages($mesg, null, 'errors');
-    			}
-    		}
-    		else
-    		{
-    		    $error++;
-    			$langs->load("errors");
-    			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
-    			setEventMessages($mesg, null, 'errors');
-    		}
-	    }
-	    else
-	    {
-	    	setEventMessages($mesg, null, 'errors');
-	    }
-	}
+                    $mesg=$extrafields->error;
+                    setEventMessages($mesg, null, 'errors');
+                }
+            }
+            else
+            {
+                $error++;
+                $langs->load("errors");
+                $mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
+                setEventMessages($mesg, null, 'errors');
+            }
+        }
+        else
+        {
+            setEventMessages($mesg, null, 'errors');
+        }
+    }
 }
 
 // Delete attribute
 if ($action == 'delete')
 {
-	if(isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_GET["attrname"]))
-	{
+    if(isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_GET["attrname"]))
+    {
         $result=$extrafields->delete($_GET["attrname"],$elementtype);
         if ($result >= 0)
         {
@@ -394,12 +394,12 @@ 
             exit;
         }
         else $mesg=$extrafields->error;
-	}
-	else
-	{
-	    $error++;
-		$langs->load("errors");
-		$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
-	}
+    }
+    else
+    {
+        $error++;
+        $langs->load("errors");
+        $mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
+    }
 }
 

Spacing +103 added lines, -103 removed lines

@@ -23,18 +23,18 @@ 
  *  \brief			Code for actions on extrafields admin pages
  */
 
-$maxsizestring=255;
-$maxsizeint=10;
-$mesg=array();
+$maxsizestring = 255;
+$maxsizeint = 10;
+$mesg = array();
 
-$extrasize=GETPOST('size','int');
-$type=GETPOST('type','alpha');
-$param=GETPOST('param','alpha');
+$extrasize = GETPOST('size', 'int');
+$type = GETPOST('type', 'alpha');
+$param = GETPOST('param', 'alpha');
 
-if ($type=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
-if ($type=='date')     $extrasize='';
-if ($type=='datetime') $extrasize='';
-if ($type=='select')   $extrasize='';
+if ($type == 'double' && strpos($extrasize, ',') === false) $extrasize = '24,8';
+if ($type == 'date')     $extrasize = '';
+if ($type == 'datetime') $extrasize = '';
+if ($type == 'select')   $extrasize = '';
 
 
 // Add attribute
@@ -43,83 +43,83 @@ 
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
 	    // Check values
-		if (! $type)
+		if (!$type)
 		{
 			$error++;
 			$langs->load("errors");
-			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
+			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			$action = 'create';
 		}
-		if ($type=='varchar' && $extrasize <= 0)
+		if ($type == 'varchar' && $extrasize <= 0)
 		{
 		    $error++;
 		    $langs->load("errors");
-		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
+		    $mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
 		    $action = 'edit';
 		}
-        if ($type=='varchar' && $extrasize > $maxsizestring)
+        if ($type == 'varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForVarcharType",$maxsizestring);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
             $action = 'create';
         }
-        if ($type=='int' && $extrasize > $maxsizeint)
+        if ($type == 'int' && $extrasize > $maxsizeint)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
             $action = 'create';
         }
-        if ($type=='select' && !$param)
+        if ($type == 'select' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectType");
         	$action = 'create';
         }
-        if ($type=='sellist' && !$param)
+        if ($type == 'sellist' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
         	$action = 'create';
         }
-        if ($type=='checkbox' && !$param)
+        if ($type == 'checkbox' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
+        	$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'create';
         }
-        if ($type=='link' && !$param)
+        if ($type == 'link' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForLinkType");
+        	$mesg[] = $langs->trans("ErrorNoValueForLinkType");
         	$action = 'create';
         }
-        if ($type=='radio' && !$param)
+        if ($type == 'radio' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
+        	$mesg[] = $langs->trans("ErrorNoValueForRadioType");
         	$action = 'create';
         }
-        if  ((($type=='radio') || ($type=='checkbox')) && $param)
+        if ((($type == 'radio') || ($type == 'checkbox')) && $param)
         {
         	// Construct array for parameter (value of select list)
     		$parameters = $param;
-    		$parameters_array = explode("\r\n",$parameters);
-    		foreach($parameters_array as $param_ligne)
+    		$parameters_array = explode("\r\n", $parameters);
+    		foreach ($parameters_array as $param_ligne)
     		{
     			if (!empty($param_ligne)) {
-	    			if (preg_match_all('/,/',$param_ligne,$matches))
+	    			if (preg_match_all('/,/', $param_ligne, $matches))
 	    			{
-	    				if (count($matches[0])>1) {
+	    				if (count($matches[0]) > 1) {
 	    					$error++;
 	    					$langs->load("errors");
-	    					$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	    					$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	    					$action = 'create';
 	    				}
 	    			}
@@ -127,25 +127,25 @@ 
 	    			{
 	    				$error++;
 	    				$langs->load("errors");
-	    				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	    				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	    				$action = 'create';
 	    			}
     			}
     		}
         }
 
-	    if (! $error)
+	    if (!$error)
 	    {
     		// attrname must be alphabetical and lower case only
-    		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname']) && !is_numeric($_POST["attrname"]))
+    		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/", $_POST['attrname']) && !is_numeric($_POST["attrname"]))
     		{
     			// Construct array for parameter (value of select list)
-        		$default_value = GETPOST('default_value','alpha');
+        		$default_value = GETPOST('default_value', 'alpha');
     			$parameters = $param;
-    			$parameters_array = explode("\r\n",$parameters);
+    			$parameters_array = explode("\r\n", $parameters);
     			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type=='sellist') {
-    				foreach($parameters_array as $param_ligne)
+    			if ($type == 'sellist') {
+    				foreach ($parameters_array as $param_ligne)
     				{
     					$params['options'] = array($parameters=>null);
     				}
@@ -153,37 +153,37 @@ 
     			else
     			{
     				//Esle it's separated key/value and coma list
-    				foreach($parameters_array as $param_ligne)
+    				foreach ($parameters_array as $param_ligne)
     				{
-    					list($key,$value) = explode(',',$param_ligne);
+    					list($key, $value) = explode(',', $param_ligne);
     					$params['options'][$key] = $value;
     				}
     			}
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-				if ($type == 'separate') $visibility=3;
+				if ($type == 'separate') $visibility = 3;
 
-                $result=$extrafields->addExtraField(
+                $result = $extrafields->addExtraField(
                 	GETPOST('attrname', 'alpha'),
                 	GETPOST('label', 'alpha'),
                 	$type,
                 	GETPOST('pos', 'int'),
                 	$extrasize,
                 	$elementtype,
-                	(GETPOST('unique', 'alpha')?1:0),
-                	(GETPOST('required', 'alpha')?1:0),
+                	(GETPOST('unique', 'alpha') ? 1 : 0),
+                	(GETPOST('required', 'alpha') ? 1 : 0),
                 	$default_value,
                 	$params,
-                	(GETPOST('alwayseditable', 'alpha')?1:0),
-                	(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                	(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
+                	(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
                 	$visibility,
-					GETPOST('help','alpha'),
-                    GETPOST('computed_value','alpha'),
-                	(GETPOST('entitycurrentorall', 'alpha')?0:''),
+					GETPOST('help', 'alpha'),
+                    GETPOST('computed_value', 'alpha'),
+                	(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
                     GETPOST('langfile', 'alpha'),
                     1,
-                    (GETPOST('totalizable', 'alpha')?1:0)
+                    (GETPOST('totalizable', 'alpha') ? 1 : 0)
                 );
     			if ($result > 0)
     			{
@@ -194,7 +194,7 @@ 
     			else
     			{
                     $error++;
-    			    $mesg=$extrafields->error;
+    			    $mesg = $extrafields->error;
                     setEventMessages($mesg, null, 'errors');
     			}
     		}
@@ -202,7 +202,7 @@ 
     		{
                 $error++;
     		    $langs->load("errors");
-    			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters",$langs->transnoentities("AttributeCode"));
+    			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
@@ -220,76 +220,76 @@ 
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
         // Check values
-		if (! $type)
+		if (!$type)
 		{
 			$error++;
 			$langs->load("errors");
-			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
+			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			$action = 'edit';
 		}
-		if ($type=='varchar' && $extrasize <= 0)
+		if ($type == 'varchar' && $extrasize <= 0)
 		{
 		    $error++;
 		    $langs->load("errors");
-		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
+		    $mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
 		    $action = 'edit';
 		}
-		if ($type=='varchar' && $extrasize > $maxsizestring)
+		if ($type == 'varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForVarcharType",$maxsizestring);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
             $action = 'edit';
         }
-        if ($type=='int' && $extrasize > $maxsizeint)
+        if ($type == 'int' && $extrasize > $maxsizeint)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
             $action = 'edit';
         }
-        if ($type=='select' && !$param)
+        if ($type == 'select' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectType");
         	$action = 'edit';
         }
-        if ($type=='sellist' && !$param)
+        if ($type == 'sellist' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
         	$action = 'edit';
         }
-        if ($type=='checkbox' && !$param)
+        if ($type == 'checkbox' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
+        	$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'edit';
         }
-        if ($type=='radio' && !$param)
+        if ($type == 'radio' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
+        	$mesg[] = $langs->trans("ErrorNoValueForRadioType");
         	$action = 'edit';
         }
-        if  ((($type=='radio') || ($type=='checkbox')) && $param)
+        if ((($type == 'radio') || ($type == 'checkbox')) && $param)
         {
         	// Construct array for parameter (value of select list)
         	$parameters = $param;
-        	$parameters_array = explode("\r\n",$parameters);
-        	foreach($parameters_array as $param_ligne)
+        	$parameters_array = explode("\r\n", $parameters);
+        	foreach ($parameters_array as $param_ligne)
         	{
         		if (!empty($param_ligne)) {
-	        		if (preg_match_all('/,/',$param_ligne,$matches))
+	        		if (preg_match_all('/,/', $param_ligne, $matches))
 	        		{
-	        			if (count($matches[0])>1) {
+	        			if (count($matches[0]) > 1) {
 	        				$error++;
 	        				$langs->load("errors");
-	        				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	        				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	        				$action = 'edit';
 	        			}
 	        		}
@@ -297,24 +297,24 @@ 
 	        		{
 	        			$error++;
 	        			$langs->load("errors");
-	        			$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	        			$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	        			$action = 'edit';
 	        		}
         		}
         	}
         }
 
-	    if (! $error)
+	    if (!$error)
 	    {
-            if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname']))
+            if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_POST['attrname']))
     		{
-    			$pos = GETPOST('pos','int');
+    			$pos = GETPOST('pos', 'int');
     			// Construct array for parameter (value of select list)
     			$parameters = $param;
-    			$parameters_array = explode("\r\n",$parameters);
+    			$parameters_array = explode("\r\n", $parameters);
     			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type=='sellist') {
-    				foreach($parameters_array as $param_ligne)
+    			if ($type == 'sellist') {
+    				foreach ($parameters_array as $param_ligne)
     				{
     					$params['options'] = array($parameters=>null);
     				}
@@ -322,37 +322,37 @@ 
     			else
     			{
     				//Esle it's separated key/value and coma list
-    				foreach($parameters_array as $param_ligne)
+    				foreach ($parameters_array as $param_ligne)
     				{
-    					list($key,$value) = explode(',',$param_ligne);
+    					list($key, $value) = explode(',', $param_ligne);
     					$params['options'][$key] = $value;
     				}
     			}
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-    			if ($type == 'separate') $visibility=3;
+    			if ($type == 'separate') $visibility = 3;
 
-                $result=$extrafields->update(
+                $result = $extrafields->update(
     				GETPOST('attrname', 'alpha'),
     				GETPOST('label', 'alpha'),
     				$type,
     				$extrasize,
     				$elementtype,
-    				(GETPOST('unique', 'alpha')?1:0),
-    				(GETPOST('required', 'alpha')?1:0),
+    				(GETPOST('unique', 'alpha') ? 1 : 0),
+    				(GETPOST('required', 'alpha') ? 1 : 0),
     				$pos,
     				$params,
-    				(GETPOST('alwayseditable', 'alpha')?1:0),
-    				(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+    				(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
+    				(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
                 	$visibility,
-					GETPOST('help','alpha'),
-    			    GETPOST('default_value','alpha'),
-    				GETPOST('computed_value','alpha'),
-    				(GETPOST('entitycurrentorall', 'alpha')?0:''),
+					GETPOST('help', 'alpha'),
+    			    GETPOST('default_value', 'alpha'),
+    				GETPOST('computed_value', 'alpha'),
+    				(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
                     GETPOST('langfile'),
                     1,
-                    (GETPOST('totalizable', 'alpha')?1:0)
+                    (GETPOST('totalizable', 'alpha') ? 1 : 0)
     			);
     			if ($result > 0)
     			{
@@ -363,7 +363,7 @@ 
     			else
     			{
                     $error++;
-    			    $mesg=$extrafields->error;
+    			    $mesg = $extrafields->error;
     			    setEventMessages($mesg, null, 'errors');
     			}
     		}
@@ -371,7 +371,7 @@ 
     		{
     		    $error++;
     			$langs->load("errors");
-    			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
+    			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     		}
 	    }
@@ -385,21 +385,21 @@ 
 // Delete attribute
 if ($action == 'delete')
 {
-	if(isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_GET["attrname"]))
+	if (isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_GET["attrname"]))
 	{
-        $result=$extrafields->delete($_GET["attrname"],$elementtype);
+        $result = $extrafields->delete($_GET["attrname"], $elementtype);
         if ($result >= 0)
         {
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
-        else $mesg=$extrafields->error;
+        else $mesg = $extrafields->error;
 	}
 	else
 	{
 	    $error++;
 		$langs->load("errors");
-		$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
+		$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
 	}
 }
 

Braces +31 added lines, -29 removed lines

@@ -31,10 +31,18 @@ 
 $type=GETPOST('type','alpha');
 $param=GETPOST('param','alpha');
 
-if ($type=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
-if ($type=='date')     $extrasize='';
-if ($type=='datetime') $extrasize='';
-if ($type=='select')   $extrasize='';
+if ($type=='double' && strpos($extrasize,',')===false) {
+    $extrasize='24,8';
+}
+if ($type=='date') {
+    $extrasize='';
+}
+if ($type=='datetime') {
+    $extrasize='';
+}
+if ($type=='select') {
+    $extrasize='';
+}
 
 
 // Add attribute
@@ -122,8 +130,7 @@ 
 	    					$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
 	    					$action = 'create';
 	    				}
-	    			}
-	    			else
+	    			} else
 	    			{
 	    				$error++;
 	    				$langs->load("errors");
@@ -149,8 +156,7 @@ 
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
+    			} else
     			{
     				//Esle it's separated key/value and coma list
     				foreach($parameters_array as $param_ligne)
@@ -162,7 +168,9 @@ 
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-				if ($type == 'separate') $visibility=3;
+				if ($type == 'separate') {
+				    $visibility=3;
+				}
 
                 $result=$extrafields->addExtraField(
                 	GETPOST('attrname', 'alpha'),
@@ -190,15 +198,13 @@ 
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else
+    			} else
     			{
                     $error++;
     			    $mesg=$extrafields->error;
                     setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else
+    		} else
     		{
                 $error++;
     		    $langs->load("errors");
@@ -206,8 +212,7 @@ 
     			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
-	    }
-	    else
+	    } else
 	    {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
@@ -292,8 +297,7 @@ 
 	        				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
 	        				$action = 'edit';
 	        			}
-	        		}
-	        		else
+	        		} else
 	        		{
 	        			$error++;
 	        			$langs->load("errors");
@@ -318,8 +322,7 @@ 
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
+    			} else
     			{
     				//Esle it's separated key/value and coma list
     				foreach($parameters_array as $param_ligne)
@@ -331,7 +334,9 @@ 
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-    			if ($type == 'separate') $visibility=3;
+    			if ($type == 'separate') {
+    			    $visibility=3;
+    			}
 
                 $result=$extrafields->update(
     				GETPOST('attrname', 'alpha'),
@@ -359,23 +364,20 @@ 
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else
+    			} else
     			{
                     $error++;
     			    $mesg=$extrafields->error;
     			    setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else
+    		} else
     		{
     		    $error++;
     			$langs->load("errors");
     			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     		}
-	    }
-	    else
+	    } else
 	    {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
@@ -392,10 +394,10 @@ 
         {
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
+        } else {
+            $mesg=$extrafields->error;
         }
-        else $mesg=$extrafields->error;
-	}
-	else
+	} else
 	{
 	    $error++;
 		$langs->load("errors");

dolibarr/htdocs/core/login/functions_openid.php

Spacing +16 added lines, -16 removed lines

@@ -34,13 +34,13 @@ 
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
-function check_user_password_openid($usertotest,$passwordtotest,$entitytotest)
+function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 {
-    global $_POST,$db,$conf,$langs;
+    global $_POST, $db, $conf, $langs;
 
     dol_syslog("functions_openid::check_user_password_openid usertotest=".$usertotest);
 
-    $login='';
+    $login = '';
 
     // Get identity from user and redirect browser to OpenID Server
     if (isset($_POST['username']))
@@ -48,14 +48,14 @@ 
         $openid = new SimpleOpenID();
         $openid->SetIdentity($_POST['username']);
         $protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
-        $openid->SetTrustRoot($protocol . $_SERVER["HTTP_HOST"]);
-        $openid->SetRequiredFields(array('email','fullname'));
+        $openid->SetTrustRoot($protocol.$_SERVER["HTTP_HOST"]);
+        $openid->SetRequiredFields(array('email', 'fullname'));
         $_SESSION['dol_entity'] = $_POST["entity"];
         //$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
         if ($openid->sendDiscoveryRequestToGetXRDS())
         {
-            $openid->SetApprovedURL($protocol . $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"]);      // Send Response from OpenID server to this script
-            $openid->Redirect();     // This will redirect user to OpenID Server
+            $openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
+            $openid->Redirect(); // This will redirect user to OpenID Server
         }
         else
         {
@@ -65,7 +65,7 @@ 
         return false;
     }
     // Perform HTTP Request to OpenID server to validate key
-    elseif($_GET['openid_mode'] == 'id_res')
+    elseif ($_GET['openid_mode'] == 'id_res')
     {
         $openid = new SimpleOpenID();
         $openid->SetIdentity($_GET['openid_identity']);
@@ -74,23 +74,23 @@ 
         {
             // OK HERE KEY IS VALID
 
-            $sql ="SELECT login";
-            $sql.=" FROM ".MAIN_DB_PREFIX."user";
-            $sql.=" WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
-            $sql.=" AND entity IN (0," . ($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1) . ")";
+            $sql = "SELECT login";
+            $sql .= " FROM ".MAIN_DB_PREFIX."user";
+            $sql .= " WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
+            $sql .= " AND entity IN (0,".($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1).")";
 
             dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
-            $resql=$db->query($sql);
+            $resql = $db->query($sql);
             if ($resql)
             {
-                $obj=$db->fetch_object($resql);
+                $obj = $db->fetch_object($resql);
                 if ($obj)
                 {
-                    $login=$obj->login;
+                    $login = $obj->login;
                 }
             }
         }
-        else if($openid->IsError() === true)
+        else if ($openid->IsError() === true)
         {
             // ON THE WAY, WE GOT SOME ERROR
             $error = $openid->GetError();

Braces +4 added lines, -8 removed lines

@@ -56,8 +56,7 @@ 
         {
             $openid->SetApprovedURL($protocol . $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"]);      // Send Response from OpenID server to this script
             $openid->Redirect();     // This will redirect user to OpenID Server
-        }
-        else
+        } else
         {
             $error = $openid->GetError();
             return false;
@@ -89,21 +88,18 @@ 
                     $login=$obj->login;
                 }
             }
-        }
-        else if($openid->IsError() === true)
+        } else if($openid->IsError() === true)
         {
             // ON THE WAY, WE GOT SOME ERROR
             $error = $openid->GetError();
             return false;
-        }
-        else
+        } else
         {
             // Signature Verification Failed
             //echo "INVALID AUTHORIZATION";
             return false;
         }
-    }
-    else if ($_GET['openid_mode'] == 'cancel')
+    } else if ($_GET['openid_mode'] == 'cancel')
     {
         // User Canceled your Request
         //echo "USER CANCELED REQUEST";