OpencachingDeutschland / oc-server3

htdocs/lang/de/ocstyle/removelog.inc.php

Indentation +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
         
  ****************************************************************************/
 
- $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
- $removed_message_end = '---';
+    $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
+    $removed_message_end = '---';
  
 
 function removed_log_subject($lang)

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
 function removed_message_title($lang)
 {
     global $translate;
-    return $translate->t('The owner of the cache has written the following comment to you:', '', basename(__FILE__), __LINE__, '', 1, $lang) . "\n---";
+    return $translate->t('The owner of the cache has written the following comment to you:', '', basename(__FILE__), __LINE__, '', 1, $lang)."\n---";
 }

htdocs/lang/de/ocstyle/removedesc.inc.php

Indentation +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@
      
  ****************************************************************************/
  
- $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
+    $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
 
- $commit = t('the cache description has been deleted');
- $commit_title = t('delete this cache-description');
+    $commit = t('the cache description has been deleted');
+    $commit_title = t('delete this cache-description');

htdocs/lang/de/ocstyle/varset.inc.php

Indentation +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 $error_suffix = '</span>';
 
 $htmlnotice =
- '<tr><td class="spacer" colspan="2"></td></tr>
+    '<tr><td class="spacer" colspan="2"></td></tr>
     <tr>
         <td class="help" colspan="2">
             <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice') . '" title="' . t('Notice') . '" />

Spacing +12 added lines, -12 removed lines

@@ -22,33 +22,33 @@ 
 tpl_set_var('loginbox', ' ');
 tpl_set_var(
     'functionsbox',
-    '<a href="index.php?page=suche">' . t('Search') . '</a> | <a href="index.php?page=sitemap">' . t('Sitemap') . '</a>'
+    '<a href="index.php?page=suche">'.t('Search').'</a> | <a href="index.php?page=sitemap">'.t('Sitemap').'</a>'
 );
 tpl_set_var('runtime', '');
 
 //set up main template specific string
-$sLoggedOut = '<form action="' . ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '') . 'login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;"><b>' . t(
+$sLoggedOut = '<form action="'.($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '').'login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;"><b>'.t(
         'User:'
-    ) . '</b>&nbsp;&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;&nbsp;&nbsp;<b>' . t(
+    ).'</b>&nbsp;&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;&nbsp;&nbsp;<b>'.t(
         'Password:'
-    ) . '</b>&nbsp;&nbsp;<input name="password" size="10" type="password" class="textboxes" value="" />&nbsp;<input type="hidden" name="action" value="login" /><input type="hidden" name="target" value="{target}" /><input type="hidden" name="source" value="titlebar" />&nbsp;<input type="submit" name="LogMeIn" value="' . t(
+    ).'</b>&nbsp;&nbsp;<input name="password" size="10" type="password" class="textboxes" value="" />&nbsp;<input type="hidden" name="action" value="login" /><input type="hidden" name="target" value="{target}" /><input type="hidden" name="source" value="titlebar" />&nbsp;<input type="submit" name="LogMeIn" value="'.t(
         'Login'
-    ) . '" class="formbutton" style="width: 74px;" onclick="submitbutton(\'LogMeIn\')" /></form>';
-$sLoggedIn = "<b>" . t(
+    ).'" class="formbutton" style="width: 74px;" onclick="submitbutton(\'LogMeIn\')" /></form>';
+$sLoggedIn = "<b>".t(
         'Logged in as'
-    ) . ' <a href="myhome.php" class="testing-top-left-corner-username">{username}</a></b> - <a href="login.php?action=logout">' . t(
+    ).' <a href="myhome.php" class="testing-top-left-corner-username">{username}</a></b> - <a href="login.php?action=logout">'.t(
         'Logout'
-    ) . '</a>';
+    ).'</a>';
 
 // target in Loginbox setzen
-$target = basename($_SERVER['PHP_SELF']) . '?';
+$target = basename($_SERVER['PHP_SELF']).'?';
 
 // REQUEST-Variablen durchlaufen und an target anhaengen
 $allowed = ['cacheid', 'userid', 'logid', 'desclang', 'descid'];
 reset($_REQUEST);
 while (list ($varname, $varvalue) = each($_REQUEST)) {
     if (in_array($varname, $allowed)) {
-        $target .= $varname . '=' . $varvalue . '&';
+        $target .= $varname.'='.$varvalue.'&';
     }
 }
 if (mb_substr($target, - 1) == '?' || mb_substr($target, - 1) == '&') {
@@ -74,10 +74,10 @@ 
  '<tr><td class="spacer" colspan="2"></td></tr>
     <tr>
         <td class="help" colspan="2">
-            <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice') . '" title="' . t('Notice') . '" />
+            <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice').'" title="'.t('Notice').'" />
             ' . t('Your HTML code will be changed again by a special filter. This is necessary to avoid dangerous HTML-tags,
                  such as &lt;script&gt;. A list of allowed HTML tags, you can find
-                 <a href="articles.php?page=htmltags">here</a>') . '
+                 <a href="articles.php?page=htmltags">here</a>').'
         </td>
     </tr>
     ';

htdocs/lang/de/expressions.inc.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 //common vars
 $dateformat = $opt['locale'][$locale]['format']['date'];
-$reset = t('Reset');  // obsolete
+$reset = t('Reset'); // obsolete
 $yes = t('Yes');
 $no = t('No');
 

htdocs/ocstats.php

Braces +2 added lines, -1 removed lines

@@ -17,8 +17,9 @@
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
 $lang = isset($_REQUEST['lang']) ? mb_strtoupper($_REQUEST['lang']) : $opt['template']['locale'];
 
-if (!isset($opt['locale'][$lang]))
+if (!isset($opt['locale'][$lang])) {
     $lang = $opt['template']['locale'];
+}
 
 $filename = GetFilename($userid, $lang);
 

Spacing +6 added lines, -6 removed lines

@@ -7,11 +7,11 @@ 
  *  Create / redirect to statpic
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 // Parameter
 $jpeg_qualitaet = 80;
-$fontfile = $opt['rootpath'] . 'resource2/' . $opt['template']['style'] . '/fonts/dejavu/ttf/DejaVuSans.ttf';
+$fontfile = $opt['rootpath'].'resource2/'.$opt['template']['style'].'/fonts/dejavu/ttf/DejaVuSans.ttf';
 
 // get userid and style from URL
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
@@ -66,10 +66,10 @@ 
 
     if (sql_num_rows($rs) == 1) {
         $record = sql_fetch_array($rs);
-        $tplpath = $opt['rootpath'] . $record['tplpath'];
+        $tplpath = $opt['rootpath'].$record['tplpath'];
         $maxtextwidth = $record['maxtextwidth'];
     } else {
-        $tplpath = $opt['rootpath'] . 'images/ocstats1.gif';
+        $tplpath = $opt['rootpath'].'images/ocstats1.gif';
         $maxtextwidth = 60;
         $logo = 1;
     }
@@ -170,11 +170,11 @@ 
 }
 
 // Redirect auf das gespeicherte Bild
-$tpl->redirect('images/statpics/statpic' . $userid . $lang . '.jpg');
+$tpl->redirect('images/statpics/statpic'.$userid.$lang.'.jpg');
 
 function GetFilename($userid, $lang)
 {
     global $opt;
 
-    return $opt['rootpath'] . 'images/statpics/statpic' . $userid . $lang . '.jpg';
+    return $opt['rootpath'].'images/statpics/statpic'.$userid.$lang.'.jpg';
 }

htdocs/util2/cron/modules/purge_logs.class.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 class purge_logs
 {
     public $name = 'purge_logs';
-    public $interval = 86400;    // daily
+    public $interval = 86400; // daily
 
     public function run()
     {

htdocs/util2/cron/modules/maillog.class.php

Braces +3 added lines, -1 removed lines

@@ -112,7 +112,8 @@ 
                             $emailadr
                         );
                     } else {
-                        if ($bounced) // maximum one bounce per day is counted, to filter out temporary problems
+                        if ($bounced) {
+                            // maximum one bounce per day is counted, to filter out temporary problems
                         {
                             sql(
                                 "UPDATE `user` SET `email_problems`=`email_problems`+1, `last_email_problem`='&2'
@@ -121,6 +122,7 @@ 
                                 $logentry['created']
                             );
                         }
+                        }
                     }
                 } else {
                     echo $this->name . ": no email address found for record ID " . $logentry['id'] . "\n";

Spacing +21 added lines, -21 removed lines

@@ -12,7 +12,7 @@ 
 class maillog
 {
     public $name = 'maillog';
-    public $interval = 600;  // every 10 minutes
+    public $interval = 600; // every 10 minutes
 
 
     public function run()
@@ -33,14 +33,14 @@ 
             $opt['system']['maillog']['syslog_db_user'],
             $opt['system']['maillog']['syslog_db_password'],
             true
-        );  // use separate connection even if on same DB host
+        ); // use separate connection even if on same DB host
         if ($dbc === false) {
-            echo $this->name . ": could not connect to syslog database\n";
+            echo $this->name.": could not connect to syslog database\n";
 
             return;
         }
-        if (@mysql_query("USE " . $opt['system']['maillog']['syslog_db_name'], $dbc) === false) {
-            echo $this->name . ": could not open syslog database: " . mysql_error() . "\n";
+        if (@mysql_query("USE ".$opt['system']['maillog']['syslog_db_name'], $dbc) === false) {
+            echo $this->name.": could not open syslog database: ".mysql_error()."\n";
 
             return;
         }
@@ -52,13 +52,13 @@ 
         $col_program = mysql_real_escape_string($opt['system']['maillog']['column']['program']);
 
         $maillog_where =
-            "`" . $col_hostname . "`='" . mysql_real_escape_string($opt['system']['maillog']['syslog_oc_host']) . "' AND
-            `" . $col_program . "` like '" . mysql_real_escape_string($opt['system']['maillog']['syslog_mta']) . "'";
+            "`".$col_hostname."`='".mysql_real_escape_string($opt['system']['maillog']['syslog_oc_host'])."' AND
+            `" . $col_program."` like '".mysql_real_escape_string($opt['system']['maillog']['syslog_mta'])."'";
 
         $rs = @mysql_query(
             "
-            SELECT TIMESTAMPDIFF(DAY, MAX(" . $col_created . "), NOW())
-            FROM `" . mysql_real_escape_string($opt['system']['maillog']['syslog_db_table']) . "`
+            SELECT TIMESTAMPDIFF(DAY, MAX(" . $col_created."), NOW())
+            FROM `" . mysql_real_escape_string($opt['system']['maillog']['syslog_db_table'])."`
             WHERE " . $maillog_where
         );
         $r = mysql_fetch_row($rs);
@@ -80,26 +80,26 @@ 
         // case some entries with same timestamp as $last_date will be processed redundantly.
 
         $rs = @mysql_query(
-            "SELECT `" . $col_id . "` `id`,
-                      `" . $col_message . "` `message`,
-                      `" . $col_created . "` `created`
-                 FROM `" . mysql_real_escape_string($opt['system']['maillog']['syslog_db_table']) . "`
-                WHERE `" . $col_created . "`>='" . mysql_real_escape_string($last_date) . "'
-                  AND (`" . $col_id . "`>'" . mysql_real_escape_string(
+            "SELECT `".$col_id."` `id`,
+                      `" . $col_message."` `message`,
+                      `" . $col_created."` `created`
+                 FROM `" . mysql_real_escape_string($opt['system']['maillog']['syslog_db_table'])."`
+                WHERE `" . $col_created."`>='".mysql_real_escape_string($last_date)."'
+                  AND (`" . $col_id."`>'".mysql_real_escape_string(
                 $last_id
-            ) . "' OR `" . $col_created . "`>'" . mysql_real_escape_string($last_date) . "')
-                  AND  " . $maillog_where . "
-             ORDER BY `" . $col_created . "`,`" . $col_id . "`",
+            )."' OR `".$col_created."`>'".mysql_real_escape_string($last_date)."')
+                  AND  " . $maillog_where."
+             ORDER BY `" . $col_created."`,`".$col_id."`",
             $dbc
         );
         if ($rs === false) {
-            echo $this->name . ": syslog query error (" . mysql_errno() . "): " . mysql_error() . "\n";
+            echo $this->name.": syslog query error (".mysql_errno()."): ".mysql_error()."\n";
 
             return;
         }
 
         while ($logentry = mysql_fetch_assoc($rs)) {
-            $message = $logentry['message'];   // latin-1 charset
+            $message = $logentry['message']; // latin-1 charset
             $delivered = strpos($message, 'status=sent') > 0;
             $bounced = strpos($message, 'status=bounced') > 0;
             if ($delivered || $bounced) {
@@ -123,7 +123,7 @@ 
                         }
                     }
                 } else {
-                    echo $this->name . ": no email address found for record ID " . $logentry['id'] . "\n";
+                    echo $this->name.": no email address found for record ID ".$logentry['id']."\n";
                 }
             }
             $last_id = $logentry['id'];

htdocs/util2/cron/modules/slave_cleanup.class.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         }
         sql_free_result($rs);
 
-        $this->cleanup_slave(- 1);
+        $this->cleanup_slave(-1);
     }
 
     public function cleanup_slave($slaveId)

htdocs/config2/locale.inc.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 $opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von {site} stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>';
 $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/';
 $opt['locale']['DE']['mostly_translated'] = true;
-$opt['locale']['DE']['what3words'] = true;  // "beta"
+$opt['locale']['DE']['what3words'] = true; // "beta"
 
 $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y';
 $opt['locale']['IT']['format']['dm'] = '%d/%m';