Completed
Branch develop (5a169c)
by
unknown
16:44
created
htdocs/categories/class/categorie.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1642,7 +1642,7 @@
 block discarded – undo
1642 1642
 			$result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;
1643 1643
 		}
1644 1644
 		global $action;
1645
-		$hookmanager->initHooks(array($this->element . 'dao'));
1645
+		$hookmanager->initHooks(array($this->element.'dao'));
1646 1646
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
1647 1647
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
1648 1648
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/loan/class/loan.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -987,7 +987,7 @@
 block discarded – undo
987 987
 		$result .= $linkend;
988 988
 
989 989
 		global $action;
990
-		$hookmanager->initHooks(array($this->element . 'dao'));
990
+		$hookmanager->initHooks(array($this->element.'dao'));
991 991
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
992 992
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
993 993
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/loan/class/paymentloan.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -987,7 +987,7 @@
 block discarded – undo
987 987
 		$result .= $linkend;
988 988
 
989 989
 		global $action;
990
-		$hookmanager->initHooks(array($this->element . 'dao'));
990
+		$hookmanager->initHooks(array($this->element.'dao'));
991 991
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
992 992
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
993 993
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/compta/sociales/class/chargesociales.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -954,7 +954,7 @@
 block discarded – undo
954 954
 		}
955 955
 		$result .= $linkend;
956 956
 		global $action;
957
-		$hookmanager->initHooks(array($this->element . 'dao'));
957
+		$hookmanager->initHooks(array($this->element.'dao'));
958 958
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
959 959
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
960 960
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/ecm/class/ecmdirectory.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -987,7 +987,7 @@
 block discarded – undo
987 987
 		$result .= $linkend;
988 988
 
989 989
 		global $action;
990
-		$hookmanager->initHooks(array($this->element . 'dao'));
990
+		$hookmanager->initHooks(array($this->element.'dao'));
991 991
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
992 992
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
993 993
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/asset/note.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
 	// Object card
93 93
 	// ------------------------------------------------------------
94
-	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
94
+	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
95 95
 
96 96
 	$morehtmlref = '<div class="refidno">';
97 97
 	$morehtmlref .= '</div>';
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
 
107 107
 	$cssclass = "titlefield";
108
-	include DOL_DOCUMENT_ROOT . '/core/tpl/notes.tpl.php';
108
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
109 109
 
110 110
 	print '</div>';
111 111
 
Please login to merge, or discard this patch.
htdocs/asset/disposal.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
 
92 92
 	// Object card
93 93
 	// ------------------------------------------------------------
94
-	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
94
+	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
95 95
 
96 96
 	$morehtmlref = '<div class="refidno">';
97 97
 	$morehtmlref .= '</div>';
Please login to merge, or discard this patch.
htdocs/asset/model/list.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -37,10 +37,10 @@  discard block
 block discarded – undo
37 37
 $show_files		= GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
38 38
 $confirm		= GETPOST('confirm', 'alpha'); // Result of a confirmation
39 39
 $cancel			= GETPOST('cancel', 'alpha'); // We click on a Cancel button
40
-$toselect		= GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
40
+$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
41 41
 $contextpage	= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'assetmodellist'; // To manage different context of search
42 42
 $backtopage		= GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
43
-$optioncss		= GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
43
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
44 44
 
45 45
 $id = GETPOST('id', 'int');
46 46
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
 // Default sort order (if not yet defined by previous GETPOST)
72 72
 if (!$sortfield) {
73
-	reset($object->fields);					// Reset is required to avoid key() to return null.
73
+	reset($object->fields); // Reset is required to avoid key() to return null.
74 74
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
75 75
 }
76 76
 if (!$sortorder) {
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 					$sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
255 255
 				}
256 256
 				if (preg_match('/_dtend$/', $key)) {
257
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
257
+					$sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'";
258 258
 				}
259 259
 			}
260 260
 		}
Please login to merge, or discard this patch.
htdocs/asset/class/assetmodel.class.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 	/**
101 101
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
102 102
 	 */
103
-	public $fields=array(
103
+	public $fields = array(
104 104
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
105 105
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1'),
106 106
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2', 'validate'=>'1',),
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
 
447 447
 		// Protection
448 448
 		if ($this->status == self::STATUS_VALIDATED) {
449
-			dol_syslog(get_class($this) . "::validate action abandonned: already validated", LOG_WARNING);
449
+			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
450 450
 			return 0;
451 451
 		}
452 452
 
@@ -455,17 +455,17 @@  discard block
 block discarded – undo
455 455
 		$this->db->begin();
456 456
 
457 457
 		// Validate
458
-		$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
459
-		$sql .= " SET status = " . self::STATUS_VALIDATED;
458
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
459
+		$sql .= " SET status = ".self::STATUS_VALIDATED;
460 460
 		if (!empty($this->fields['date_validation'])) {
461
-			$sql .= ", date_validation = '" . $this->db->idate($now) . "'";
461
+			$sql .= ", date_validation = '".$this->db->idate($now)."'";
462 462
 		}
463 463
 		if (!empty($this->fields['fk_user_valid'])) {
464
-			$sql .= ", fk_user_valid = " . ((int) $user->id);
464
+			$sql .= ", fk_user_valid = ".((int) $user->id);
465 465
 		}
466
-		$sql .= " WHERE rowid = " . ((int) $this->id);
466
+		$sql .= " WHERE rowid = ".((int) $this->id);
467 467
 
468
-		dol_syslog(get_class($this) . "::validate()", LOG_DEBUG);
468
+		dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
469 469
 		$resql = $this->db->query($sql);
470 470
 		if (!$resql) {
471 471
 			dol_print_error($this->db);
Please login to merge, or discard this patch.