Passed
Push — master ( fa5a21...043752 )
by Alxarafe
27:01
created
dolibarr/htdocs/core/lib/usergroups.lib.php 2 patches
Spacing   +121 added lines, -121 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     $head = array();
48 48
 
49 49
     // $head[$h][0] = DOL_URL_ROOT . '/user/card.php?id=' . $object->id;
50
-    $head[$h][0] = BASE_URI . '?controller=user&method=card&id=' . $object->id;
50
+    $head[$h][0] = BASE_URI.'?controller=user&method=card&id='.$object->id;
51 51
     $head[$h][1] = $langs->trans("UserCard");
52 52
     $head[$h][2] = 'user';
53 53
     $h++;
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE)) && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
56 56
         $langs->load("ldap");
57 57
         // $head[$h][0] = DOL_URL_ROOT . '/user/ldap.php?id=' . $object->id;
58
-        $head[$h][0] = BASE_URI . '?controller=user&method=ldap&id=' . $object->id;
58
+        $head[$h][0] = BASE_URI.'?controller=user&method=ldap&id='.$object->id;
59 59
         $head[$h][1] = $langs->trans("LDAPCard");
60 60
         $head[$h][2] = 'ldap';
61 61
         $h++;
@@ -63,14 +63,14 @@  discard block
 block discarded – undo
63 63
 
64 64
     if ($canreadperms) {
65 65
         // $head[$h][0] = DOL_URL_ROOT . '/user/perms.php?id=' . $object->id;
66
-        $head[$h][0] = BASE_URI . '?controller=user&method=perms&id=' . $object->id;
67
-        $head[$h][1] = $langs->trans("Rights") . ' <span class="badge">' . ($object->nb_rights) . '</span>';
66
+        $head[$h][0] = BASE_URI.'?controller=user&method=perms&id='.$object->id;
67
+        $head[$h][1] = $langs->trans("Rights").' <span class="badge">'.($object->nb_rights).'</span>';
68 68
         $head[$h][2] = 'rights';
69 69
         $h++;
70 70
     }
71 71
 
72 72
     // $head[$h][0] = DOL_URL_ROOT . '/user/param_ihm.php?id=' . $object->id;
73
-    $head[$h][0] = BASE_URI . '?controller=user&method=param_ihm&id=' . $object->id;
73
+    $head[$h][0] = BASE_URI.'?controller=user&method=param_ihm&id='.$object->id;
74 74
     $head[$h][1] = $langs->trans("UserGUISetup");
75 75
     $head[$h][2] = 'guisetup';
76 76
     $h++;
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
85 85
         $nbagenda = 0;
86 86
         while ($i <= $MAXAGENDA) {
87 87
             $key = $i;
88
-            $name = 'AGENDA_EXT_NAME_' . $object->id . '_' . $key;
89
-            $src = 'AGENDA_EXT_SRC_' . $object->id . '_' . $key;
90
-            $offsettz = 'AGENDA_EXT_OFFSETTZ_' . $object->id . '_' . $key;
91
-            $color = 'AGENDA_EXT_COLOR_' . $object->id . '_' . $key;
88
+            $name = 'AGENDA_EXT_NAME_'.$object->id.'_'.$key;
89
+            $src = 'AGENDA_EXT_SRC_'.$object->id.'_'.$key;
90
+            $offsettz = 'AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
91
+            $color = 'AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
92 92
             $i++;
93 93
 
94 94
             if (!empty($object->conf->$name)) {
@@ -97,15 +97,15 @@  discard block
 block discarded – undo
97 97
         }
98 98
 
99 99
         // $head[$h][0] = DOL_URL_ROOT . '/user/agenda_extsites.php?id=' . $object->id;
100
-        $head[$h][0] = BASE_URI . '?controller=user&method=agenda_extsites&id=' . $object->id;
101
-        $head[$h][1] = $langs->trans("ExtSites") . ($nbagenda ? ' <span class="badge">' . $nbagenda . '</span>' : '');
100
+        $head[$h][0] = BASE_URI.'?controller=user&method=agenda_extsites&id='.$object->id;
101
+        $head[$h][1] = $langs->trans("ExtSites").($nbagenda ? ' <span class="badge">'.$nbagenda.'</span>' : '');
102 102
         $head[$h][2] = 'extsites';
103 103
         $h++;
104 104
     }
105 105
 
106 106
     if (!empty($conf->clicktodial->enabled)) {
107 107
         // $head[$h][0] = DOL_URL_ROOT . '/user/clicktodial.php?id=' . $object->id;
108
-        $head[$h][0] = BASE_URI . '?controller=user&method=clicktodial&id=' . $object->id;
108
+        $head[$h][0] = BASE_URI.'?controller=user&method=clicktodial&id='.$object->id;
109 109
         $head[$h][1] = $langs->trans("ClickToDial");
110 110
         $head[$h][2] = 'clicktodial';
111 111
         $h++;
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
115 115
     if ($user->societe_id == 0 && !empty($conf->notification->enabled)) {
116 116
         $nbNote = 0;
117 117
         $sql = "SELECT COUNT(n.rowid) as nb";
118
-        $sql .= " FROM " . MAIN_DB_PREFIX . "notify_def as n";
119
-        $sql .= " WHERE fk_user = " . $object->id;
118
+        $sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
119
+        $sql .= " WHERE fk_user = ".$object->id;
120 120
         $resql = $db->query($sql);
121 121
         if ($resql) {
122 122
             $num = $db->num_rows($resql);
@@ -131,10 +131,10 @@  discard block
 block discarded – undo
131 131
         }
132 132
 
133 133
         // $head[$h][0] = DOL_URL_ROOT . '/user/notify/card.php?id=' . $object->id;
134
-        $head[$h][0] = BASE_URI . '?controller=user/notify&method=card&id=' . $object->id;
134
+        $head[$h][0] = BASE_URI.'?controller=user/notify&method=card&id='.$object->id;
135 135
         $head[$h][1] = $langs->trans("Notifications");
136 136
         if ($nbNote > 0) {
137
-            $head[$h][1] .= ' <span class="badge">' . $nbNote . '</span>';
137
+            $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
138 138
         }
139 139
         $head[$h][2] = 'notify';
140 140
         $h++;
@@ -146,11 +146,11 @@  discard block
 block discarded – undo
146 146
     // $this->tabs = array('entity:-tabname);   												to remove a tab
147 147
     complete_head_from_modules($conf, $langs, $object, $head, $h, 'user');
148 148
 
149
-    if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read)) || (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read)) || (!empty($conf->expensereport->enabled) && !empty($user->rights->expensereport->lire) && $user->id == $object->id) || (!empty($conf->holiday->enabled) && !empty($user->rights->holiday->read) && $user->id == $object->id )
149
+    if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read)) || (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read)) || (!empty($conf->expensereport->enabled) && !empty($user->rights->expensereport->lire) && $user->id == $object->id) || (!empty($conf->holiday->enabled) && !empty($user->rights->holiday->read) && $user->id == $object->id)
150 150
     ) {
151 151
         // Bank
152 152
         // $head[$h][0] = DOL_URL_ROOT . '/user/bank.php?id=' . $object->id;
153
-        $head[$h][0] = BASE_URI . '?controller=user&method=bank&id=' . $object->id;
153
+        $head[$h][0] = BASE_URI.'?controller=user&method=bank&id='.$object->id;
154 154
         $head[$h][1] = $langs->trans("HRAndBank");
155 155
         $head[$h][2] = 'bank';
156 156
         $h++;
@@ -164,33 +164,33 @@  discard block
 block discarded – undo
164 164
             $nbNote++;
165 165
         }
166 166
         // $head[$h][0] = DOL_URL_ROOT . '/user/note.php?id=' . $object->id;
167
-        $head[$h][0] = BASE_URI . '?controller=user&method=note&id=' . $object->id;
167
+        $head[$h][0] = BASE_URI.'?controller=user&method=note&id='.$object->id;
168 168
         $head[$h][1] = $langs->trans("Note");
169 169
         if ($nbNote > 0) {
170
-            $head[$h][1] .= ' <span class="badge">' . $nbNote . '</span>';
170
+            $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
171 171
         }
172 172
         $head[$h][2] = 'note';
173 173
         $h++;
174 174
 
175 175
         // Attached files
176
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
177
-        require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
176
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
177
+        require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
178 178
 
179
-        $upload_dir = $conf->user->dir_output . "/" . $object->id;
179
+        $upload_dir = $conf->user->dir_output."/".$object->id;
180 180
         $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
181 181
         $nbLinks = Link::count($db, $object->element, $object->id);
182 182
 
183 183
         // $head[$h][0] = DOL_URL_ROOT . '/user/document.php?userid=' . $object->id;
184
-        $head[$h][0] = BASE_URI . '?controller=user&method=document&userid=' . $object->id;
184
+        $head[$h][0] = BASE_URI.'?controller=user&method=document&userid='.$object->id;
185 185
         $head[$h][1] = $langs->trans("Documents");
186 186
         if (($nbFiles + $nbLinks) > 0) {
187
-            $head[$h][1] .= ' <span class="badge">' . ($nbFiles + $nbLinks) . '</span>';
187
+            $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
188 188
         }
189 189
         $head[$h][2] = 'document';
190 190
         $h++;
191 191
 
192 192
         // $head[$h][0] = DOL_URL_ROOT . '/user/info.php?id=' . $object->id;
193
-        $head[$h][0] = BASE_URI . '?controller=user&method=info&id=' . $object->id;
193
+        $head[$h][0] = BASE_URI.'?controller=user&method=info&id='.$object->id;
194 194
         $head[$h][1] = $langs->trans("Info");
195 195
         $head[$h][2] = 'info';
196 196
         $h++;
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
     $head = array();
221 221
 
222 222
     // $head[$h][0] = DOL_URL_ROOT . '/user/group/card.php?id=' . $object->id;
223
-    $head[$h][0] = BASE_URI . '?controller=user/group&method=card&id=' . $object->id;
223
+    $head[$h][0] = BASE_URI.'?controller=user/group&method=card&id='.$object->id;
224 224
     $head[$h][1] = $langs->trans("GroupCard");
225 225
     $head[$h][2] = 'group';
226 226
     $h++;
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
     if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE)) && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
229 229
         $langs->load("ldap");
230 230
         // $head[$h][0] = DOL_URL_ROOT . '/user/group/ldap.php?id=' . $object->id;
231
-        $head[$h][0] = BASE_URI . '?controller=user/group&method=ldap&id=' . $object->id;
231
+        $head[$h][0] = BASE_URI.'?controller=user/group&method=ldap&id='.$object->id;
232 232
         $head[$h][1] = $langs->trans("LDAPCard");
233 233
         $head[$h][2] = 'ldap';
234 234
         $h++;
@@ -236,8 +236,8 @@  discard block
 block discarded – undo
236 236
 
237 237
     if ($canreadperms) {
238 238
         // $head[$h][0] = DOL_URL_ROOT . '/user/group/perms.php?id=' . $object->id;
239
-        $head[$h][0] = BASE_URI . '?controller=user/group&method=perms&id=' . $object->id;
240
-        $head[$h][1] = $langs->trans("GroupRights") . ' <span class="badge">' . ($object->nb_rights) . '</span>';
239
+        $head[$h][0] = BASE_URI.'?controller=user/group&method=perms&id='.$object->id;
240
+        $head[$h][1] = $langs->trans("GroupRights").' <span class="badge">'.($object->nb_rights).'</span>';
241 241
         $head[$h][2] = 'rights';
242 242
         $h++;
243 243
     }
@@ -266,26 +266,26 @@  discard block
 block discarded – undo
266 266
     $h = 0;
267 267
 
268 268
     // $head[$h][0] = DOL_URL_ROOT . '/admin/user.php';
269
-    $head[$h][0] = BASE_URI . '?controller=admin&method=user';
269
+    $head[$h][0] = BASE_URI.'?controller=admin&method=user';
270 270
     $head[$h][1] = $langs->trans("Parameters");
271 271
     $head[$h][2] = 'card';
272 272
     $h++;
273 273
 
274 274
     // $head[$h][0] = DOL_URL_ROOT . '/admin/usergroup.php';
275
-    $head[$h][0] = BASE_URI . '?controller=admin&method=usergroup';
275
+    $head[$h][0] = BASE_URI.'?controller=admin&method=usergroup';
276 276
     $head[$h][1] = $langs->trans("Group");
277 277
     $head[$h][2] = 'usergroupcard';
278 278
     $h++;
279 279
 
280 280
     // $head[$h][0] = DOL_URL_ROOT . '/user/admin/user_extrafields.php';
281
-    $head[$h][0] = BASE_URI . '?controller=user/admin&method=user_extrafields';
281
+    $head[$h][0] = BASE_URI.'?controller=user/admin&method=user_extrafields';
282 282
     $head[$h][1] = $langs->trans("ExtraFields");
283 283
     $head[$h][2] = 'attributes';
284 284
     $h++;
285 285
 
286 286
     // $head[$h][0] = DOL_URL_ROOT . '/user/admin/group_extrafields.php';
287
-    $head[$h][0] = BASE_URI . '?controller=user/admin&method=group_extrafields';
288
-    $head[$h][1] = $langs->trans("ExtraFields") . " " . $langs->trans("Groups");
287
+    $head[$h][0] = BASE_URI.'?controller=user/admin&method=group_extrafields';
288
+    $head[$h][1] = $langs->trans("ExtraFields")." ".$langs->trans("Groups");
289 289
     $head[$h][2] = 'attributes_group';
290 290
     $h++;
291 291
 
@@ -313,14 +313,14 @@  discard block
 block discarded – undo
313 313
     global $conf, $langs, $db, $form;
314 314
     global $bc;
315 315
 
316
-    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
316
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
317 317
 
318 318
     $formother = new FormOther($db);
319 319
 
320 320
     $dirthemes = array('/theme');
321 321
     if (!empty($conf->modules_parts['theme'])) {  // Using this feature slow down application
322 322
         foreach ($conf->modules_parts['theme'] as $reldir) {
323
-            $dirthemes = array_merge($dirthemes, (array) ($reldir . 'theme'));
323
+            $dirthemes = array_merge($dirthemes, (array) ($reldir.'theme'));
324 324
         }
325 325
     }
326 326
     $dirthemes = array_unique($dirthemes);
@@ -357,40 +357,40 @@  discard block
 block discarded – undo
357 357
 
358 358
     // Title
359 359
     if ($foruserprofile) {
360
-        print '<tr class="liste_titre"><th class="titlefield">' . $langs->trans("Parameter") . '</th><th>' . $langs->trans("DefaultValue") . '</th>';
360
+        print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';
361 361
         print '<th colspan="2">&nbsp;</th>';
362 362
         print '</tr>';
363 363
 
364 364
         print '<tr>';
365
-        print '<td>' . $langs->trans("DefaultSkin") . '</td>';
366
-        print '<td>' . $conf->global->MAIN_THEME . '</td>';
367
-        print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"' . ($edit ? '' : ' disabled') . ' type="checkbox" ' . ($selected_theme ? " checked" : "") . '> ' . $langs->trans("UsePersonalValue") . '</td>';
365
+        print '<td>'.$langs->trans("DefaultSkin").'</td>';
366
+        print '<td>'.$conf->global->MAIN_THEME.'</td>';
367
+        print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit ? '' : ' disabled').' type="checkbox" '.($selected_theme ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
368 368
         print '<td>&nbsp;</td>';
369 369
         print '</tr>';
370 370
     } else {
371
-        print '<tr class="liste_titre"><th class="titlefield">' . $langs->trans("DefaultSkin") . '</th>';
371
+        print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
372 372
         print '<th align="right">';
373 373
         $url = 'https://www.dolistore.com/lang-en/4-skins';
374 374
         if (preg_match('/fr/i', $langs->defaultlang)) {
375 375
             $url = 'https://www.dolistore.com/fr/4-themes';
376 376
         }
377 377
         //if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
378
-        print '<a href="' . $url . '" target="_blank">';
378
+        print '<a href="'.$url.'" target="_blank">';
379 379
         print $langs->trans('DownloadMoreSkins');
380 380
         print '</a>';
381 381
         print '</th></tr>';
382 382
 
383 383
         print '<tr>';
384
-        print '<td>' . $langs->trans("ThemeDir") . '</td>';
384
+        print '<td>'.$langs->trans("ThemeDir").'</td>';
385 385
         print '<td>';
386 386
         foreach ($dirthemes as $dirtheme) {
387
-            echo '"' . $dirtheme . '" ';
387
+            echo '"'.$dirtheme.'" ';
388 388
         }
389 389
         print '</td>';
390 390
         print '</tr>';
391 391
     }
392 392
 
393
-    print '<tr><td colspan="' . $colspan . '">';
393
+    print '<tr><td colspan="'.$colspan.'">';
394 394
 
395 395
     print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
396 396
 
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
             $handle = opendir($dirtheme);
405 405
             if (is_resource($handle)) {
406 406
                 while (($subdir = readdir($handle)) !== false) {
407
-                    if (is_dir($dirtheme . "/" . $subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
407
+                    if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
408 408
                         // Disable not stable themes (dir ends with _exp or _dev)
409 409
                         if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) {
410 410
                             continue;
@@ -414,23 +414,23 @@  discard block
 block discarded – undo
414 414
                         }
415 415
 
416 416
                         print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
417
-                        $file = $dirtheme . "/" . $subdir . "/thumb.png";
418
-                        $url = $urltheme . "/" . $subdir . "/thumb.png";
417
+                        $file = $dirtheme."/".$subdir."/thumb.png";
418
+                        $url = $urltheme."/".$subdir."/thumb.png";
419 419
                         if (!file_exists($file)) {
420
-                            $url = DOL_URL_ROOT . '/public/theme/common/nophoto.png';
420
+                            $url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
421 421
                         }
422
-                        print '<a href="' . $_SERVER["PHP_SELF"] . ($edit ? '?action=edit&theme=' : '?theme=') . $subdir . (GETPOST('optioncss', 'alpha', 1) ? '&optioncss=' . GETPOST('optioncss', 'alpha', 1) : '') . ($fuser ? '&id=' . $fuser->id : '') . '" style="font-weight: normal;" alt="' . $langs->trans("Preview") . '">';
422
+                        print '<a href="'.$_SERVER["PHP_SELF"].($edit ? '?action=edit&theme=' : '?theme=').$subdir.(GETPOST('optioncss', 'alpha', 1) ? '&optioncss='.GETPOST('optioncss', 'alpha', 1) : '').($fuser ? '&id='.$fuser->id : '').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
423 423
                         if ($subdir == $conf->global->MAIN_THEME) {
424 424
                             $title = $langs->trans("ThemeCurrentlyActive");
425 425
                         } else {
426 426
                             $title = $langs->trans("ShowPreview");
427 427
                         }
428
-                        print '<img src="' . $url . '" border="0" width="80" height="60" alt="' . $title . '" title="' . $title . '" style="margin-bottom: 5px;">';
428
+                        print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
429 429
                         print '</a><br>';
430 430
                         if ($subdir == $selected_theme) {
431
-                            print '<input ' . ($edit ? '' : 'disabled') . ' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="' . $subdir . '"> <b>' . $subdir . '</b>';
431
+                            print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
432 432
                         } else {
433
-                            print '<input ' . ($edit ? '' : 'disabled') . ' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="' . $subdir . '"> ' . $subdir;
433
+                            print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
434 434
                         }
435 435
                         print '</div>';
436 436
 
@@ -470,15 +470,15 @@  discard block
 block discarded – undo
470 470
     } else {
471 471
         $default = $langs->trans('No');
472 472
         print '<tr class="oddeven">';
473
-        print '<td>' . $langs->trans("TopMenuDisableImages") . '</td>';
474
-        print '<td colspan="' . ($colspan - 1) . '">';
473
+        print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
474
+        print '<td colspan="'.($colspan - 1).'">';
475 475
         if ($edit) {
476 476
             print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
477 477
         } else {
478 478
             print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
479 479
         }
480
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong>' . $default . '</strong>) ';
481
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
480
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
481
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
482 482
         print '</span>';
483 483
         print '</td>';
484 484
     }
@@ -507,21 +507,21 @@  discard block
 block discarded – undo
507 507
           print '</td>'; */
508 508
     } else {
509 509
         print '<tr class="oddeven">';
510
-        print '<td>' . $langs->trans("BackgroundColor") . '</td>';
511
-        print '<td colspan="' . ($colspan - 1) . '">';
510
+        print '<td>'.$langs->trans("BackgroundColor").'</td>';
511
+        print '<td colspan="'.($colspan - 1).'">';
512 512
         //var_dump($conf->global->THEME_ELDY_BACKBODY);
513 513
         if ($edit) {
514
-            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1) . ' ';
514
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1).' ';
515 515
         } else {
516 516
             $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
517 517
             if ($color) {
518
-                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #' . $color . '" value="' . $color . '">';
518
+                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
519 519
             } else {
520 520
                 print $langs->trans("Default");
521 521
             }
522 522
         }
523
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong>ffffff</strong>) ';
524
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
523
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>ffffff</strong>) ';
524
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
525 525
         print '</span>';
526 526
         print '</td>';
527 527
     }
@@ -555,20 +555,20 @@  discard block
 block discarded – undo
555 555
         }
556 556
 
557 557
         print '<tr class="oddeven">';
558
-        print '<td>' . $langs->trans("TopMenuBackgroundColor") . '</td>';
559
-        print '<td colspan="' . ($colspan - 1) . '">';
558
+        print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
559
+        print '<td colspan="'.($colspan - 1).'">';
560 560
         if ($edit) {
561
-            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1) . ' ';
561
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';
562 562
         } else {
563 563
             $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
564 564
             if ($color) {
565
-                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #' . $color . '" value="' . $color . '">';
565
+                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
566 566
             } else {
567 567
                 print $langs->trans("Default");
568 568
             }
569 569
         }
570
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong>' . $default . '</strong>) ';
571
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
570
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
571
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
572 572
         print '</span>';
573 573
         print '</td>';
574 574
     }
@@ -602,20 +602,20 @@  discard block
 block discarded – undo
602 602
         }
603 603
 
604 604
         print '<tr class="oddeven">';
605
-        print '<td>' . $langs->trans("LeftMenuBackgroundColor") . '</td>';
606
-        print '<td colspan="' . ($colspan - 1) . '">';
605
+        print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
606
+        print '<td colspan="'.($colspan - 1).'">';
607 607
         if ($edit) {
608
-            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1) . ' ';
608
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';
609 609
         } else {
610 610
             $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
611 611
             if ($color) {
612
-                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #' . $color . '" value="' . $color . '">';
612
+                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
613 613
             } else {
614 614
                 print $langs->trans("Default");
615 615
             }
616 616
         }
617
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong>' . $default . '</strong>) ';
618
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
617
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
618
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
619 619
         print '</span>';
620 620
         print '</td>';
621 621
     }
@@ -625,15 +625,15 @@  discard block
 block discarded – undo
625 625
         
626 626
     } else {
627 627
         print '<tr class="oddeven">';
628
-        print '<td>' . $langs->trans("TextTitleColor") . '</td>';
629
-        print '<td colspan="' . ($colspan - 1) . '">';
628
+        print '<td>'.$langs->trans("TextTitleColor").'</td>';
629
+        print '<td colspan="'.($colspan - 1).'">';
630 630
         if ($edit) {
631
-            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1) . ' ';
631
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1).' ';
632 632
         } else {
633 633
             print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
634 634
         }
635
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong><span style="color: #643c14">643c14</span></strong>) ';
636
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
635
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #643c14">643c14</span></strong>) ';
636
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
637 637
         print '</span>';
638 638
         print '</td>';
639 639
 
@@ -645,15 +645,15 @@  discard block
 block discarded – undo
645 645
         
646 646
     } else {
647 647
         print '<tr class="oddeven">';
648
-        print '<td>' . $langs->trans("BackgroundTableTitleColor") . '</td>';
649
-        print '<td colspan="' . ($colspan - 1) . '">';
648
+        print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
649
+        print '<td colspan="'.($colspan - 1).'">';
650 650
         if ($edit) {
651
-            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1) . ' ';
651
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1).' ';
652 652
         } else {
653 653
             print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
654 654
         }
655
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong>f0f0f0</strong>) ';  // $colorbacktitle1 in CSS
656
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
655
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>f0f0f0</strong>) '; // $colorbacktitle1 in CSS
656
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
657 657
         print '</span>';
658 658
         print '</td>';
659 659
 
@@ -665,15 +665,15 @@  discard block
 block discarded – undo
665 665
         
666 666
     } else {
667 667
         print '<tr class="oddeven">';
668
-        print '<td>' . $langs->trans("BackgroundTableTitleTextColor") . '</td>';
669
-        print '<td colspan="' . ($colspan - 1) . '">';
668
+        print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
669
+        print '<td colspan="'.($colspan - 1).'">';
670 670
         if ($edit) {
671
-            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1) . ' ';
671
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1).' ';
672 672
         } else {
673 673
             print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
674 674
         }
675
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong><span style="color: #000000">000000</span></strong>) ';
676
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
675
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #000000">000000</span></strong>) ';
676
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
677 677
         print '</span>';
678 678
         print '</td>';
679 679
 
@@ -690,20 +690,20 @@  discard block
 block discarded – undo
690 690
         }
691 691
 
692 692
         print '<tr class="oddeven">';
693
-        print '<td>' . $langs->trans("BackgroundTableLineOddColor") . '</td>';
694
-        print '<td colspan="' . ($colspan - 1) . '">';
693
+        print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
694
+        print '<td colspan="'.($colspan - 1).'">';
695 695
         if ($edit) {
696
-            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1) . ' ';
696
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';
697 697
         } else {
698 698
             $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
699 699
             if ($color) {
700
-                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #' . $color . '" value="' . $color . '">';
700
+                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
701 701
             } else {
702 702
                 print $langs->trans("Default");
703 703
             }
704 704
         }
705
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong>' . $default . '</strong>) ';
706
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
705
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
706
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
707 707
         print '</span>';
708 708
         print '</td>';
709 709
     }
@@ -718,20 +718,20 @@  discard block
 block discarded – undo
718 718
         }
719 719
 
720 720
         print '<tr class="oddeven">';
721
-        print '<td>' . $langs->trans("BackgroundTableLineEvenColor") . '</td>';
722
-        print '<td colspan="' . ($colspan - 1) . '">';
721
+        print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
722
+        print '<td colspan="'.($colspan - 1).'">';
723 723
         if ($edit) {
724
-            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1) . ' ';
724
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';
725 725
         } else {
726 726
             $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
727 727
             if ($color) {
728
-                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #' . $color . '" value="' . $color . '">';
728
+                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
729 729
             } else {
730 730
                 print $langs->trans("Default");
731 731
             }
732 732
         }
733
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong>' . $default . '</strong>) ';
734
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
733
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
734
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
735 735
         print '</span>';
736 736
         print '</td>';
737 737
     }
@@ -760,22 +760,22 @@  discard block
 block discarded – undo
760 760
           print '</td>'; */
761 761
     } else {
762 762
         print '<tr class="oddeven">';
763
-        print '<td>' . $langs->trans("LinkColor") . '</td>';
764
-        print '<td colspan="' . ($colspan - 1) . '">';
763
+        print '<td>'.$langs->trans("LinkColor").'</td>';
764
+        print '<td colspan="'.($colspan - 1).'">';
765 765
         if ($edit) {
766
-            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1) . ' ';
766
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1).' ';
767 767
         } else {
768 768
             $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
769 769
             if ($color) {
770
-                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #' . $color . '" value="' . $color . '">';
770
+                print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
771 771
             } else {
772 772
                 //print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
773 773
                 //print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
774 774
                 print $langs->trans("Default");
775 775
             }
776 776
         }
777
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong><span style="color: #000078">000078</span></strong>) ';
778
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
777
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) ';
778
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
779 779
         print '</span>';
780 780
         print '</td>';
781 781
     }
@@ -794,8 +794,8 @@  discard block
 block discarded – undo
794 794
          */
795 795
     } else {
796 796
         print '<tr class="oddeven">';
797
-        print '<td>' . $langs->trans("HighlightLinesColor") . '</td>';
798
-        print '<td colspan="' . ($colspan - 1) . '">';
797
+        print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
798
+        print '<td colspan="'.($colspan - 1).'">';
799 799
         //print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
800 800
         //print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
801 801
         if ($edit) {
@@ -804,7 +804,7 @@  discard block
 block discarded – undo
804 804
             } else {
805 805
                 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
806 806
             }
807
-            print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1) . ' ';
807
+            print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';
808 808
         } else {
809 809
             if ($conf->global->THEME_ELDY_USE_HOVER == '1') {
810 810
                 $color = 'e6edf0';
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
812 812
                 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
813 813
             if ($color) {
814 814
                 if ($color != 'e6edf0') {
815
-                    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #' . $color . '" value="' . $color . '">';
815
+                    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
816 816
                 } else {
817 817
                     print $langs->trans("Default");
818 818
                 }
@@ -820,8 +820,8 @@  discard block
 block discarded – undo
820 820
                 print $langs->trans("None");
821 821
             }
822 822
         }
823
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong>e6edf0</strong>) ';
824
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
823
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>e6edf0</strong>) ';
824
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
825 825
         print '</span>';
826 826
         print '</td>';
827 827
     }
@@ -840,8 +840,8 @@  discard block
 block discarded – undo
840 840
          */
841 841
     } else {
842 842
         print '<tr class="oddeven">';
843
-        print '<td>' . $langs->trans("HighlightLinesChecked") . '</td>';
844
-        print '<td colspan="' . ($colspan - 1) . '">';
843
+        print '<td>'.$langs->trans("HighlightLinesChecked").'</td>';
844
+        print '<td colspan="'.($colspan - 1).'">';
845 845
         //print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
846 846
         //print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
847 847
         if ($edit) {
@@ -850,7 +850,7 @@  discard block
 block discarded – undo
850 850
             } else {
851 851
                 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
852 852
             }
853
-            print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1) . ' ';
853
+            print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1).' ';
854 854
         } else {
855 855
             if ($conf->global->THEME_ELDY_USE_CHECKED == '1') {
856 856
                 $color = 'e6edf0';
@@ -859,15 +859,15 @@  discard block
 block discarded – undo
859 859
             }
860 860
             if ($color) {
861 861
                 if ($color != 'e6edf0') {
862
-                    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #' . $color . '" value="' . $color . '">';
862
+                    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
863 863
                 } else {
864 864
                     print $langs->trans("Default");
865 865
                 }
866 866
             } else
867 867
                 print $langs->trans("None");
868 868
         }
869
-        print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong>e6edf0</strong>) ';
870
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
869
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>e6edf0</strong>) ';
870
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
871 871
         print '</span>';
872 872
         print '</td>';
873 873
         print '</tr>';
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -808,8 +808,9 @@  discard block
 block discarded – undo
808 808
         } else {
809 809
             if ($conf->global->THEME_ELDY_USE_HOVER == '1') {
810 810
                 $color = 'e6edf0';
811
-            } else
812
-                $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
811
+            } else {
812
+                            $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
813
+            }
813 814
             if ($color) {
814 815
                 if ($color != 'e6edf0') {
815 816
                     print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #' . $color . '" value="' . $color . '">';
@@ -863,8 +864,9 @@  discard block
 block discarded – undo
863 864
                 } else {
864 865
                     print $langs->trans("Default");
865 866
                 }
866
-            } else
867
-                print $langs->trans("None");
867
+            } else {
868
+                            print $langs->trans("None");
869
+            }
868 870
         }
869 871
         print ' &nbsp; <span class="nowraponall">(' . $langs->trans("Default") . ': <strong>e6edf0</strong>) ';
870 872
         print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
Please login to merge, or discard this patch.
dolibarr/htdocs/core/menus/standard/eldy.lib.php 2 patches
Spacing   +410 added lines, -410 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
  *  \file		htdocs/core/menus/standard/eldy.lib.php
29 29
  *  \brief		Library for file eldy menus
30 30
  */
31
-require_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';
31
+require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
32 32
 
33 33
 /**
34 34
  * Core function to output top menu eldy
@@ -406,14 +406,14 @@  discard block
 block discarded – undo
406 406
                 $param = (isset($tmp[1]) ? $tmp[1] : '');
407 407
 
408 408
                 if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) {
409
-                    $param .= ($param ? '&' : '') . 'mainmenu=' . $newTabMenu[$i]['mainmenu'] . '&leftmenu=';
409
+                    $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
410 410
                 }
411 411
 //$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
412
-                $url = dol_buildpath($url, 1) . ($param ? '?' . $param : '');
412
+                $url = dol_buildpath($url, 1).($param ? '?'.$param : '');
413 413
 //$shorturl = $shorturl.($param?'?'.$param:'');
414 414
                 $shorturl = $url;
415 415
                 if (DOL_URL_ROOT) {
416
-                    $shorturl = preg_replace('/^' . preg_quote(DOL_URL_ROOT, '/') . '/', '', $shorturl);
416
+                    $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
417 417
                 }
418 418
             }
419 419
 
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
     if (empty($noout)) {
440 440
         foreach ($menu->liste as $menkey => $menuval) {
441 441
             print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
442
-            print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT : '') . $menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
442
+            print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
443 443
             print_end_menu_entry($menuval['enabled']);
444 444
         }
445 445
     }
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
     global $conf;
465 465
 
466 466
     print '<div class="tmenudiv">';
467
-    print '<ul class="tmenu"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"') . '>';
467
+    print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
468 468
 }
469 469
 
470 470
 /**
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 function print_start_menu_entry($idsel, $classname, $showmode)
479 479
 {
480 480
     if ($showmode) {
481
-        print '<li ' . $classname . ' id="mainmenutd_' . $idsel . '">';
481
+        print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
482 482
 //print '<div class="tmenuleft tmenusep"></div>';
483 483
         print '<div class="tmenucenter">';
484 484
     }
@@ -501,17 +501,17 @@  discard block
 block discarded – undo
501 501
     global $langs;
502 502
 
503 503
     if ($showmode == 1) {
504
-        print '<a class="tmenuimage" tabindex="-1" href="' . $url . '"' . ($atarget ? ' target="' . $atarget . '"' : '') . '>';
505
-        print '<div class="' . $id . ' ' . $idsel . ' topmenuimage"><span class="' . $id . ' tmenuimage" id="mainmenuspan_' . $idsel . '"></span></div>';
504
+        print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
505
+        print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
506 506
         print '</a>';
507
-        print '<a ' . $classname . ' id="mainmenua_' . $idsel . '" href="' . $url . '"' . ($atarget ? ' target="' . $atarget . '"' : '') . '>';
507
+        print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
508 508
         print '<span class="mainmenuaspan">';
509 509
         print $text;
510 510
         print '</span>';
511 511
         print '</a>';
512 512
     } elseif ($showmode == 2) {
513
-        print '<div class="' . $id . ' ' . $idsel . ' topmenuimage tmenudisabled"><span class="' . $id . '" id="mainmenuspan_' . $idsel . '"></span></div>';
514
-        print '<a class="tmenudisabled" id="mainmenua_' . $idsel . '" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">';
513
+        print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
514
+        print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
515 515
         print '<span class="mainmenuaspan">';
516 516
         print $text;
517 517
         print '</span>';
@@ -576,38 +576,38 @@  discard block
 block discarded – undo
576 576
 // Show logo company
577 577
     if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
578 578
         $mysoc->logo_mini = $conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
579
-        if (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_mini)) {
580
-            $urllogo = DOL_BASE_URI . '/viewimage.php?cache=1&modulepart=mycompany&file=' . urlencode('logos/thumbs/' . $mysoc->logo_mini);
579
+        if (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
580
+            $urllogo = DOL_BASE_URI.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
581 581
         } else {
582
-            $urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';
582
+            $urllogo = DOL_BASE_URI.'/theme/dolibarr_logo.png';
583 583
         }
584 584
         $title = $langs->trans("GoIntoSetupToChangeLogo");
585
-        print "\n" . '<!-- Show logo on menu -->' . "\n";
586
-        print '<div class="blockvmenuimpair blockvmenulogo">' . "\n";
585
+        print "\n".'<!-- Show logo on menu -->'."\n";
586
+        print '<div class="blockvmenuimpair blockvmenulogo">'."\n";
587 587
         print '<div class="menu_titre" id="menu_titre_logo"></div>';
588 588
         print '<div class="menu_top" id="menu_top_logo"></div>';
589 589
         print '<div class="menu_contenu" id="menu_contenu_logo">';
590
-        print '<div class="center"><img class="mycompany" title="' . dol_escape_htmltag($title) . '" alt="" src="' . $urllogo . '" style="max-width: 70%"></div>' . "\n";
590
+        print '<div class="center"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 70%"></div>'."\n";
591 591
         print '</div>';
592 592
         print '<div class="menu_end" id="menu_end_logo"></div>';
593
-        print '</div>' . "\n";
593
+        print '</div>'."\n";
594 594
     }
595 595
 
596 596
     if (is_array($moredata) && !empty($moredata['searchform'])) { // searchform can contains select2 code or link to show old search form or link to switch on search page
597 597
         print "\n";
598 598
         print "<!-- Begin SearchForm -->\n";
599
-        print '<div id="blockvmenusearch" class="blockvmenusearch">' . "\n";
599
+        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
600 600
         print $moredata['searchform'];
601
-        print '</div>' . "\n";
601
+        print '</div>'."\n";
602 602
         print "<!-- End SearchForm -->\n";
603 603
     }
604 604
 
605 605
     if (is_array($moredata) && !empty($moredata['bookmarks'])) {
606 606
         print "\n";
607 607
         print "<!-- Begin Bookmarks -->\n";
608
-        print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">' . "\n";
608
+        print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
609 609
         print $moredata['bookmarks'];
610
-        print '</div>' . "\n";
610
+        print '</div>'."\n";
611 611
         print "<!-- End Bookmarks -->\n";
612 612
     }
613 613
 
@@ -624,11 +624,11 @@  discard block
 block discarded – undo
624 624
 
625