OpencachingDeutschland / oc-server3

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

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)

htdocs/lib2/logic/logtypes.inc.php

Spacing +11 added lines, -11 removed lines

@@ -91,28 +91,28 @@ 
 
     $allowed_logtypes = array();
     if ($owner || $admin_report || $admin_locked) {
-        $allowed_logtypes[] = 3;   // note
+        $allowed_logtypes[] = 3; // note
     }
     if (($owner && $statuslogs) || $admin_report) {
         if ($cache_status != 5 && (($cache_status != 4 && $cache_status != 7) || $admin_report)) {
-            $allowed_logtypes[] = 10;  // ready for search
-            $allowed_logtypes[] = 11;  // temporarily not available
-            $allowed_logtypes[] = 9;   // archived
-            $allowed_logtypes[] = 13;  // locked
+            $allowed_logtypes[] = 10; // ready for search
+            $allowed_logtypes[] = 11; // temporarily not available
+            $allowed_logtypes[] = 9; // archived
+            $allowed_logtypes[] = 13; // locked
         }
         if ($admin_report || $old_logtype == 14) {
             $allowed_logtypes[] = 14;
         }  // locked, invisible
     }
     if ($cache_type == 6) { // event
-        $allowed_logtypes[] = 8;   // will attend
-        $allowed_logtypes[] = 7;   // attended
+        $allowed_logtypes[] = 8; // will attend
+        $allowed_logtypes[] = 7; // attended
     } else {
-        $allowed_logtypes[] = 1;   // found
-        $allowed_logtypes[] = 2;   // not found
+        $allowed_logtypes[] = 1; // found
+        $allowed_logtypes[] = 2; // not found
     }
     if (!($owner || $admin_report || $admin_locked)) {
-        $allowed_logtypes[] = 3;   // note
+        $allowed_logtypes[] = 3; // note
     }
 
     // always allow to keep the existing logtype when the log is edited by an admin
@@ -151,7 +151,7 @@ 
             } elseif (!$opt['logic']['admin']['team_comments_only_for_reports'] || admin_has_open_report($cache_id)) {
                 // allowed for report processing by admins
                 $allowed = true;
-            } elseif ($login->hasAdminPriv(ADMIN_USER) && in_array($rCache['status'], [6,7])) {
+            } elseif ($login->hasAdminPriv(ADMIN_USER) && in_array($rCache['status'], [6, 7])) {
                 // allowed for admins && locked caches, see http://forum.opencaching.de/index.php?topic=3102.msg39517#msg39517
                 $allowed = true;
             } else {

htdocs/lib2/logic/const.inc.php

Spacing +17 added lines, -17 removed lines

@@ -16,12 +16,12 @@ 
 define('RE_TYPE_FLOAT', 5);
 define('RE_TYPE_DOUBLE', 6);
 
-define('RE_INSERT_NOTHING', 0);       //
-define('RE_INSERT_OVERWRITE', 1);     // ignore given values and use function
-define('RE_INSERT_IGNORE', 2);        // dont use this column on insert
+define('RE_INSERT_NOTHING', 0); //
+define('RE_INSERT_OVERWRITE', 1); // ignore given values and use function
+define('RE_INSERT_IGNORE', 2); // dont use this column on insert
 define('RE_INSERT_AUTOINCREMENT', 4); // column is an auto increment column
-define('RE_INSERT_AUTOUUID', 8);      // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
-define('RE_INSERT_NOW', 16);          // NOW()
+define('RE_INSERT_AUTOUUID', 8); // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
+define('RE_INSERT_NOW', 16); // NOW()
 
 define('EUROPEAN_LETTERS', 'A-Za-zÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ');
 // ASCII + ISO-8859-1 0xC0..0xFF
@@ -31,13 +31,13 @@ 
 define('REGEX_FIRST_NAME', REGEX_LAST_NAME);
 define('REGEX_STATPIC_TEXT', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
 
-define('ADMIN_TRANSLATE', 1);     // edit translation
-define('ADMIN_MAINTAINANCE', 2);  // check table etc.
-define('ADMIN_USER', 4);          // drop users, caches etc.
-define('ADMIN_NEWS', 8);          // obsolete / reserved
-define('ADMIN_RESTORE', 16);      // restore vandalized listings
-define('ADMIN_ROOT', 128 | 127);  // root + all previous rights
-define('ADMIN_LISTING', 1024);    // can edit any cache listings
+define('ADMIN_TRANSLATE', 1); // edit translation
+define('ADMIN_MAINTAINANCE', 2); // check table etc.
+define('ADMIN_USER', 4); // drop users, caches etc.
+define('ADMIN_NEWS', 8); // obsolete / reserved
+define('ADMIN_RESTORE', 16); // restore vandalized listings
+define('ADMIN_ROOT', 128 | 127); // root + all previous rights
+define('ADMIN_LISTING', 1024); // can edit any cache listings
 
 define('ATTRIB_SELECTED', 1);
 define('ATTRIB_UNSELECTED', 2);
@@ -79,11 +79,11 @@ 
 // ID 15 was temporarily used and is reserved, see commit dda7ef0. Continue with 16.
 
 // user.data_license values
-define('OLD_DATA_LICSENSE', 0);                       // before deadline
-define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1);      // declined license
-define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2);      // accepted new license on registration
-define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3);     // did not decline license until deadline
-define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4);     // could not accept/decline because disabled
+define('OLD_DATA_LICSENSE', 0); // before deadline
+define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1); // declined license
+define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2); // accepted new license on registration
+define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3); // did not decline license until deadline
+define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4); // could not accept/decline because disabled
 
 //picture upload/resize parameters
 define('PICTURE_QUALITY', 85);

htdocs/lib2/logic/cacheIcon.class.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
     public static function get($user_id, $cache_id, $cache_status, $cache_userid, $iconname)
     {
-        $iconname = mb_eregi_replace("cache/", "", $iconname);   // for old cache_type table contents
+        $iconname = mb_eregi_replace("cache/", "", $iconname); // for old cache_type table contents
         $iconext = "." . mb_eregi_replace("^.*\.", "", $iconname);
         $iconname = mb_eregi_replace("\..*", "", $iconname);
 
@@ -30,7 +30,7 @@ 
                 break;
             case 5:
                 $iconname .= "-s";
-                break;      // fix for RT ticket #3403
+                break; // fix for RT ticket #3403
             case 6:
                 $iconname .= "-a";
                 break;

htdocs/lib2/logic/gis.class.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         // number of points in the polygon
         $n = count($polygon);
         $poly1 = $polygon[0];
-        for ($i = 1; $i <= $n; $i ++) {
+        for ($i = 1; $i <= $n; $i++) {
             $poly1XY = explode(' ', $poly1);
             $poly1x = $poly1XY[0];
             $poly1y = $poly1XY[1];
@@ -44,7 +44,7 @@ 
                         if ($poly1y != $poly2y) {
                             $xinters = ($py - $poly1y) * ($poly2x - $poly1x) / ($poly2y - $poly1y) + $poly1x;
                             if ($poly1x == $poly2x || $px <= $xinters) {
-                                $counter ++;
+                                $counter++;
                             }
                         }
                     }

htdocs/lib2/logic/cracklib.inc.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
     // min. 4 different chars
     $chars = array();
-    for ($i = 0; $i < mb_strlen($pw); $i ++) {
+    for ($i = 0; $i < mb_strlen($pw); $i++) {
         $chars[mb_substr($pw, $i, 1)] = true;
     }