Completed
Push — master ( b16e97...cfa47d )
by Thomas
07:53
created
htdocs/lang/de/ocstyle/newcache.inc.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -22,23 +22,23 @@
 block discarded – undo
22 22
  $show_all = t('Show all');
23 23
  $default_NS = 'N';
24 24
  $default_EW = 'E';
25
- $date_time_format_message = ' ' . t('Format: DD-MM-YYYY');
26
-
27
- $error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
28
- $error_long_not_ok = '<span class="errormsg">' . t('Your chosen coordinated are invalid') . '</span>';
29
- $error_lat_not_ok = $error_long_not_ok . "<br />";
30
- $error_duplicate_coords = '<span class="errormsg">' . t('Another cache (<a href="viewcache.php?wp=%1">%1</a>) exists at these coords. Maybe you pressed "submit cache" twice. To publish a cache with identical coords, enter other coords first, then edit the listing and change coords.') . '</span>';
31
- $time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
32
- $way_length_not_ok_message = '<span class="errormsg">' . t('The entered distance is invalid, Format: aa.aaa') . '</span>';
33
- $date_not_ok_message = '<span class="errormsg">' . t('Invalid date, format:DD-MM-JJJJ') . '</span>';
34
- $name_not_ok_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
35
- $tos_not_ok_message = '<br/><span class="errormsg">' . t('The cache can only be adopted if you agree our terms of use.') . '</span>';
36
- $type_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-type is chosen.') . '</span>';
37
- $size_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-size is chosen.') . '</span>';
38
- $diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
39
- $sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
40
- $safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
41
- $bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
25
+ $date_time_format_message = '&nbsp;'.t('Format:&nbsp;DD-MM-YYYY');
26
+
27
+ $error_general = "<tr><td class='error' colspan='2'><b>".t('Some errors occured, please check the marked fields.')."</b></td></tr>";
28
+ $error_long_not_ok = '<span class="errormsg">'.t('Your chosen coordinated are invalid').'</span>';
29
+ $error_lat_not_ok = $error_long_not_ok."<br />";
30
+ $error_duplicate_coords = '<span class="errormsg">'.t('Another cache (<a href="viewcache.php?wp=%1">%1</a>) exists at these coords. Maybe you pressed "submit cache" twice. To publish a cache with identical coords, enter other coords first, then edit the listing and change coords.').'</span>';
31
+ $time_not_ok_message = '<span class="errormsg">'.t('The entered time is invalid.').'</span>';
32
+ $way_length_not_ok_message = '<span class="errormsg">'.t('The entered distance is invalid, Format: aa.aaa').'</span>';
33
+ $date_not_ok_message = '<span class="errormsg">'.t('Invalid date, format:DD-MM-JJJJ').'</span>';
34
+ $name_not_ok_message = '&nbsp;<span class="errormsg">'.t('Cachename is invalid').'</span>';
35
+ $tos_not_ok_message = '<br/><span class="errormsg">'.t('The cache can only be adopted if you agree our terms of use.').'</span>';
36
+ $type_not_ok_message = '&nbsp;<span class="errormsg">'.t('No cache-type is chosen.').'</span>';
37
+ $size_not_ok_message = '&nbsp;<span class="errormsg">'.t('No cache-size is chosen.').'</span>';
38
+ $diff_not_ok_message = '&nbsp;<span class="errormsg">'.t('Choose both valuations!').'</span>';
39
+ $sizemismatch_message = '&nbsp;<span class="errormsg">'.t('For virtual and webcam caches, the cache size has to be -no container-!').'</span>';
40
+ $safari_not_allowed_message = '<span class="errormsg">'.t('Only virtual caches can be safari caches.').'</span>';
41
+ $bad_wpgc_message = '<span class="errormsg">'.t('GC waypoint is invalid, must be GCxxxxx').'</span>';
42 42
 
43 43
  $cache_submitted = t('Your cache is successfully added to the database. You will be redirected to the cache page, now.');
44 44
 
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/removelog.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,5 +28,5 @@
 block discarded – undo
28 28
 function removed_message_title($lang)
29 29
 {
30 30
     global $translate;
31
-    return $translate->t('The owner of the cache has written the following comment to you:', '', basename(__FILE__), __LINE__, '', 1, $lang) . "\n---";
31
+    return $translate->t('The owner of the cache has written the following comment to you:', '', basename(__FILE__), __LINE__, '', 1, $lang)."\n---";
32 32
 }
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/main.tpl.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,12 +29,12 @@  discard block
 block discarded – undo
29 29
     //Menü laden
30 30
     global $mnu_bgcolor, $mnu_selmenuitem, $develwarning, $tpl_subtitle, $opt, $rootpath, $usr;
31 31
 
32
-    require_once $stylepath . '/lib/menu.php';
32
+    require_once $stylepath.'/lib/menu.php';
33 33
     if (function_exists('post_config')) {
34 34
         post_config();
35 35
     }
36 36
 
37
-    require_once $rootpath . 'lib2/smarty/ocplugins/function.season.php';
37
+    require_once $rootpath.'lib2/smarty/ocplugins/function.season.php';
38 38
 
39 39
     $sUserCountry = getUserCountry();
40 40
     $pageidx = mnu_MainMenuIndexFromPageId($menu, $tplname);
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     if ($tplname != 'start') {
48 48
         $tpl_subtitle .= htmlspecialchars($mnu_selmenuitem['title'], ENT_COMPAT, 'UTF-8');
49 49
     }
50
-    $tpl_subtitle .= ' - ' . htmlspecialchars($opt['locale'][$locale]['page']['subtitle1'], ENT_COMPAT, 'UTF-8');
50
+    $tpl_subtitle .= ' - '.htmlspecialchars($opt['locale'][$locale]['page']['subtitle1'], ENT_COMPAT, 'UTF-8');
51 51
     $meta_keywords = htmlspecialchars($opt['page']['meta']['keywords'], ENT_COMPAT, 'UTF-8');
52 52
     $meta_description = htmlspecialchars($opt['page']['meta']['description'], ENT_COMPAT, 'UTF-8');
53 53
 ?>
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 <?php
148 148
                             foreach ($opt['template']['locales'] AS $k => $lang)
149 149
                                 if ($lang['show'] == true)
150
-                                    echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
150
+                                    echo '<a style="text-decoration: none;" href="index.php?locale='.$k.'"><img src="'.$lang['flag'].'" alt="'.$lang['name'].'" title="'.$lang['name'].'" width="24px" height="18px" /></a> ';
151 151
 ?>
152 152
                         </td>
153 153
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
@@ -163,11 +163,11 @@  discard block
 block discarded – undo
163 163
                                         {
164 164
                                             echo '<option disabled="disabled">';
165 165
                                             if ($tpl_usercountries[$i]['group'] == 1) {
166
-                                                echo '- ' . t('This OC node') . ' -';
166
+                                                echo '- '.t('This OC node').' -';
167 167
                                             } elseif ($tpl_usercountries[$i]['group'] == 2) {
168
-                                                echo '- ' . t('Other OC nodes') . ' -';
168
+                                                echo '- '.t('Other OC nodes').' -';
169 169
                                             } elseif ($tpl_usercountries[$i]['group'] == 3) {
170
-                                                echo '- ' . t('Others') . ' -';
170
+                                                echo '- '.t('Others').' -';
171 171
                                             } else {
172 172
                                                 echo '-';
173 173
                                             }
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
                                         }
176 176
                                         $nLastGroup = $tpl_usercountries[$i]['group'];
177 177
 
178
-                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry==$tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
178
+                                        echo '<option value="'.htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8').'"'.(($sUserCountry == $tpl_usercountries[$i]['country']) ? ' selected="selected"' : '').'>'.htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8').'</option>';
179 179
                                     }
180 180
 ?>
181 181
                                 </select>&nbsp;
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/editcache.inc.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -20,28 +20,28 @@  discard block
 block discarded – undo
20 20
 
21 21
 $error_wrong_node = t('This cache has been created on another Opencaching website. The cache can only be edited there.');
22 22
 
23
-$all_countries_submit = '<input type="submit" name="show_all_countries_submit" id="showallcountries" value="' . t('Show all') . '" class="formbutton" onclick="submitbutton(\'showallcountries\')" />';
24
-$error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
25
-$name_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
26
-$date_message = '<span class="errormsg">' . t('date is invalid') . '</span>';
27
-$coords_message = '<span class="errormsg">' . t('The used coordinates are invalid.') . '</span>';
28
-$time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
29
-$way_length_not_ok_message = '<span class="errormsg">' . t('The distance you have entered is invalid. Format aa.aaa') . '</span>';
30
-$sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
31
-$status_message = '&nbsp;<span class="errormsg">' . t('The cache-status does not fit to your publishing options') . '</span>';
32
-$status_change = '<br /><div style="margin-top:6px"><img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" >' . t('To change the state, you need to <a href="log.php?cacheid=%1">log</a> the new state.') . '</div>';
33
-$diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
34
-$safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
35
-$bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
36
-$nopictures = '<tr><td colspan="2">' . t('No pictures available') . '</td></tr><tr><td colspan="2">&nbsp;</td></tr>';
37
-$pictureline0 = '<tr><td colspan="2"><a href="{link}">{title}</a> [<a href="picture.php?action=edit&uuid={uuid}">' . t('edit') . '</a>] [<a href="picture.php?action=delete&uuid={uuid}">' . t('delete') . '</a>]</td></tr>';
38
-$pictureline = '<tr><td colspan="2"><a href="{link}">{title}</a> [<a href="picture.php?action=edit&uuid={uuid}">' . t('edit') . '</a>] [<a href="picture.php?action=delete&uuid={uuid}">' . t('delete') . '</a>] [<a href="picture.php?action=up&uuid={uuid}">' . t('move up') . '</a>]</td></tr>';
23
+$all_countries_submit = '<input type="submit" name="show_all_countries_submit" id="showallcountries" value="'.t('Show all').'" class="formbutton" onclick="submitbutton(\'showallcountries\')" />';
24
+$error_general = "<tr><td class='error' colspan='2'><b>".t('Some errors occured, please check the marked fields.')."</b></td></tr>";
25
+$name_message = '&nbsp;<span class="errormsg">'.t('Cachename is invalid').'</span>';
26
+$date_message = '<span class="errormsg">'.t('date is invalid').'</span>';
27
+$coords_message = '<span class="errormsg">'.t('The used coordinates are invalid.').'</span>';
28
+$time_not_ok_message = '<span class="errormsg">'.t('The entered time is invalid.').'</span>';
29
+$way_length_not_ok_message = '<span class="errormsg">'.t('The distance you have entered is invalid. Format aa.aaa').'</span>';
30
+$sizemismatch_message = '&nbsp;<span class="errormsg">'.t('For virtual and webcam caches, the cache size has to be -no container-!').'</span>';
31
+$status_message = '&nbsp;<span class="errormsg">'.t('The cache-status does not fit to your publishing options').'</span>';
32
+$status_change = '<br /><div style="margin-top:6px"><img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" >'.t('To change the state, you need to <a href="log.php?cacheid=%1">log</a> the new state.').'</div>';
33
+$diff_not_ok_message = '&nbsp;<span class="errormsg">'.t('Choose both valuations!').'</span>';
34
+$safari_not_allowed_message = '<span class="errormsg">'.t('Only virtual caches can be safari caches.').'</span>';
35
+$bad_wpgc_message = '<span class="errormsg">'.t('GC waypoint is invalid, must be GCxxxxx').'</span>';
36
+$nopictures = '<tr><td colspan="2">'.t('No pictures available').'</td></tr><tr><td colspan="2">&nbsp;</td></tr>';
37
+$pictureline0 = '<tr><td colspan="2"><a href="{link}">{title}</a> [<a href="picture.php?action=edit&uuid={uuid}">'.t('edit').'</a>] [<a href="picture.php?action=delete&uuid={uuid}">'.t('delete').'</a>]</td></tr>';
38
+$pictureline = '<tr><td colspan="2"><a href="{link}">{title}</a> [<a href="picture.php?action=edit&uuid={uuid}">'.t('edit').'</a>] [<a href="picture.php?action=delete&uuid={uuid}">'.t('delete').'</a>] [<a href="picture.php?action=up&uuid={uuid}">'.t('move up').'</a>]</td></tr>';
39 39
 // Ocprop: <a href=\"http://.*?\.opencaching\.de/images/uploads/.*?\">(.*?)<\/a>.*?\[<a href=\"picture\.php\?action=[a-z]*?\&uuid=(.*?)\">
40 40
 $picturelines = '{lines}<tr><td colspan="2">&nbsp;</td></tr>';
41 41
 $gc_com_msg2 = t('To prevent any problems with geocaching.com we want to please you to upload all linked pictures to %1 as well and link the pictures in the HTML code to these on %1');
42 42
 
43
-$nowaypoints = '<tr><td colspan="2">' . t('No waypoints available') . '</td></tr>';
44
-$waypointline = '<tr bgcolor="#ffffff"><td><table class="narrowtable" cellspacing="0" cellpadding="0"><tr><td><img src="{wp_image}" /></td><td>{wp_type}</td></tr></table></td><td><table class="narrowtable"><tr><td style="white-space:nowrap">{wp_coordinate}</td></tr></table></tp><td>{wp_show_description}</td><td>[<a href="childwp.php?cacheid={cacheid}&childid={childid}">' . t('Edit') . '</a>] [<a href="childwp.php?cacheid={cacheid}&deleteid={childid}">' . t('Delete') . '</a>]</td></tr>';
43
+$nowaypoints = '<tr><td colspan="2">'.t('No waypoints available').'</td></tr>';
44
+$waypointline = '<tr bgcolor="#ffffff"><td><table class="narrowtable" cellspacing="0" cellpadding="0"><tr><td><img src="{wp_image}" /></td><td>{wp_type}</td></tr></table></td><td><table class="narrowtable"><tr><td style="white-space:nowrap">{wp_coordinate}</td></tr></table></tp><td>{wp_show_description}</td><td>[<a href="childwp.php?cacheid={cacheid}&childid={childid}">'.t('Edit').'</a>] [<a href="childwp.php?cacheid={cacheid}&deleteid={childid}">'.t('Delete').'</a>]</td></tr>';
45 45
 $waypointlines = '<tr><td colspan="2"><table class="edit_wptable">{lines}</table></td></tr><tr><td colspan="2">&nbsp;</td></tr>';
46 46
 
47 47
 $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
@@ -58,17 +58,17 @@  discard block
 block discarded – undo
58 58
 $activation_form = '
59 59
     <tr><td class="spacer" colspan="2"></td></tr>
60 60
     <tr>
61
-        <td>' . t('Publication:') . '</td>
61
+        <td>' . t('Publication:').'</td>
62 62
         <td>
63
-            <input type="radio" class="radio" name="publish" id="publish_now" value="now" {publish_now_checked} />&nbsp;<label for="publish_now">' . t('Publish now') . '</label><br />
64
-            <input type="radio" class="radio" name="publish" id="publish_later" value="later" {publish_later_checked} />&nbsp;<label for="publish_later">' . t('Publish on') . '</label>
63
+            <input type="radio" class="radio" name="publish" id="publish_now" value="now" {publish_now_checked} />&nbsp;<label for="publish_now">' . t('Publish now').'</label><br />
64
+            <input type="radio" class="radio" name="publish" id="publish_later" value="later" {publish_later_checked} />&nbsp;<label for="publish_later">' . t('Publish on').'</label>
65 65
             <input class="input20" type="text" name="activate_day" maxlength="2" value="{activate_day}"/>.
66 66
             <input class="input20" type="text" name="activate_month" maxlength="2" value="{activate_month}"/>.
67 67
             <input class="input40" type="text" name="activate_year" maxlength="4" value="{activate_year}"/>&nbsp;
68 68
             <select name="activate_hour" class="input60">
69 69
                 {activation_hours}
70
-            </select>&nbsp;' . t('#time_suffix_label#') . '&nbsp;{activate_on_message}<br />
71
-            <input type="radio" class="radio" name="publish" id="publish_notnow" value="notnow" {publish_notnow_checked} />&nbsp;<label for="publish_notnow">' . t('Do not publish now.') . '</label>
70
+            </select>&nbsp;' . t('#time_suffix_label#').'&nbsp;{activate_on_message}<br />
71
+            <input type="radio" class="radio" name="publish" id="publish_notnow" value="notnow" {publish_notnow_checked} />&nbsp;<label for="publish_notnow">' . t('Do not publish now.').'</label>
72 72
         </td>
73 73
     </tr>
74 74
     ';
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/newdesc.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,6 +18,6 @@
 block discarded – undo
18 18
 $submit = t('Add');
19 19
 $default_lang = t('EN');
20 20
  
21
-$lang_message = '<br/><span class="errormsg">' . t('There already exists a description in this language') . '</span>';
22
-$error_no_lang_selected = '&nbsp;<span class="errormsg">' . t('Please select a language.') . "</span>";
23
-$show_all_langs_submit = '&nbsp;<input type="submit" name="show_all_langs_submit" value="' . t('Show all') . '" class="formbutton" onclick="submitbutton(\'show_all_langs_submit\')" />';
21
+$lang_message = '<br/><span class="errormsg">'.t('There already exists a description in this language').'</span>';
22
+$error_no_lang_selected = '&nbsp;<span class="errormsg">'.t('Please select a language.')."</span>";
23
+$show_all_langs_submit = '&nbsp;<input type="submit" name="show_all_langs_submit" value="'.t('Show all').'" class="formbutton" onclick="submitbutton(\'show_all_langs_submit\')" />';
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/lib/menu.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
     /* selmenuitem contains the selected (bold) menu item */
286 286
     global $mnu_selmenuitem;
287 287
 
288
-    for ($i = 0, $ret = - 1; ($i < count($menustructure)) && ($ret == - 1); $i ++) {
288
+    for ($i = 0, $ret = - 1; ($i < count($menustructure)) && ($ret == - 1); $i++) {
289 289
         if ($menustructure[$i]['siteid'] == $pageid) {
290 290
             $mnu_selmenuitem = $menustructure[$i];
291 291
 
@@ -313,22 +313,22 @@  discard block
 block discarded – undo
313 313
     global $menu;
314 314
     $c = 0;
315 315
     $max = count($menu);
316
-    for ($i = 0; $i < $max; $i ++) {
316
+    for ($i = 0; $i < $max; $i++) {
317 317
         if ($menu[$i]['visible'] == true) {
318 318
             $sTarget = isset($menu[$i]['target']) ? $menu[$i]['target'] : '';
319
-            $sItem = '<a href="' . $menu[$i]['filename'] . '" ' . $sTarget . '>' . htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a>';
320
-            $sItemSel = '<a href="' . $menu[$i]['filename'] . '" ' . $sTarget . ' class=\'selected bg-green06\'>' . htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a>';
319
+            $sItem = '<a href="'.$menu[$i]['filename'].'" '.$sTarget.'>'.htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a>';
320
+            $sItemSel = '<a href="'.$menu[$i]['filename'].'" '.$sTarget.' class=\'selected bg-green06\'>'.htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a>';
321 321
 
322 322
             if ($menu[$i]['siteid'] == $selmenuid) {
323 323
                 /* $sItem = '<li>TODO:selected' . $sItem . '</li>'; */
324
-                $sItem = '<li>' . $sItemSel . '</li>';
324
+                $sItem = '<li>'.$sItemSel.'</li>';
325 325
             } else {
326
-                $sItem = '<li>' . $sItem . '</li>';
326
+                $sItem = '<li>'.$sItem.'</li>';
327 327
             }
328 328
 
329
-            echo $sItem . "\n";
329
+            echo $sItem."\n";
330 330
 
331
-            $c ++;
331
+            $c++;
332 332
         }
333 333
     }
334 334
 }
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 
349 349
     if (!$bHasSubmenu) {
350 350
         /* prüfen, ob ein Submenü vorhanden ist */
351
-        for ($i = 0, $bSubmenu = false; ($i < count($menustructure)) && ($bSubmenu == false); $i ++) {
351
+        for ($i = 0, $bSubmenu = false; ($i < count($menustructure)) && ($bSubmenu == false); $i++) {
352 352
             if (isset($menustructure[$i]['submenu'])) {
353 353
                 $bSubmenu = true;
354 354
             }
@@ -365,19 +365,19 @@  discard block
 block discarded – undo
365 365
         }
366 366
     }
367 367
     $maxMenuStructure = count($menustructure);
368
-    for ($i = 0; $i < $maxMenuStructure; $i ++) {
368
+    for ($i = 0; $i < $maxMenuStructure; $i++) {
369 369
         if ($menustructure[$i]['visible'] == true) {
370 370
             if ($menustructure[$i]['siteid'] == $pageid) {
371
-                echo '<li class="' . $cssclass . ' group_active"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
371
+                echo '<li class="'.$cssclass.' group_active"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
372 372
             } else {
373 373
                 if (isset($menustructure[$i]['submenu'])) {
374 374
                     if (mnu_IsMenuParentOf($menustructure[$i]['submenu'], $pageid)) {
375
-                        echo '<li class="' . $cssclass . ' group_active"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
375
+                        echo '<li class="'.$cssclass.' group_active"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
376 376
                     } else {
377
-                        echo '<li class="' . $cssclass . '"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
377
+                        echo '<li class="'.$cssclass.'"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
378 378
                     }
379 379
                 } else {
380
-                    echo '<li class="' . $cssclass . '"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
380
+                    echo '<li class="'.$cssclass.'"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
381 381
                 }
382 382
             }
383 383
 
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
  */
398 398
 function mnu_IsMenuParentOf($parentmenuitems, $menuitemid)
399 399
 {
400
-    for ($i = 0; $i < count($parentmenuitems); $i ++) {
400
+    for ($i = 0; $i < count($parentmenuitems); $i++) {
401 401
         if ($parentmenuitems[$i]['siteid'] == $menuitemid) {
402 402
             return true;
403 403
         }
@@ -439,15 +439,15 @@  discard block
 block discarded – undo
439 439
 function mnu_prv_EchoBreadCrumbSubItem($pageid, $menustructure)
440 440
 {
441 441
     $maxMenuStructure = count($menustructure);
442
-    for ($i = 0; $i < $maxMenuStructure; $i ++) {
442
+    for ($i = 0; $i < $maxMenuStructure; $i++) {
443 443
         if ($menustructure[$i]['siteid'] == $pageid) {
444
-            echo '&nbsp;&gt;&nbsp;' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
444
+            echo '&nbsp;&gt;&nbsp;'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
445 445
 
446 446
             return;
447 447
         } else {
448 448
             if (isset($menustructure[$i]['submenu'])) {
449 449
                 if (mnu_IsMenuParentOf($menustructure[$i]['submenu'], $pageid)) {
450
-                    echo '&nbsp;&gt;&nbsp;' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
450
+                    echo '&nbsp;&gt;&nbsp;'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
451 451
                     mnu_prv_EchoBreadCrumbSubItem($pageid, $menustructure[$i]['submenu']);
452 452
 
453 453
                     return;
@@ -465,6 +465,6 @@  discard block
 block discarded – undo
465 465
 {
466 466
     $helplink = helppagelink($tplname);
467 467
     if ($helplink != "") {
468
-        echo $helplink . '<img src="resource2/ocstyle/images/misc/32x32-help.png" /></a>';
468
+        echo $helplink.'<img src="resource2/ocstyle/images/misc/32x32-help.png" /></a>';
469 469
     }
470 470
 }
Please login to merge, or discard this patch.
htdocs/verifyemail.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  ***************************************************************************/
7 7
 
8 8
 $disable_verifyemail = true;
9
-require __DIR__ . '/lib2/web.inc.php';
9
+require __DIR__.'/lib2/web.inc.php';
10 10
 
11 11
 $tpl->name = 'verifyemail';
12 12
 $tpl->menuitem = MNU_VERIFY_EMAIL;
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
     } else {
29 29
         $tpl->assign('emailadr', $user->getEMail());
30 30
         if ($user->missedDataLicenseMail()) {
31
-            $tpl->assign('datalicensemail', "<br /><br />" . file_get_contents("resource2/misc/datalicensemail.html"));
31
+            $tpl->assign('datalicensemail', "<br /><br />".file_get_contents("resource2/misc/datalicensemail.html"));
32 32
         }
33 33
         $tpl->assign('orgpage', $orgpage);
34 34
     }
Please login to merge, or discard this patch.
htdocs/picture.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  *
17 17
  ***************************************************************************/
18 18
 
19
-require __DIR__ . '/lib2/web.inc.php';
19
+require __DIR__.'/lib2/web.inc.php';
20 20
 
21 21
 $tpl->name = 'picture';
22 22
 $tpl->menuitem = MNU_CACHES_PICTURE;
@@ -75,11 +75,11 @@  discard block
 block discarded – undo
75 75
     if (isset($_REQUEST['ok'])) { // Ocprop
76 76
         $bError = false;
77 77
 
78
-        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
79
-        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false);  // Ocprop
78
+        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1'); // Ocprop
79
+        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false); // Ocprop
80 80
         $picture->setMapPreview(isset($_REQUEST['mappreview']) && $_REQUEST['mappreview'] == '1');
81 81
 
82
-        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : '';  // Ocprop
82
+        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : ''; // Ocprop
83 83
         if ($title == '' || ($picture->getObjectType() == OBJECT_CACHELOG && trim($title) == '')) {
84 84
             $tpl->assign('errortitle', true);
85 85
             $bError = true;
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
                 }
136 136
             } // try saving as jpg and shrinking if > PICTURE_MAX_LONG_SIDE file
137 137
             else {
138
-                $picture->setFilenames(mb_strtolower($fname) . '.jpg');
138
+                $picture->setFilenames(mb_strtolower($fname).'.jpg');
139 139
                 if (!$picture->rotate_and_shrink($_FILES['file']['tmp_name'], PICTURE_MAX_LONG_SIDE)) {
140 140
                     $bError = true;
141 141
                 }
Please login to merge, or discard this patch.
htdocs/ocstats.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,11 +7,11 @@  discard block
 block discarded – undo
7 7
  *  Create / redirect to statpic
8 8
  ***************************************************************************/
9 9
 
10
-require __DIR__ . '/lib2/web.inc.php';
10
+require __DIR__.'/lib2/web.inc.php';
11 11
 
12 12
 // Parameter
13 13
 $jpeg_qualitaet = 80;
14
-$fontfile = $opt['rootpath'] . 'resource2/' . $opt['template']['style'] . '/fonts/dejavu/ttf/DejaVuSans.ttf';
14
+$fontfile = $opt['rootpath'].'resource2/'.$opt['template']['style'].'/fonts/dejavu/ttf/DejaVuSans.ttf';
15 15
 
16 16
 // get userid and style from URL
17 17
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
@@ -66,10 +66,10 @@  discard block
 block discarded – undo
66 66
 
67 67
     if (sql_num_rows($rs) == 1) {
68 68
         $record = sql_fetch_array($rs);
69
-        $tplpath = $opt['rootpath'] . $record['tplpath'];
69
+        $tplpath = $opt['rootpath'].$record['tplpath'];
70 70
         $maxtextwidth = $record['maxtextwidth'];
71 71
     } else {
72
-        $tplpath = $opt['rootpath'] . 'images/ocstats1.gif';
72
+        $tplpath = $opt['rootpath'].'images/ocstats1.gif';
73 73
         $maxtextwidth = 60;
74 74
         $logo = 1;
75 75
     }
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 }
171 171
 
172 172
 // Redirect auf das gespeicherte Bild
173
-$tpl->redirect('images/statpics/statpic' . $userid . $lang . '.jpg');
173
+$tpl->redirect('images/statpics/statpic'.$userid.$lang.'.jpg');
174 174
 
175 175
 function GetFilename($userid, $lang)
176 176
 {
177 177
     global $opt;
178 178
 
179
-    return $opt['rootpath'] . 'images/statpics/statpic' . $userid . $lang . '.jpg';
179
+    return $opt['rootpath'].'images/statpics/statpic'.$userid.$lang.'.jpg';
180 180
 }
Please login to merge, or discard this patch.