OpencachingDeutschland / oc-server3

htdocs/editdesc.php

Spacing +6 added lines, -6 removed lines

@@ -21,8 +21,8 @@ 
     // check for old-style parameters
     if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
-        $desc_lang = $_REQUEST['desclang'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid']; // Ocprop
+        $desc_lang = $_REQUEST['desclang']; // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
         if (mysql_num_rows($rs) == 1) {
@@ -90,7 +90,7 @@ 
                 if (isset($_POST['post']))  // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -123,7 +123,7 @@ 
                         $oldDescMode = $descMode;
                     }
 
-                    $short_desc = $_POST['short_desc'];  // Ocprop
+                    $short_desc = $_POST['short_desc']; // Ocprop
                     $hint = htmlspecialchars($_POST['hints'], ENT_COMPAT, 'UTF-8');
                     $desclang = $_POST['desclang'];
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -138,7 +138,7 @@ 
                     }
 
                     // Text from textarea
-                    $desc = $_POST['desc'];  // Ocprop
+                    $desc = $_POST['desc']; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -297,7 +297,7 @@ 
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
 
                 // Text / normal HTML / HTML editor

htdocs/restorecaches.php

Indentation +1 added lines, -1 removed lines

@@ -1011,7 +1011,7 @@
                             }
                             $logs_restored = true;
                         }
-                       // if it was not already restored by a later restore operation ...
+                        // if it was not already restored by a later restore operation ...
                     } elseif (sql_value("SELECT `id` FROM `cache_logs` WHERE `id`='&1'", 0, $revert_logid) == 0) {
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore

Spacing +7 added lines, -7 removed lines

@@ -367,7 +367,7 @@ 
     $rs = sql('SELECT * FROM `caches` WHERE `cache_id` IN ' . $cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $nextcd[$r['wp_oc']] = $r;
-        $user_id = $r['user_id'];     // is used later for logs
+        $user_id = $r['user_id']; // is used later for logs
     }
     sql_free_result($rs);
 
@@ -467,7 +467,7 @@ 
         "SELECT * FROM `caches_attributes_modified`
          WHERE `cache_id` IN " . $cachelist . "  /* OConly attrib is shown, but not restorable */
          ORDER BY `date_modified` ASC"
-    );   // order doesn't matter as long it is date only
+    ); // order doesn't matter as long it is date only
     while ($r = sql_fetch_assoc($rs)) {
         append_data(
             $data,
@@ -623,7 +623,7 @@ 
         'SELECT *, ' . $piccacheid . "AS `cache_id` FROM `pictures_modified`
          WHERE " . $piccacheid . ' IN ' . $cachelist . "
          ORDER BY `date_modified` ASC"
-    );  // order is relevant for the case of restore-reverts
+    ); // order is relevant for the case of restore-reverts
     while ($r = sql_fetch_assoc($rs)) {
         $r['date_modified'] = substr($r['date_modified'], 0, 10);
         switch ($r['operation']) {
@@ -727,7 +727,7 @@ 
 {
     global $opt, $login;
 
-    sql("SET @restoredby='&1'", $login->userid);         // is evaluated by trigger functions
+    sql("SET @restoredby='&1'", $login->userid); // is evaluated by trigger functions
     sql_slave("SET @restoredby='&1'", $login->userid);
 
     $restored = [];
@@ -1019,7 +1019,7 @@ 
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore
                         $log = new cachelog();
-                        $log->setNode($r['node']);  // cachelog class currently does not initialize node field
+                        $log->setNode($r['node']); // cachelog class currently does not initialize node field
                         $log->setCacheId($r['cache_id']);
                         $log->setUserId($r['user_id']);
                         $log->setType($r['type'], true);
@@ -1071,7 +1071,7 @@ 
                 }  // not already processed
 
                 if ($error != '') {
-                    $restored[$wp]['internal error - could not $error log ' + $r['id'] + '/' + $logid];
+                    $restored[$wp]['internal error - could not $error log ' +$r['id'] + '/' +$logid];
                 }
                 if ($logs_restored) {
                     $restored[$wp]['logs'] = true;
@@ -1203,7 +1203,7 @@ 
                 }  // not already processed
 
                 if ($error != '') {
-                    $restored[$wp]['internal error - could not $error picture ' . $r['id'] + '/' + $picid] = true;
+                    $restored[$wp]['internal error - could not $error picture ' . $r['id'] + '/' +$picid] = true;
                 }
                 if ($pics_restored) {
                     $restored[$wp]['pictures'] = true;

htdocs/okapi_settings.php

Indentation +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
         'DEBUG_PREVENT_SEMAPHORES'
-                           => !$opt['php']['semaphores'],  # not available on old developer system
+                            => !$opt['php']['semaphores'],  # not available on old developer system
         'DB_SERVER'        => $opt['db']['servername'],
         'DB_NAME'          => $opt['db']['placeholder']['db'],
         'DB_USERNAME'      => $opt['db']['username'],
@@ -54,7 +54,7 @@ 
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
         'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
         'OCDE_HTML_PURIFIER_SETTINGS'
-                           => $opt['html_purifier'],
+                            => $opt['html_purifier'],
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],
     );
 }

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
     # [3] http://code.google.com/p/opencaching-api/issues/detail?id=132
 
     $opt['rootpath'] = $GLOBALS['rootpath'];
-    require $opt['rootpath'] . 'lib2/const.inc.php';   # (into the *local* scope!)
+    require $opt['rootpath'] . 'lib2/const.inc.php'; # (into the *local* scope!)
     require $opt['rootpath'] . 'config2/settings-dist.inc.php';
     require $opt['rootpath'] . 'config2/settings.inc.php';
     
@@ -24,7 +24,7 @@ 
 
         # Settings which ARE NOT present in settings.inc.php:
 
-        'OC_BRANCH' => 'oc.de',  # Tell OKAPI to work in "OCDE mode".
+        'OC_BRANCH' => 'oc.de', # Tell OKAPI to work in "OCDE mode".
 
         # Settings which ARE present in settings.inc.php:
 
@@ -33,7 +33,7 @@ 
         'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
         'DEBUG_PREVENT_SEMAPHORES'
-                           => !$opt['php']['semaphores'],  # not available on old developer system
+                           => !$opt['php']['semaphores'], # not available on old developer system
         'DB_SERVER'        => $opt['db']['servername'],
         'DB_NAME'          => $opt['db']['placeholder']['db'],
         'DB_USERNAME'      => $opt['db']['username'],
@@ -49,7 +49,7 @@ 
         'IMAGES_DIR'       => rtrim($opt['logic']['pictures']['dir'], '/'),
         'IMAGES_URL'       => rtrim($opt['logic']['pictures']['url'], '/') . '/',
         'IMAGE_MAX_UPLOAD_SIZE' => 2 * $opt['logic']['pictures']['maxsize'],
-        'IMAGE_MAX_PIXEL_COUNT' => 786432,  # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
+        'IMAGE_MAX_PIXEL_COUNT' => 786432, # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
         'SITE_LOGO'        => $opt['page']['absolute_url'] . 'resource2/' . $opt['template']['default']['style'] . '/images/oclogo/oc_logo_alpha3.png',
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
         'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',

htdocs/removelog.php

Spacing +1 added lines, -1 removed lines

@@ -186,7 +186,7 @@
                         }
                         $path .= mb_strtoupper(mb_substr($filename, 0, 1)) . '/' .
                             mb_strtoupper(mb_substr($filename, 1, 1)) . '/';
-                        @unlink($path . $filename);  // Thumb
+                        @unlink($path . $filename); // Thumb
 
                         /* lib2 code would be ...
                         $rs = sql("SELECT `id` FROM `pictures` WHERE `object_type`=1 AND `object_id`='&1'", $log_id);

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/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/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();
                     }
                 }

htdocs/lib2/logic/logpics.class.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         global $login;
 
         $fields =
-          "`pics`.`uuid` AS `pic_uuid`,
+            "`pics`.`uuid` AS `pic_uuid`,
            `pics`.`url` AS `pic_url`,
            `pics`.`title`,
            `pics`.`date_created`,

Spacing +4 added lines, -4 removed lines

@@ -17,12 +17,12 @@
     const FOR_STARTPAGE_GALLERY = 1;
     const FOR_NEWPICS_GALLERY = 2;
     const FOR_USER_STAT = 3;
-    const FOR_USER_GALLERY = 4;   // params: userid
+    const FOR_USER_GALLERY = 4; // params: userid
     const FOR_MYHOME_GALLERY = 5;
-    const FOR_CACHE_STAT = 6;     // params: cacheid
-    const FOR_CACHE_GALLERY = 7;  // params: cacheid
+    const FOR_CACHE_STAT = 6; // params: cacheid
+    const FOR_CACHE_GALLERY = 7; // params: cacheid
 
-    const MAX_PICTURES_PER_GALLERY_PAGE = 48;   // must be multiple of 6
+    const MAX_PICTURES_PER_GALLERY_PAGE = 48; // must be multiple of 6
 
 
     public static function get($purpose, $userid = 0, $cacheid = 0)