OpencachingDeutschland / oc-server3

htdocs/newcachesrest.php

Spacing +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
 $tpl->caching = true;
 $tpl->cache_lifetime = 3600;
 
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
 
 if (!$tpl->is_cached()) {
     $newCaches = array();

htdocs/picture.php

Spacing +3 added lines, -3 removed lines

@@ -75,11 +75,11 @@
     if (isset($_REQUEST['ok'])) { // Ocprop
         $bError = false;
 
-        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
-        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false);  // Ocprop
+        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1'); // Ocprop
+        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false); // Ocprop
         $picture->setMapPreview(isset($_REQUEST['mappreview']) && $_REQUEST['mappreview'] == '1');
 
-        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : '';  // Ocprop
+        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : ''; // Ocprop
         if ($title == '' || ($picture->getObjectType() == OBJECT_CACHELOG && trim($title) == '')) {
             $tpl->assign('errortitle', true);
             $bError = true;

htdocs/doc/sql/stored-proc/maintain.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 #!/usr/bin/php -q
 <?php
- /***************************************************************************
+    /***************************************************************************
  *  For license information see doc/license.txt
  *
  *  Unicode Reminder メモ

htdocs/coordinates.php

Braces +2 added lines, -1 removed lines

@@ -88,8 +88,9 @@
     $tpl->assign('coordW3W2', $coord->getW3W($w3w_langs[1]));
     $lang2_name = sql_value("SELECT `name` FROM `languages` WHERE `short`='&1'", '', $w3w_langs[1]);
     $tpl->assign('W3Wlang2', $translate->t($lang2_name, '', '', 0));
-} else
+} else {
     $tpl->assign('coordW3W2', false);
+}
 
 // wp gesetzt?
 $wp = isset($_REQUEST['wp']) ? $_REQUEST['wp'] : '';

htdocs/query.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     if ($submit == true) {
         $options = sql_value("SELECT `options` FROM `queries` WHERE `id`='&1'", false, $queryid);
         if (!$options) {
-            $tpl->error(ERROR_UNKNOWN);   // query does not exist
+            $tpl->error(ERROR_UNKNOWN); // query does not exist
         } elseif ($sortby || $sortorder || $creationdate) {
             $oa = unserialize($options);
             if ($sortby) {

Braces +3 added lines, -3 removed lines

@@ -106,9 +106,9 @@
             }
         } else {
             // save as
-            if (sql_value("SELECT COUNT(*) FROM `queries` WHERE `id`='&1' AND `user_id`='&2'", 0, $saveas_queryid, $login->userid) == 0)
-                $tpl->assign('errorMustSelectQuery', true);
-            else {
+            if (sql_value("SELECT COUNT(*) FROM `queries` WHERE `id`='&1' AND `user_id`='&2'", 0, $saveas_queryid, $login->userid) == 0) {
+                            $tpl->assign('errorMustSelectQuery', true);
+            } else {
                 sql("UPDATE `queries` SET `options`='&1' WHERE `id`='&2'", $options, $saveas_queryid);
                 $tpl->redirect('query.php?action=view');
             }

local/mailing/mailing.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 foreach ($sendto as $receiver) {
     $receiver = trim($receiver);
-    echo ++ $n . "/$total: $receiver";
+    echo ++$n . "/$total: $receiver";
     mail(
         $receiver,
         $subject,

local/devel/style-cleanup.php

Spacing +6 added lines, -6 removed lines

@@ -108,19 +108,19 @@ 
                         && !preg_match("/^ *(\\*|\/\/|#) *\n$/", $line)) {
 
                         $old_line = $line;
-                        $line = rtrim($line);   # trims " \t\n\r\0\x0B"
+                        $line = rtrim($line); # trims " \t\n\r\0\x0B"
                         $line = $this->expandTabs($line);
                         $line .= "\n";
 
                         if ($line != $old_line) {
                             $file_modified = true;
-                            ++ $this->lines_modified;
+                            ++$this->lines_modified;
                         }
                     }
                     if (preg_match('/\<\?\s/', $line)) {   # relies on \n at EOL
                         self::warn('short open tag in line ' . $n . ' of ' . $display_filepath);
                     }
-                    ++ $n;
+                    ++$n;
                 }
 
                 # remove PHP close tags and empty lines from end of file
@@ -131,17 +131,17 @@ 
                     if ($trimmed_line == '?>' || $trimmed_line == '') {
                         unset($lines[$l]);
                         $file_modified = true;
-                        ++ $this->lines_modified;
+                        ++$this->lines_modified;
                     } else {
                         break;
                     }
-                    -- $l;
+                    --$l;
                 }
 
                 if ($file_modified) {
                     echo 'cleaned ' . substr($filepath, 2) . "\n";
                     file_put_contents($filepath, implode('', $lines));
-                    ++ $this->files_modified;
+                    ++$this->files_modified;
                 }
             }
 

local/devel/strip_private_data.php

Spacing +3 added lines, -3 removed lines

@@ -63,11 +63,11 @@ 
 echo "clearing user data\n";
 sql('TRUNCATE `cache_adoption`');
 sql('TRUNCATE `cache_ignore`');
-sql('DELETE FROM `cache_lists` WHERE `is_public`<2');  // trigger deletes dependent data
+sql('DELETE FROM `cache_lists` WHERE `is_public`<2'); // trigger deletes dependent data
 sql('TRUNCATE `cache_list_bookmarks`');
 sql('TRUNCATE `cache_list_watches`');
 sql('TRUNCATE `cache_watches`');
-sql('DELETE FROM `coordinates` WHERE `type`=2');   // personal cache notes and coords
+sql('DELETE FROM `coordinates` WHERE `type`=2'); // personal cache notes and coords
 sql('TRUNCATE `queries`');
 sql('TRUNCATE `user_options`');
 sql(
@@ -112,7 +112,7 @@ 
 echo "\n";
 mysql_free_result($rs);
 
-echo "clearing OKAPI data\n";;
+echo "clearing OKAPI data\n"; ;
 if (sql_table_exists('okapi_vars')) {
     echo "clearing OKAPI data\n";
     sql('TRUNCATE `okapi_authorizations`');

local/maintenance/init_user_languages.php

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
                 $lang
             );
         }
-        ++ $set;
+        ++$set;
     }
-    if (++ $processed % 1000 == 0) {
+    if (++$processed % 1000 == 0) {
         echo "$set of $processed " . ($write ? '' : 'would be ') . "set\n";
     }
 }