Passed
Branch develop (d85e4e)
by Laurent
84:36
created
htdocs/hrm/lib/hrm_skillrank.lib.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
 {
109 109
 	global $db, $conf, $langs;
110 110
 
111
-	require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
112
-	require_once DOL_DOCUMENT_ROOT . '/hrm/class/skilldet.class.php';
111
+	require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
112
+	require_once DOL_DOCUMENT_ROOT.'/hrm/class/skilldet.class.php';
113 113
 
114 114
 	// On charge les différentes notes possibles pour la compétence $fk_skill
115 115
 	$skilldet = new Skilldet($db);
116 116
 	$Lines = $skilldet->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$fk_skill));
117 117
 
118
-	if (!is_array($Lines) && $Lines<0) {
118
+	if (!is_array($Lines) && $Lines < 0) {
119 119
 		setEventMessages($skilldet->error, $skilldet->errors, 'errors');
120 120
 	}
121 121
 	if (empty($Lines)) return $langs->trans('SkillHasNoLines');
@@ -128,29 +128,29 @@  discard block
 block discarded – undo
128 128
 				continue;
129 129
 			}
130 130
 
131
-			$ret .= '<span title="' . $line->description . '" class="radio_js_bloc_number ' . $inputname . '_' . $line->fk_skill;
131
+			$ret .= '<span title="'.$line->description.'" class="radio_js_bloc_number '.$inputname.'_'.$line->fk_skill;
132 132
 			$ret .= $line->rankorder == $selected_rank ? ' selected' : '';
133
-			$ret .= '">' . $line->rankorder . '</span>';
133
+			$ret .= '">'.$line->rankorder.'</span>';
134 134
 		}
135 135
 
136 136
 		if ($mode == 'edit') {
137 137
 			$ret .= '
138
-		<input type="hidden" id="' . $inputname . '_' . $fk_skill . '" name="' . $inputname . '[' . $fk_skill . ']" value="' . $selected_rank . '">
138
+		<input type="hidden" id="' . $inputname.'_'.$fk_skill.'" name="'.$inputname.'['.$fk_skill.']" value="'.$selected_rank.'">
139 139
 		<script type="text/javascript">
140 140
 			$(document).ready(function(){
141 141
 				$(".radio_js_bloc_number").tooltip();
142 142
 				var error,same;
143
-				$(".' . $inputname . '_' . $fk_skill . '").on("click",function(){
143
+				$(".' . $inputname.'_'.$fk_skill.'").on("click",function(){
144 144
 					same=false;
145 145
 					val = $(this).html();
146 146
 					if($(this).hasClass("selected"))same=true;
147
-					$(".' . $inputname . '_' . $fk_skill . '").removeClass("selected");
147
+					$(".' . $inputname.'_'.$fk_skill.'").removeClass("selected");
148 148
 					if(same)
149 149
 					{
150
-						$("#' . $inputname . '_' . $fk_skill . '").val("");
150
+						$("#' . $inputname.'_'.$fk_skill.'").val("");
151 151
 					}else {
152 152
 						$(this).addClass("selected");
153
-						$("#' . $inputname . '_' . $fk_skill . '").val(val);
153
+						$("#' . $inputname.'_'.$fk_skill.'").val(val);
154 154
 					}
155 155
 				});
156 156
 
Please login to merge, or discard this patch.
htdocs/core/lib/project.lib.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 		$nbContacts = $dataretrieved;
56 56
 	} else {
57 57
 		$nbContacts = count($project->liste_contact(-1, 'internal')) + count($project->liste_contact(-1, 'external'));
58
-		dol_setcache($cachekey, $nbContacts, 120);	// If setting cache fails, this is not a problem, so we do not test result.
58
+		dol_setcache($cachekey, $nbContacts, 120); // If setting cache fails, this is not a problem, so we do not test result.
59 59
 	}
60 60
 	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.((int) $project->id).($moreparam ? '&'.$moreparam : '');
61 61
 	$head[$h][1] = $langs->trans("ProjectContact");
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 			require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
80 80
 			$taskstatic = new Task($db);
81 81
 			$nbTasks = count($taskstatic->getTasksArray(0, 0, $project->id, 0, 0));
82
-			dol_setcache($cachekey, $nbTasks, 120);	// If setting cache fails, this is not a problem, so we do not test result.
82
+			dol_setcache($cachekey, $nbTasks, 120); // If setting cache fails, this is not a problem, so we do not test result.
83 83
 		}
84 84
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.((int) $project->id).($moreparam ? '&'.$moreparam : '');
85 85
 		$head[$h][1] = $langs->trans("Tasks");
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 				$obj = $db->fetch_object($resql);
108 108
 				if ($obj) {
109 109
 					$nbTimeSpent = 1;
110
-					dol_setcache($cachekey, $nbTimeSpent, 120);	// If setting cache fails, this is not a problem, so we do not test result.
110
+					dol_setcache($cachekey, $nbTimeSpent, 120); // If setting cache fails, this is not a problem, so we do not test result.
111 111
 				}
112 112
 			} else {
113 113
 				dol_print_error($db);
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 			if (!empty($conf->banque->enabled)) {
198 198
 				$nbElements += $project->getElementCount('variouspayment', 'payment_various');
199 199
 			}
200
-			dol_setcache($cachekey, $nbElements, 120);	// If setting cache fails, this is not a problem, so we do not test result.
200
+			dol_setcache($cachekey, $nbElements, 120); // If setting cache fails, this is not a problem, so we do not test result.
201 201
 		}
202 202
 		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$project->id;
203 203
 		$head[$h][1] = $langs->trans("ProjectOverview");
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 
211 211
 	if ($conf->eventorganization->enabled && !empty($project->usage_organize_event)) {
212 212
 		$langs->load('eventorganization');
213
-		$head[$h][0] = DOL_URL_ROOT . '/eventorganization/conferenceorbooth_list.php?projectid=' . $project->id;
213
+		$head[$h][0] = DOL_URL_ROOT.'/eventorganization/conferenceorbooth_list.php?projectid='.$project->id;
214 214
 		$head[$h][1] = $langs->trans("EventOrganization");
215 215
 
216 216
 		// Enable caching of conf or booth count
@@ -222,18 +222,18 @@  discard block
 block discarded – undo
222 222
 			$nbConfOrBooth = $dataretrieved;
223 223
 		} else {
224 224
 			require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
225
-			$conforbooth=new ConferenceOrBooth($db);
225
+			$conforbooth = new ConferenceOrBooth($db);
226 226
 			$result = $conforbooth->fetchAll('', '', 0, 0, array('t.fk_project'=>$project->id));
227 227
 			//,
228
-			if (!is_array($result) && $result<0) {
228
+			if (!is_array($result) && $result < 0) {
229 229
 				setEventMessages($conforbooth->error, $conforbooth->errors, 'errors');
230 230
 			} else {
231 231
 				$nbConfOrBooth = count($result);
232 232
 			}
233
-			dol_setcache($cachekey, $nbConfOrBooth, 120);	// If setting cache fails, this is not a problem, so we do not test result.
233
+			dol_setcache($cachekey, $nbConfOrBooth, 120); // If setting cache fails, this is not a problem, so we do not test result.
234 234
 		}
235 235
 		if ($nbConfOrBooth > 0) {
236
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbConfOrBooth . '</span>';
236
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbConfOrBooth.'</span>';
237 237
 		}
238 238
 		$head[$h][2] = 'eventorganisation';
239 239
 		$h++;
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 		$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
279 279
 		$nbLinks = Link::count($db, $project->element, $project->id);
280 280
 		$totalAttached = $nbFiles + $nbLinks;
281
-		dol_setcache($cachekey, $totalAttached, 120);		// If setting cache fails, this is not a problem, so we do not test result.
281
+		dol_setcache($cachekey, $totalAttached, 120); // If setting cache fails, this is not a problem, so we do not test result.
282 282
 	}
283 283
 	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$project->id;
284 284
 	$head[$h][1] = $langs->trans('Documents');
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 			$nbComments = $dataretrieved;
300 300
 		} else {
301 301
 			$nbComments = $project->getNbComments();
302
-			dol_setcache($cachekey, $nbComments, 120);		// If setting cache fails, this is not a problem, so we do not test result.
302
+			dol_setcache($cachekey, $nbComments, 120); // If setting cache fails, this is not a problem, so we do not test result.
303 303
 		}
304 304
 		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$project->id;
305 305
 		$head[$h][1] = $langs->trans("CommentLink");
@@ -1307,7 +1307,7 @@  discard block
 block discarded – undo
1307 1307
 
1308 1308
 	$restrictBefore = null;
1309 1309
 
1310
-	if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
1310
+	if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
1311 1311
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
1312 1312
 		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
1313 1313
 	}
@@ -1711,7 +1711,7 @@  discard block
 block discarded – undo
1711 1711
 
1712 1712
 	$restrictBefore = null;
1713 1713
 
1714
-	if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
1714
+	if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
1715 1715
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
1716 1716
 		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
1717 1717
 	}
@@ -1996,7 +1996,7 @@  discard block
 block discarded – undo
1996 1996
 
1997 1997
 					$disabledtaskday = $disabledtask;
1998 1998
 
1999
-					if (! $disabledtask && $restrictBefore && $tmpday < $restrictBefore) {
1999
+					if (!$disabledtask && $restrictBefore && $tmpday < $restrictBefore) {
2000 2000
 						$disabledtaskday = 1;
2001 2001
 					}
2002 2002
 
@@ -2104,7 +2104,7 @@  discard block
 block discarded – undo
2104 2104
 
2105 2105
 	$restrictBefore = null;
2106 2106
 
2107
-	if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
2107
+	if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
2108 2108
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
2109 2109
 		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
2110 2110
 	}
@@ -2278,7 +2278,7 @@  discard block
 block discarded – undo
2278 2278
 					$disabledtaskweek = $disabledtask;
2279 2279
 					$firstdayofweek = dol_mktime(0, 0, 0, $month, $TFirstDay[$weekIndex], $year);
2280 2280
 
2281
-					if (! $disabledtask && $restrictBefore && $firstdayofweek < $restrictBefore) {
2281
+					if (!$disabledtask && $restrictBefore && $firstdayofweek < $restrictBefore) {
2282 2282
 						$disabledtaskweek = 1;
2283 2283
 					}
2284 2284
 
Please login to merge, or discard this patch.
htdocs/install/repair.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1121,7 +1121,7 @@
 block discarded – undo
1121 1121
 									$result = 'found'; // If error, we force like if we found to avoid any deletion
1122 1122
 								}
1123 1123
 							} else {
1124
-								$result = 'found';	//
1124
+								$result = 'found'; //
1125 1125
 							}
1126 1126
 
1127 1127
 							if (!$result) {
Please login to merge, or discard this patch.
htdocs/core/class/html.formactions.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -373,7 +373,7 @@
 block discarded – undo
373 373
 		$caction = new CActionComm($this->db);
374 374
 
375 375
 		// Suggest a list with manual events or all auto events
376
-		$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot, '', 0);		// If we use param 'all' instead of 'code', there is no group by include in answer but the key 'type' of answer array contains the key for the group by.
376
+		$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot, '', 0); // If we use param 'all' instead of 'code', there is no group by include in answer but the key 'type' of answer array contains the key for the group by.
377 377
 		if (empty($multiselect)) {
378 378
 			// Add empty line at start only if no multiselect
379 379
 			array_unshift($arraylist, '&nbsp;');
Please login to merge, or discard this patch.
htdocs/comm/action/card.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 $offsetunit = GETPOST('offsetunittype_duration', 'aZ09');
71 71
 $remindertype = GETPOST('selectremindertype', 'aZ09');
72 72
 $modelmail = GETPOST('actioncommsendmodel_mail', 'int');
73
-$complete = GETPOST('complete', 'alpha');	// 'na' must be allowed
73
+$complete = GETPOST('complete', 'alpha'); // 'na' must be allowed
74 74
 if ($complete == 'na' || $complete == -2) {
75 75
 	$complete = -1;
76 76
 }
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
 if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') {
776 776
 	$error = 0;
777 777
 
778
-	$shour = dol_print_date($object->datep, "%H", 'tzuserrel');		// We take the date visible by user $newdate is also date visible by user.
778
+	$shour = dol_print_date($object->datep, "%H", 'tzuserrel'); // We take the date visible by user $newdate is also date visible by user.
779 779
 	$smin = dol_print_date($object->datep, "%M", 'tzuserrel');
780 780
 
781 781
 	$newdate = GETPOST('newdate', 'alpha');
@@ -993,7 +993,7 @@  discard block
 block discarded – undo
993 993
 		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
994 994
 		$default = (empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT) ? 'AC_RDV' : $conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT);
995 995
 		print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
996
-		print $formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1, 0, 1);	// TODO Replace 0 with -2 in onlyautoornot
996
+		print $formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1, 0, 1); // TODO Replace 0 with -2 in onlyautoornot
997 997
 		print '</td></tr>';
998 998
 	}
999 999
 
@@ -1108,7 +1108,7 @@  discard block
 block discarded – undo
1108 1108
 	// Status
1109 1109
 	print '<tr><td>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
1110 1110
 	print '<td>';
1111
-	$percent = $complete !=='' ? $complete : -1;
1111
+	$percent = $complete !== '' ? $complete : -1;
1112 1112
 	if (GETPOSTISSET('status')) {
1113 1113
 		$percent = GETPOST('status');
1114 1114
 	} elseif (GETPOSTISSET('percentage')) {
@@ -1205,7 +1205,7 @@  discard block
 block discarded – undo
1205 1205
 		if (GETPOST('contactid', 'int')) {
1206 1206
 			$preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
1207 1207
 		}
1208
-		if ($origin=='contact') $preselectedids[GETPOST('originid', 'int')] = GETPOST('originid', 'int');
1208
+		if ($origin == 'contact') $preselectedids[GETPOST('originid', 'int')] = GETPOST('originid', 'int');
1209 1209
 		print img_picto('', 'contact', 'class="paddingrightonly"');
1210 1210
 		print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
1211 1211
 		print '</td></tr>';
@@ -1265,7 +1265,7 @@  discard block
 block discarded – undo
1265 1265
 		}
1266 1266
 		//var_dump('origin='.$origin.' originid='.$originid.' hasPermissionOnLinkedObject='.$hasPermissionOnLinkedObject);
1267 1267
 
1268
-		if (! in_array($origin, array('societe', 'project', 'task', 'user'))) {
1268
+		if (!in_array($origin, array('societe', 'project', 'task', 'user'))) {
1269 1269
 			// We do not use link for object that already contains a hard coded field to make links with agenda events
1270 1270
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("LinkedObject").'</td>';
1271 1271
 			print '<td colspan="3">';
@@ -1418,7 +1418,7 @@  discard block
 block discarded – undo
1418 1418
 			$object->socpeopleassigned[$id] = array('id' => $tmpid);
1419 1419
 		}
1420 1420
 		$object->contact_id   = GETPOST("contactid", 'int');
1421
-		$object->fk_project  = GETPOST("projectid", 'int');
1421
+		$object->fk_project = GETPOST("projectid", 'int');
1422 1422
 
1423 1423
 		$object->note_private = GETPOST("note", 'restricthtml');
1424 1424
 	}
@@ -1850,7 +1850,7 @@  discard block
 block discarded – undo
1850 1850
                    })';
1851 1851
 			print '</script>'."\n";
1852 1852
 
1853
-			print '</div>';		// End of div for reminderparameters
1853
+			print '</div>'; // End of div for reminderparameters
1854 1854
 		}
1855 1855
 
1856 1856
 		print dol_get_fiche_end();
Please login to merge, or discard this patch.
htdocs/product/stats/bom.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 		//Calcul total qty and amount for global if full scan list
130 130
 		$total_qty_toconsume = 0;
131 131
 		$total_qty_toproduce = 0;
132
-		$product_cache=array();
132
+		$product_cache = array();
133 133
 		$bom_data_result = array();
134 134
 
135 135
 		//Qauntity  to produce
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 					}
180 180
 					$bomtmp->fk_product = $objp->fk_product;
181 181
 					$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
182
-					$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache)? $product_cache[$objp->fk_product]->getNomUrl(1): '');
182
+					$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache) ? $product_cache[$objp->fk_product]->getNomUrl(1) : '');
183 183
 					$bom_data_result[$objp->rowid]['qty_toproduce'] += ($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
184 184
 					$bom_data_result[$objp->rowid]['qty_toconsume'] = 0;
185 185
 					$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 
243 243
 					if (!array_key_exists($objp->rowid, $bom_data_result)) {
244 244
 						$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
245
-						$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache)? $product_cache[$objp->fk_product]->getNomUrl(1): '');
245
+						$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache) ? $product_cache[$objp->fk_product]->getNomUrl(1) : '');
246 246
 						$bom_data_result[$objp->rowid]['qty_toproduce'] = 0;
247 247
 						$bom_data_result[$objp->rowid]['qty_toconsume'] += ($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
248 248
 						$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
Please login to merge, or discard this patch.
htdocs/modulebuilder/template/scripts/mymodule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
43 43
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
44 44
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
45
-if (!defined('NOSESSION')) define('NOSESSION', '1');	// On CLI mode, no need to use web sessions
45
+if (!defined('NOSESSION')) define('NOSESSION', '1'); // On CLI mode, no need to use web sessions
46 46
 
47 47
 
48 48
 $sapi_type = php_sapi_name();
Please login to merge, or discard this patch.
htdocs/core/modules/oauth/google_oauthcallback.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -190,7 +190,7 @@
 block discarded – undo
190 190
 	}
191 191
 
192 192
 	// Add more param
193
-	$url .= '&nonce='.bin2hex(random_bytes(64/8));
193
+	$url .= '&nonce='.bin2hex(random_bytes(64 / 8));
194 194
 	// TODO Add param hd and/or login_hint
195 195
 	if (!preg_match('/^forlogin/', $state)) {
196 196
 		//$url .= 'hd=xxx';
Please login to merge, or discard this patch.
htdocs/core/tpl/login.tpl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -332,9 +332,9 @@  discard block
 block discarded – undo
332 332
 	echo '<div class="center" style="margin-top: 4px;">';
333 333
 
334 334
 	//$shortscope = 'userinfo_email,userinfo_profile';
335
-	$shortscope = 'openid,email,profile';	// For openid connect
335
+	$shortscope = 'openid,email,profile'; // For openid connect
336 336
 
337
-	$oauthstateanticsrf = bin2hex(random_bytes(128/8));
337
+	$oauthstateanticsrf = bin2hex(random_bytes(128 / 8));
338 338
 	$_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf;
339 339
 	$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state=forlogin-'.$shortscope.'-'.$oauthstateanticsrf;
340 340
 
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 		$resgetcommitstrip = getURLContent("https://www.commitstrip.com/en/feed/");
375 375
 	}
376 376
 	if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200') {
377
-		$xml = simplexml_load_string($resgetcommitstrip['content'], 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
377
+		$xml = simplexml_load_string($resgetcommitstrip['content'], 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
378 378
 		$little = $xml->channel->item[0]->children('content', true);
379 379
 		print preg_replace('/width="650" height="658"/', '', $little->encoded);
380 380
 	}
Please login to merge, or discard this patch.