Completed
Branch develop (a99e44)
by
unknown
15:19
created
htdocs/don/class/don.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/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/tpl/depreciation_options_edit.tpl.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -221,7 +221,7 @@
 block discarded – undo
221 221
 		}
222 222
 	});
223 223
 </script>
224
-SCRIPT;
224
+script;
225 225
 }
226 226
 
227 227
 ?>
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 }
36 36
 
37 37
 if (!isset($formadmin) || !is_object($formadmin)) {
38
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
38
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
39 39
 	$formadmin = new FormAdmin($db);
40 40
 }
41 41
 
@@ -69,14 +69,14 @@  discard block
 block discarded – undo
69 69
 				'mode_key' => $info[0],
70 70
 				'field_key' => $info[1],
71 71
 				'value' => $info[2],
72
-				'target' => 'block_' . $mode_key,
72
+				'target' => 'block_'.$mode_key,
73 73
 			);
74 74
 		}
75 75
 
76 76
 		$assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true);
77
-		$prefix_html_name = $mode_key . '_';
78
-		$width = ($mode_key == "economic")? "width50p pull-left" : "width50p";
79
-		print '<table class="border '. $width .'" id="block_' . $mode_key . '">' . "\n";
77
+		$prefix_html_name = $mode_key.'_';
78
+		$width = ($mode_key == "economic") ? "width50p pull-left" : "width50p";
79
+		print '<table class="border '.$width.'" id="block_'.$mode_key.'">'."\n";
80 80
 		print '<tr><td class="info-box-title">'.$langs->trans($mode_info['label']).'</td></tr>';
81 81
 		if ($mode_key == "economic") {
82 82
 			print '<hr>';
@@ -92,14 +92,14 @@  discard block
 block discarded – undo
92 92
 			}
93 93
 
94 94
 
95
-			$html_name = $prefix_html_name . $field_key;
95
+			$html_name = $prefix_html_name.$field_key;
96 96
 			if (!empty($field_info['enabled_field'])) {
97 97
 				$info = explode(':', $field_info['enabled_field']);
98 98
 				$enabled_field_info[] = array(
99 99
 					'mode_key' => $info[0],
100 100
 					'field_key' => $info[1],
101 101
 					'value' => $info[2],
102
-					'target' => 'field_' . $html_name,
102
+					'target' => 'field_'.$html_name,
103 103
 				);
104 104
 			}
105 105
 
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
 				$more_class .= ' tdtop';
112 112
 			}
113 113
 
114
-			print '<tr class="field_' . $html_name . '" id="field_' . $html_name . '"><td';
115
-			print ' class="' . $more_class . '">';
114
+			print '<tr class="field_'.$html_name.'" id="field_'.$html_name.'"><td';
115
+			print ' class="'.$more_class.'">';
116 116
 			if (!empty($field_info['help'])) {
117 117
 				print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help']));
118 118
 			} else {
Please login to merge, or discard this patch.