OpencachingDeutschland / oc-server3

htdocs/newcaches.php

Spacing +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
 $tpl->change_country_inpage = true;
 
 $startat = isset($_REQUEST['startat']) ? floor($_REQUEST['startat'] + 0) : 0;
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
 $cachetype = isset($_REQUEST['cachetype']) ? $_REQUEST['cachetype'] + 0 : 0;
 $bEvents = ($cachetype == 6);
 

htdocs/newlogs.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
     $tpl->cache_lifetime = 900;
     $tpl->cache_id = $exclude_country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? "{fromtable}.`order_date` DESC, " : "";
 } else {
     // latest logs for all countries or for one country
@@ -88,7 +88,7 @@ 
     $tpl->cache_lifetime = 300;
     $tpl->cache_id = $country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? "{fromtable}.`order_date` DESC, " : "";
     $optimize_for_latest_logs = ($country == '' || $country == $opt['page']['main_country']);
 }
@@ -247,7 +247,7 @@ 
             }
             sql_free_result($rsPic);
         }
-        $pics --;
+        $pics--;
 
         $rLog['first'] = false;
         if (isset($caches_logged)) {

htdocs/xml/ocxml11.php

Spacing +14 added lines, -14 removed lines

@@ -21,7 +21,7 @@ 
 require_once __DIR__ . '/../lib2/const.inc.php';
 require_once __DIR__ . '/../lib2/logic/data-license.inc.php';
 require_once __DIR__ . '/../lib2/logic/npas.inc.php';
-require_once __DIR__ .' /../lib2/logic/geomath.class.php';
+require_once __DIR__ . ' /../lib2/logic/geomath.class.php';
 
 if ($error == true) {
     echo 'Unable to connect to database';
@@ -387,7 +387,7 @@ 
 
     $logtypes = [];
     $rs = sql('SELECT `id`, `de` FROM log_types');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $logtypes[$r['id']] = $r['de'];
     }
@@ -395,7 +395,7 @@ 
 
     $cachetypes = [];
     $rs = sql('SELECT `id`, `short`, `de` FROM cache_type');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachetypes[$r['id']]['de'] = $r['de'];
         $cachetypes[$r['id']]['short'] = $r['short'];
@@ -404,7 +404,7 @@ 
 
     $cachestatus = [];
     $rs = sql('SELECT `id`, `de` FROM cache_status');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachestatus[$r['id']]['de'] = $r['de'];
     }
@@ -412,7 +412,7 @@ 
 
     $counties = [];
     $rs = sql('SELECT `short`, `de` FROM countries');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $counties[$r['short']]['de'] = $r['de'];
     }
@@ -420,7 +420,7 @@ 
 
     $cachesizes = [];
     $rs = sql('SELECT `id`, `de` FROM cache_size');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachesizes[$r['id']]['de'] = $r['de'];
     }
@@ -428,7 +428,7 @@ 
 
     $languages = [];
     $rs = sql('SELECT `short`, `de` FROM languages');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $languages[$r['short']]['de'] = $r['de'];
     }
@@ -439,7 +439,7 @@ 
     $objecttypes['3'] = 'cachedesc';
     $objecttypes['1'] = 'cachelog';
     $objecttypes['6'] = 'picture';
-    $objecttypes['8'] = 'cachelist';    // not implemented yet
+    $objecttypes['8'] = 'cachelist'; // not implemented yet
 
     /* end now a few dynamically loaded constants */
 
@@ -452,7 +452,7 @@ 
     while (file_exists(
         $zip_basedir . 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml'
     )) {
-        $fileid ++;
+        $fileid++;
     }
 
     $xmlfilename = $zip_basedir . 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml';
@@ -1300,7 +1300,7 @@ 
 //    echo $startat . ' ' . $endat . '<br><br>';
 //    echo '<table>';
 //    echo '<tr><td>sql-start</td><td>sql-count</td><td>count</td><td>begin</td><td>end</td></tr>';
-    for ($i = 0; $i < 6; $i ++) {
+    for ($i = 0; $i < 6; $i++) {
         if (($startat >= $recordnr[$i]) && ($startat + 500 < $recordnr[$i + 1])) {
             if ($recordnr[$i + 1] - $startat > 500) {
                 $limits[$i] = ['start' => $startat - $recordnr[$i], 'count' => 500];
@@ -1422,7 +1422,7 @@ 
     $from[4] = '\'';
     $to[4] = '&apos;';
 
-    for ($i = 0; $i <= 4; $i ++) {
+    for ($i = 0; $i <= 4; $i++) {
         $str = mb_ereg_replace($from[$i], $to[$i], $str);
     }
 
@@ -1501,13 +1501,13 @@ 
 
     $hDir = opendir($path);
     if ($hDir === false) {
-        ++ $notunlinked;
+        ++$notunlinked;
     } else {
         while (false !== ($file = readdir($hDir))) {
             if (($file != '.') && ($file != '..')) {
                 if (is_dir($path . $file)) {
                     if (unlinkrecursiv($path . $file . '/') == false) {
-                        $notunlinked ++;
+                        $notunlinked++;
                     }
                 } else {
                     if ((mb_substr($file, - 4) == '.zip') ||
@@ -1517,7 +1517,7 @@ 
                     ) {
                         @unlink($path . $file);
                     } else {
-                        $notunlinked ++;
+                        $notunlinked++;
                     }
                 }
             }

htdocs/xml/csv/cache.php

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
         echo ';';
         echo '"' . mb_ereg_replace('"', '\"', $cache->getWPGC()) . '"';
         echo ';';
-        echo '""';  // obsolete Navicache WP
+        echo '""'; // obsolete Navicache WP
     }
 }

htdocs/util/watchlist/runwatch.php

Spacing +5 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
     WHERE cache_logs.cache_id=caches.cache_id
     AND cache_logs.owner_notified=0"
 );
-for ($i = 0; $i < mysql_num_rows($rsNewLogs); $i ++) {
+for ($i = 0; $i < mysql_num_rows($rsNewLogs); $i++) {
     $rNewLog = sql_fetch_array($rsNewLogs);
 
     $rsNotified = sql(
@@ -134,7 +134,7 @@ 
     WHERE `user`.`watchmail_nextmail`<NOW()",
     $opt['template']['default']['locale']
 );
-for ($i = 0; $i < mysql_num_rows($rsUsers); $i ++) {
+for ($i = 0; $i < mysql_num_rows($rsUsers); $i++) {
     $rUser = sql_fetch_array($rsUsers);
 
     if ($rUser['watchmail_nextmail'] != '0000-00-00 00:00:00') {
@@ -158,7 +158,7 @@ 
                 );
                 if (mysql_num_rows($rsWatchesOwner) > 0) {
                     $logtexts = '';
-                    for ($j = 0; $j < mysql_num_rows($rsWatchesOwner); $j ++) {
+                    for ($j = 0; $j < mysql_num_rows($rsWatchesOwner); $j++) {
                         $rWatch = sql_fetch_array($rsWatchesOwner);
                         $logtexts .= $rWatch['watchtext'];
                     }
@@ -183,7 +183,7 @@ 
                 );
                 if (mysql_num_rows($rsWatchesLog) > 0) {
                     $logtexts = '';
-                    for ($j = 0; $j < mysql_num_rows($rsWatchesLog); $j ++) {
+                    for ($j = 0; $j < mysql_num_rows($rsWatchesLog); $j++) {
                         $rWatch = sql_fetch_array($rsWatchesLog);
                         $logtexts .= $rWatch['watchtext'];
                     }
@@ -583,7 +583,7 @@ 
         $pid_daemon = fgets($pidfile, 20);
         fclose($pidfile);
 
-        $pid_daemon = (int) $pid_daemon;
+        $pid_daemon = (int)$pid_daemon;
 
         // process running?
         if (posix_kill($pid_daemon, 0)) {

htdocs/translate.php

Spacing +2 added lines, -2 removed lines

@@ -690,7 +690,7 @@ 
         $writer->writeAttribute('id', $r['id']);
 
         $writer->writeElement('code', $r['text']);
-        for ($n = 0; $n < count($lang); $n ++) {
+        for ($n = 0; $n < count($lang); $n++) {
             $writer->writeElement(
                 $lang[$n],
                 sql_value(
@@ -818,7 +818,7 @@ 
 
     $nCount = isset($_REQUEST['count']) ? $_REQUEST['count'] + 0 : 0;
 
-    for ($nIndex = 1; $nIndex <= $nCount; $nIndex ++) {
+    for ($nIndex = 1; $nIndex <= $nCount; $nIndex++) {
         if (isset($_REQUEST['useitem' . $nIndex]) && ($_REQUEST['useitem' . $nIndex] == '1')) {
             $sCode = base64_decode($_REQUEST['code' . $nIndex]);
             $transId = sql_value("SELECT `id` FROM `sys_trans` WHERE `text`='&1'", 0, $sCode);

htdocs/lib2/charset.inc.php

Spacing +3 added lines, -3 removed lines

@@ -28,11 +28,11 @@ 
     $result = "";
 
     while ($pos < strlen($s)) {
-        $c1 = ord($s[$pos ++]);
+        $c1 = ord($s[$pos++]);
         if ($c1 < 0xC0) {
             $result .= chr($c1);
         } elseif ($pos < strlen($s)) {
-            $c2 = ord($s[$pos ++]);
+            $c2 = ord($s[$pos++]);
             if ($c1 < 0xE0) {
                 $code = 0x40 * ($c1 & 0x1F) + ($c2 & 0x3F);
                 if ($code < 0x100) {
@@ -46,7 +46,7 @@ 
                     $result .= "?";
                 }
             } elseif ($pos < strlen($s)) {
-                $c3 = ord($s[$pos ++]);
+                $c3 = ord($s[$pos++]);
                 $code = 0x1000 * ($c1 & 0x0F) + 0x40 * ($c2 & 0x3F) + ($c3 & 0x3F);
                 switch ($code) {
                     case 0x2026:

htdocs/lib2/OcHTMLPurifier.class.php

Spacing +3 added lines, -3 removed lines

@@ -50,8 +50,8 @@ 
         $config->set('Attr.IDPrefix', 'custom_');
 
         // enable 'display' and 'visibility' styles for mystery descriptions
-        $config->set('CSS.AllowTricky', true);                // + display, visibility, overflow
-        $config->set('CSS.ForbiddenProperties', 'overflow');  // - overflow
+        $config->set('CSS.AllowTricky', true); // + display, visibility, overflow
+        $config->set('CSS.ForbiddenProperties', 'overflow'); // - overflow
 
         // prepare additional definitions
         $def = $config->getHTMLDefinition(true);
@@ -65,7 +65,7 @@ 
         ); //  HTML5 attribs currently not supported by TinyMCE
         $def->addElement('legend', 'Inline', 'Flow', 'Common');
         $def->addElement('q', 'Inline', 'Inline', 'Common', ['cite' => 'URI']);
-        $def->addElement('strike', 'Inline', 'Inline', 'Common');   // -> wird in CSS umgewandelt
+        $def->addElement('strike', 'Inline', 'Inline', 'Common'); // -> wird in CSS umgewandelt
         $def->addElement(
             'area',
             'Inline',

htdocs/lib2/cookie.class.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
             if ($opt['session']['check_referer']) {
                 if (isset($_SERVER['REFERER'])) {
-                    if (strtolower(substr('http' + strstr($_SERVER['REFERER'], '://'), 0, strlen($opt['page']['absolute_http_url']))) != strtolower($opt['page']['absolute_http_url'])) {
+                    if (strtolower(substr('http' +strstr($_SERVER['REFERER'], '://'), 0, strlen($opt['page']['absolute_http_url']))) != strtolower($opt['page']['absolute_http_url'])) {
                         $this->createNewSession();
                     }
                 }