Dolibarr / dolibarr

htdocs/compta/tva/quadri_detail.php

Indentation +4 added lines, -4 removed lines

@@ -144,16 +144,16 @@
 if ($prevquarter > 1) {
 	$prevquarter--;
 } else {
-    $prevquarter = 4;
-    $prevyear--;
+	$prevquarter = 4;
+	$prevyear--;
 }
 $nextyear = $year_start;
 $nextquarter = $q;
 if ($nextquarter < 4) {
 	$nextquarter++;
 } else {
-    $nextquarter = 1;
-    $nextyear++;
+	$nextquarter = 1;
+	$nextyear++;
 }
 $description .= $fsearch;
 $builddate = dol_now();

htdocs/societe/website.php

Indentation +35 added lines, -35 removed lines

@@ -127,39 +127,39 @@ 
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
-
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-    	foreach ($objectwebsiteaccount->fields as $key => $val)
-    	{
-    		$search[$key] = '';
-    	}
-    	$toselect = '';
-    	$search_array_options = array();
-    }
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-    	|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-    {
-    	$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
-
-    // Mass actions
-    $objectclass = 'WebsiteAccount';
-    $objectlabel = 'WebsiteAccount';
-    $permissiontoread = $user->rights->societe->lire;
-    $permissiontodelete = $user->rights->societe->supprimer;
-    $uploaddir = $conf->societe->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
+
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		foreach ($objectwebsiteaccount->fields as $key => $val)
+		{
+			$search[$key] = '';
+		}
+		$toselect = '';
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
+	{
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass = 'WebsiteAccount';
+	$objectlabel = 'WebsiteAccount';
+	$permissiontoread = $user->rights->societe->lire;
+	$permissiontodelete = $user->rights->societe->supprimer;
+	$uploaddir = $conf->societe->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -237,8 +237,8 @@ 
 if (!empty($conf->website->enabled)) {
 	if (!empty($user->rights->societe->lire)) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans("AddWebsiteAccount"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id));
-    } else {
-    	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', 0);
+	} else {
+		$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', 0);
 	}
 }
 

htdocs/supplier_proposal/card.php

Indentation +2 added lines, -2 removed lines

@@ -640,7 +640,7 @@ 
 
 					// if we use supplier description of the products
 					if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
-					    $desc = $productsupplier->desc_supplier;
+						$desc = $productsupplier->desc_supplier;
 					} else $desc = $productsupplier->description;
 
 					if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
@@ -689,7 +689,7 @@ 
 						$productsupplier->fourn_multicurrency_unitprice,
 						$date_start,
 						$date_end
-                    );
+					);
 
 					//var_dump($tva_tx);var_dump($productsupplier->fourn_pu);var_dump($price_base_type);exit;
 					if ($result < 0)

htdocs/core/modules/mrp/mod_mo_advanced.php

Indentation +30 added lines, -30 removed lines

@@ -35,9 +35,9 @@ 
 class mod_mo_advanced extends ModeleNumRefMos
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -51,14 +51,14 @@ 
 	public $name = 'advanced';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -89,22 +89,22 @@ 
 		$texte .= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
-
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+	}
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
+
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -113,7 +113,7 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -122,8 +122,8 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objprod, $object)
-    {
+	public function getNextValue($objprod, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

htdocs/core/boxes/box_contacts.php

Indentation +16 added lines, -16 removed lines

@@ -34,20 +34,20 @@ 
  */
 class box_contacts extends ModeleBoxes
 {
-    public $boxcode = "lastcontacts";
-    public $boximg = "object_contact";
-    public $boxlabel = "BoxLastContacts";
-    public $depends = array("societe");
+	public $boxcode = "lastcontacts";
+	public $boximg = "object_contact";
+	public $boxlabel = "BoxLastContacts";
+	public $depends = array("societe");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -58,18 +58,18 @@ 
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->societe->lire && $user->rights->societe->contact->lire);
+		$this->hidden = !($user->rights->societe->lire && $user->rights->societe->contact->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -119,7 +119,7 @@ 
 					$contactstatic->phone_pro = $objp->phone;
 					$contactstatic->phone_perso = $objp->phone_perso;
 					$contactstatic->phone_mobile = $objp->phone_mobile;
-                    $contactstatic->email = $objp->spemail;
+					$contactstatic->email = $objp->spemail;
 					$contactstatic->address = $objp->address;
 					$contactstatic->zip = $objp->zip;
 					$contactstatic->town = $objp->town;
@@ -128,7 +128,7 @@ 
 
 					$societestatic->id = $objp->fk_soc;
 					$societestatic->name = $objp->socname;
-                    $societestatic->email = $objp->semail;
+					$societestatic->email = $objp->semail;
 					$societestatic->name_alias = $objp->name_alias;
 					$societestatic->code_client = $objp->code_client;
 					$societestatic->code_fournisseur = $objp->code_fournisseur;

htdocs/core/boxes/box_last_modified_ticket.php

Indentation +172 added lines, -172 removed lines

@@ -31,179 +31,179 @@
 class box_last_modified_ticket extends ModeleBoxes
 {
 
-    public $boxcode = "box_last_modified_ticket";
-    public $boximg = "ticket";
-    public $boxlabel;
-    public $depends = array("ticket");
-
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
-
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
-
-    /**
-     * Constructor
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $langs;
+	public $boxcode = "box_last_modified_ticket";
+	public $boximg = "ticket";
+	public $boxlabel;
+	public $depends = array("ticket");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+	/**
+	 * Constructor
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $langs;
 		$langs->load("boxes");
 		$this->db = $db;
 
-        $this->boxlabel = $langs->transnoentitiesnoconv("BoxLastModifiedTicket");
-    }
-
-    /**
-     * Load data into info_box_contents array to show array later.
-     *
-     *     @param  int $max Maximum number of records to load
-     *     @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
-
-        $this->max = $max;
-
-        require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
-
-        $text = $langs->trans("BoxLastModifiedTicketDescription", $max);
-        $this->info_box_head = array(
-         	'text' => $text,
-         	'limit' => dol_strlen($text)
-        );
-
-        $this->info_box_contents[0][0] = array(
-            'td' => 'class="left"',
-            'text' => $langs->trans("BoxLastModifiedTicketContent"),
-        );
-
-        if ($user->rights->ticket->read) {
-            $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
-            $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
-            $sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
-            $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
-
-            $sql .= " WHERE t.entity = ".$conf->entity;
-            //  		$sql.= " AND e.rowid = er.fk_event";
-            //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->socid) {
-                $sql .= " AND t.fk_soc= ".$user->socid;
-            }
-
-            $sql .= " ORDER BY t.tms DESC, t.rowid DESC ";
-            $sql .= $this->db->plimit($max, 0);
-
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $num = $this->db->num_rows($resql);
-
-                $i = 0;
-
-                while ($i < $num) {
-                    $objp = $this->db->fetch_object($resql);
-                    $datec = $this->db->jdate($objp->datec);
-                    $dateterm = $this->db->jdate($objp->fin_validite);
-                    $dateclose = $this->db->jdate($objp->date_cloture);
-                    $late = '';
-
-                    $ticket = new Ticket($this->db);
-                    $ticket->id = $objp->id;
-                    $ticket->track_id = $objp->track_id;
-                    $ticket->ref = $objp->ref;
-                    $ticket->fk_statut = $objp->fk_statut;
-                    $ticket->subject = $objp->subject;
-                    if ($objp->fk_soc > 0) {
-                        $thirdparty = new Societe($this->db);
-                        $thirdparty->id = $objp->fk_soc;
-                        $thirdparty->email = $objp->socemail;
-                        $thirdparty->client = $objp->client;
-                        $thirdparty->fournisseur = $objp->fournisseur;
-                        $thirdparty->name = $objp->company_name;
-                        $link = $thirdparty->getNomUrl(1);
-                    } else {
-                        $link = dol_print_email($objp->origin_email);
-                    }
-
-
-                    $r = 0;
-
-                    // Ticket
-                    $this->info_box_contents[$i][0] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $ticket->getNomUrl(1),
-                        'asis' => 1,
-                    );
-                    $r++;
-
-                    // Subject
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="nowrap"',
-                        'text' => $objp->subject, // Some event have no ref
-                        'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
-                    );
-                    $r++;
-
-                    // Customer
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth300onsmartphone"',
-                        'text' => $link,
-                        'asis' => 1,
-                    );
-                    $r++;
-
-
-                    // Date creation
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec, 'dayhour')
-                    );
-                    $r++;
-
-                    // Statut
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => $ticket->getLibStatut(3)
-                    );
-                    $r++;
-
-                    $i++;
-                }
-
-                if ($num == 0) {
-                    $this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
-                }
-            } else {
-                dol_print_error($this->db);
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
-            );
-        }
-    }
-
-    /**
-     *     Method to show box
-     *
-     *     @param  array $head     Array with properties of box title
-     *     @param  array $contents Array with properties of box lines
-     *     @param  int   $nooutput No print, only return string
-     *     @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+		$this->boxlabel = $langs->transnoentitiesnoconv("BoxLastModifiedTicket");
+	}
+
+	/**
+	 * Load data into info_box_contents array to show array later.
+	 *
+	 *     @param  int $max Maximum number of records to load
+	 *     @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+
+		$this->max = $max;
+
+		require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
+
+		$text = $langs->trans("BoxLastModifiedTicketDescription", $max);
+		$this->info_box_head = array(
+		 	'text' => $text,
+		 	'limit' => dol_strlen($text)
+		);
+
+		$this->info_box_contents[0][0] = array(
+			'td' => 'class="left"',
+			'text' => $langs->trans("BoxLastModifiedTicketContent"),
+		);
+
+		if ($user->rights->ticket->read) {
+			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
+			$sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
+			$sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
+
+			$sql .= " WHERE t.entity = ".$conf->entity;
+			//  		$sql.= " AND e.rowid = er.fk_event";
+			//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if ($user->socid) {
+				$sql .= " AND t.fk_soc= ".$user->socid;
+			}
+
+			$sql .= " ORDER BY t.tms DESC, t.rowid DESC ";
+			$sql .= $this->db->plimit($max, 0);
+
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+
+				$i = 0;
+
+				while ($i < $num) {
+					$objp = $this->db->fetch_object($resql);
+					$datec = $this->db->jdate($objp->datec);
+					$dateterm = $this->db->jdate($objp->fin_validite);
+					$dateclose = $this->db->jdate($objp->date_cloture);
+					$late = '';
+
+					$ticket = new Ticket($this->db);
+					$ticket->id = $objp->id;
+					$ticket->track_id = $objp->track_id;
+					$ticket->ref = $objp->ref;
+					$ticket->fk_statut = $objp->fk_statut;
+					$ticket->subject = $objp->subject;
+					if ($objp->fk_soc > 0) {
+						$thirdparty = new Societe($this->db);
+						$thirdparty->id = $objp->fk_soc;
+						$thirdparty->email = $objp->socemail;
+						$thirdparty->client = $objp->client;
+						$thirdparty->fournisseur = $objp->fournisseur;
+						$thirdparty->name = $objp->company_name;
+						$link = $thirdparty->getNomUrl(1);
+					} else {
+						$link = dol_print_email($objp->origin_email);
+					}
+
+
+					$r = 0;
+
+					// Ticket
+					$this->info_box_contents[$i][0] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $ticket->getNomUrl(1),
+						'asis' => 1,
+					);
+					$r++;
+
+					// Subject
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="nowrap"',
+						'text' => $objp->subject, // Some event have no ref
+						'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
+					);
+					$r++;
+
+					// Customer
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth300onsmartphone"',
+						'text' => $link,
+						'asis' => 1,
+					);
+					$r++;
+
+
+					// Date creation
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec, 'dayhour')
+					);
+					$r++;
+
+					// Statut
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => $ticket->getLibStatut(3)
+					);
+					$r++;
+
+					$i++;
+				}
+
+				if ($num == 0) {
+					$this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed"),
+			);
+		}
+	}
+
+	/**
+	 *     Method to show box
+	 *
+	 *     @param  array $head     Array with properties of box title
+	 *     @param  array $contents Array with properties of box lines
+	 *     @param  int   $nooutput No print, only return string
+	 *     @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }

htdocs/core/boxes/box_lastlogin.php

Indentation +61 added lines, -61 removed lines

@@ -30,75 +30,75 @@ 
  */
 class box_lastlogin extends ModeleBoxes
 {
-    public $boxcode = "lastlogin";
-    public $boximg = "object_user";
-    public $boxlabel = 'BoxLoginInformation';
-    public $depends = array("user");
+	public $boxcode = "lastlogin";
+	public $boximg = "object_user";
+	public $boxlabel = 'BoxLoginInformation';
+	public $depends = array("user");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1;
+	public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $conf;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $conf;
 
-        $this->db = $db;
-    }
+		$this->db = $db;
+	}
 
-    /**
-     *  Charge les donnees en memoire pour affichage ulterieur
-     *
-     *  @param  int     $max        Maximum number of records to load
-     *  @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Charge les donnees en memoire pour affichage ulterieur
+	 *
+	 *  @param  int     $max        Maximum number of records to load
+	 *  @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        $textHead = $langs->trans("BoxLoginInformation");
-        $this->info_box_head = array(
-            'text' => $textHead,
-            'limit'=> dol_strlen($textHead),
-        );
+		$textHead = $langs->trans("BoxLoginInformation");
+		$this->info_box_head = array(
+			'text' => $textHead,
+			'limit'=> dol_strlen($textHead),
+		);
 
-        $line = 0;
-        $this->info_box_contents[$line][0] = array(
-            'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-            'text' => $langs->trans("User"),
-        );
-        $this->info_box_contents[$line][1] = array(
-            'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-            'text' => $user->getNomUrl(-1),
-            'asis' => 1
-        );
+		$line = 0;
+		$this->info_box_contents[$line][0] = array(
+			'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+			'text' => $langs->trans("User"),
+		);
+		$this->info_box_contents[$line][1] = array(
+			'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+			'text' => $user->getNomUrl(-1),
+			'asis' => 1
+		);
 
-        $line = 1;
-        $this->info_box_contents[$line][0] = array(
-            'td' => '',
-            'text' => $langs->trans("PreviousConnexion"),
-        );
-        if ($user->datepreviouslogin) $tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
-        else $tmp = $langs->trans("Unknown");
-        $this->info_box_contents[$line][1] = array(
-            'td' => '',
-            'text' => $tmp,
-        );
-    }
+		$line = 1;
+		$this->info_box_contents[$line][0] = array(
+			'td' => '',
+			'text' => $langs->trans("PreviousConnexion"),
+		);
+		if ($user->datepreviouslogin) $tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
+		else $tmp = $langs->trans("Unknown");
+		$this->info_box_contents[$line][1] = array(
+			'td' => '',
+			'text' => $tmp,
+		);
+	}
 
 
 	/**
@@ -109,8 +109,8 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *  @return	void
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }

htdocs/core/boxes/box_last_ticket.php

Indentation +173 added lines, -173 removed lines

@@ -31,177 +31,177 @@
 class box_last_ticket extends ModeleBoxes
 {
 
-    public $boxcode = "box_last_ticket";
-    public $boximg = "ticket";
-    public $boxlabel;
-    public $depends = array("ticket");
-
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
-
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
-
-    /**
-     * Constructor
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $langs;
-        $langs->load("boxes");
-        $this->db = $db;
-
-        $this->boxlabel = $langs->transnoentitiesnoconv("BoxLastTicket");
-    }
-
-    /**
-     * Load data into info_box_contents array to show array later.
-     *
-     *     @param  int $max Maximum number of records to load
-     *     @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
-
-        $this->max = $max;
-
-        require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
-
-        $text = $langs->trans("BoxLastTicketDescription", $max);
-        $this->info_box_head = array(
-            'text' => $text,
-            'limit' => dol_strlen($text),
-        );
-
-        $this->info_box_contents[0][0] = array(
-            'td' => 'class="left"',
-            'text' => $langs->trans("BoxLastTicketContent"),
-        );
-
-        if ($user->rights->ticket->read) {
-            $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
-            $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
-            $sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
-            $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
-
-            $sql .= " WHERE t.entity = ".$conf->entity;
-            //          $sql.= " AND e.rowid = er.fk_event";
-            //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->socid) {
-                $sql .= " AND t.fk_soc= ".$user->socid;
-            }
-
-            //$sql.= " AND t.fk_statut > 9";
-
-            $sql .= " ORDER BY t.datec DESC, t.rowid DESC ";
-            $sql .= $this->db->plimit($max, 0);
-
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $num = $this->db->num_rows($resql);
-
-                $i = 0;
-
-                while ($i < $num) {
-                    $objp = $this->db->fetch_object($resql);
-                    $datec = $this->db->jdate($objp->datec);
-                    $dateterm = $this->db->jdate($objp->fin_validite);
-                    $dateclose = $this->db->jdate($objp->date_cloture);
-                    $late = '';
-
-                    $ticket = new Ticket($this->db);
-                    $ticket->id = $objp->id;
-                    $ticket->track_id = $objp->track_id;
-                    $ticket->ref = $objp->ref;
-                    $ticket->fk_statut = $objp->fk_statut;
-                    $ticket->subject = $objp->subject;
-                    if ($objp->fk_soc > 0) {
-                        $thirdparty = new Societe($this->db);
-                        $thirdparty->id = $objp->fk_soc;
-                        $thirdparty->email = $objp->socemail;
-                        $thirdparty->client = $objp->client;
-                        $thirdparty->fournisseur = $objp->fournisseur;
-                        $thirdparty->name = $objp->company_name;
-                        $link = $thirdparty->getNomUrl(1);
-                    } else {
-                        $link = dol_print_email($objp->origin_email);
-                    }
-
-                    $r = 0;
-
-                    // Ticket
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $ticket->getNomUrl(1),
-                        'asis' => 1
-                    );
-                    $r++;
-
-                    // Subject
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => '',
-                        'text' => $objp->subject, // Some event have no ref
-                        'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
-                    );
-                    $r++;
-
-                    // Customer
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => '',
-                        'text' => $link,
-                        'asis' => 1,
-                    );
-                    $r++;
-
-                    // Date creation
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec, 'dayhour'),
-                    );
-                    $r++;
-
-                    // Statut
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => $ticket->getLibStatut(3),
-                    );
-                    $r++;
-
-                    $i++;
-                }
-
-                if ($num == 0) {
-                    $this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
-                }
-            } else {
-                dol_print_error($this->db);
-            }
-        } else {
-            $this->info_box_contents[0][0] = array('td' => 'class="left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed"));
-        }
-    }
-
-    /**
-     *     Method to show box
-     *
-     *     @param  array $head     Array with properties of box title
-     *     @param  array $contents Array with properties of box lines
-     *     @param  int   $nooutput No print, only return string
-     *     @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public $boxcode = "box_last_ticket";
+	public $boximg = "ticket";
+	public $boxlabel;
+	public $depends = array("ticket");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+	/**
+	 * Constructor
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $langs;
+		$langs->load("boxes");
+		$this->db = $db;
+
+		$this->boxlabel = $langs->transnoentitiesnoconv("BoxLastTicket");
+	}
+
+	/**
+	 * Load data into info_box_contents array to show array later.
+	 *
+	 *     @param  int $max Maximum number of records to load
+	 *     @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+
+		$this->max = $max;
+
+		require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
+
+		$text = $langs->trans("BoxLastTicketDescription", $max);
+		$this->info_box_head = array(
+			'text' => $text,
+			'limit' => dol_strlen($text),
+		);
+
+		$this->info_box_contents[0][0] = array(
+			'td' => 'class="left"',
+			'text' => $langs->trans("BoxLastTicketContent"),
+		);
+
+		if ($user->rights->ticket->read) {
+			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
+			$sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
+			$sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
+
+			$sql .= " WHERE t.entity = ".$conf->entity;
+			//          $sql.= " AND e.rowid = er.fk_event";
+			//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if ($user->socid) {
+				$sql .= " AND t.fk_soc= ".$user->socid;
+			}
+
+			//$sql.= " AND t.fk_statut > 9";
+
+			$sql .= " ORDER BY t.datec DESC, t.rowid DESC ";
+			$sql .= $this->db->plimit($max, 0);
+
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+
+				$i = 0;
+
+				while ($i < $num) {
+					$objp = $this->db->fetch_object($resql);
+					$datec = $this->db->jdate($objp->datec);
+					$dateterm = $this->db->jdate($objp->fin_validite);
+					$dateclose = $this->db->jdate($objp->date_cloture);
+					$late = '';
+
+					$ticket = new Ticket($this->db);
+					$ticket->id = $objp->id;
+					$ticket->track_id = $objp->track_id;
+					$ticket->ref = $objp->ref;
+					$ticket->fk_statut = $objp->fk_statut;
+					$ticket->subject = $objp->subject;
+					if ($objp->fk_soc > 0) {
+						$thirdparty = new Societe($this->db);
+						$thirdparty->id = $objp->fk_soc;
+						$thirdparty->email = $objp->socemail;
+						$thirdparty->client = $objp->client;
+						$thirdparty->fournisseur = $objp->fournisseur;
+						$thirdparty->name = $objp->company_name;
+						$link = $thirdparty->getNomUrl(1);
+					} else {
+						$link = dol_print_email($objp->origin_email);
+					}
+
+					$r = 0;
+
+					// Ticket
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $ticket->getNomUrl(1),
+						'asis' => 1
+					);
+					$r++;
+
+					// Subject
+					$this->info_box_contents[$i][$r] = array(
+						'td' => '',
+						'text' => $objp->subject, // Some event have no ref
+						'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
+					);
+					$r++;
+
+					// Customer
+					$this->info_box_contents[$i][$r] = array(
+						'td' => '',
+						'text' => $link,
+						'asis' => 1,
+					);
+					$r++;
+
+					// Date creation
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec, 'dayhour'),
+					);
+					$r++;
+
+					// Statut
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => $ticket->getLibStatut(3),
+					);
+					$r++;
+
+					$i++;
+				}
+
+				if ($num == 0) {
+					$this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array('td' => 'class="left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed"));
+		}
+	}
+
+	/**
+	 *     Method to show box
+	 *
+	 *     @param  array $head     Array with properties of box title
+	 *     @param  array $contents Array with properties of box lines
+	 *     @param  int   $nooutput No print, only return string
+	 *     @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }

htdocs/core/modules/security/generate/modGeneratePassPerso.class.php

Indentation +10 added lines, -10 removed lines

@@ -47,9 +47,9 @@ 
 	public $WithoutAmbi;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	public $conf;
 	public $lang;
@@ -145,22 +145,22 @@ 
 	{
 		$pass = "";
 		for ($i = 0; $i < $this->NbMaj; $i++) {
-            // Y
+			// Y
 			$pass .= $this->Maj[mt_rand(0, strlen($this->Maj) - 1)];
 		}
 
 		for ($i = 0; $i < $this->NbNum; $i++) {
-            // X
+			// X
 			$pass .= $this->Nb[mt_rand(0, strlen($this->Nb) - 1)];
 		}
 
 		for ($i = 0; $i < $this->NbSpe; $i++) {
-            // @
+			// @
 			$pass .= $this->Spe[mt_rand(0, strlen($this->Spe) - 1)];
 		}
 
 		for ($i = strlen($pass); $i < $this->length2; $i++) {
-            // y
+			// y
 			$pass .= $this->All[mt_rand(0, strlen($this->All) - 1)];
 		}
 
@@ -211,8 +211,8 @@ 
 	 *  @param		string	$password	Password to check
 	 *  @return     bool
 	 */
-    private function consecutiveInterationSameCharacter($password)
-    {
+	private function consecutiveInterationSameCharacter($password)
+	{
 		$last = "";
 
 		if (empty($this->NbRepeat)) return 1;
@@ -228,7 +228,7 @@ 
 				continue;
 			}
 
-            $count++;
+			$count++;
 			if ($count > $this->NbRepeat) {
 				return false;
 			}