OpencachingDeutschland / oc-server3

htdocs/config2/locale.inc.php

Spacing +6 added lines, -6 removed lines

@@ -17,9 +17,9 @@ 
  *                 $opt['locale']
  ***************************************************************************/
 
-define('OC_LOCALE_ACTIVE', 2);    // enable language and show language button in header line
-define('OC_LOCALE_HIDDEN', 1);    // enable language but hide language button in header line
-define('OC_LOCALE_DISABLED', 0);  // disable language
+define('OC_LOCALE_ACTIVE', 2); // enable language and show language button in header line
+define('OC_LOCALE_HIDDEN', 1); // enable language but hide language button in header line
+define('OC_LOCALE_DISABLED', 0); // disable language
 
 $opt['template']['locales']['DE']['status'] = OC_LOCALE_ACTIVE;
 $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.png';
@@ -131,7 +131,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';
@@ -233,7 +233,7 @@ 
 $opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching';
 $opt['locale']['SV']['page']['subtitle2'] = '';
 $opt['locale']['SV']['mostly_translated'] = false;
-$opt['locale']['SV']['what3words'] = true;  // "beta"
+$opt['locale']['SV']['what3words'] = true; // "beta"
 
 $opt['locale']['NO']['format']['dateshort'] = '%d.%m.%y';
 $opt['locale']['NO']['format']['dm'] = '%d.%m.';
@@ -283,7 +283,7 @@ 
 $opt['locale']['RU']['country'] = 'RU';
 $opt['locale']['RU']['primary_lang_of'] = ['RU'];
 $opt['locale']['RU']['mostly_translated'] = false;
-$opt['locale']['RU']['what3words'] = true;   // "beta"
+$opt['locale']['RU']['what3words'] = true; // "beta"
 
 $opt['locale']['DA']['format']['dateshort'] = '%d.%m.%y';
 $opt['locale']['DA']['format']['dm'] = '%d.%m.';

htdocs/lib2/logic/useroptions.class.php

Doc Comments +8 added lines

@@ -113,6 +113,11 @@ 
         return $this->nOptions[$pId]['internal_use'];
     }
 
+    /**
+     * @param integer $pId
+     *
+     * @return string
+     */
     public function getOptValue($pId)
     {
         if ($pId == USR_OPT_SHOWSTATS &&
@@ -129,6 +134,9 @@ 
         return false;
     }
 
+    /**
+     * @param integer $pValue
+     */
     public function setOptVisible($pId, $pValue)
     {
         $pId += 0;

htdocs/lib2/menu.class.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
                         'parent' => MNU_MAP
                     ];
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
-                    ++ $menu_map;
+                    ++$menu_map;
                 }
             }
         }
@@ -107,7 +107,7 @@ 
         $rsSubmenu = sqlf("SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC");
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
-            $nPos ++;
+            $nPos++;
         }
         sql_free_result($rsSubmenu);
         fwrite($f, "\n");
@@ -144,7 +144,7 @@ 
             );
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
-                $nPos ++;
+                $nPos++;
             }
             sql_free_result($rsSubmenu);
         }

htdocs/src/Oc/Session/SessionDataNative.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
                     // TODO fix the following if statement, seems corrupted
                     if (strtolower(
                             substr(
-                                'http' + strstr($_SERVER['REFERER'], '://'),
+                                'http' +strstr($_SERVER['REFERER'], '://'),
                                 0,
                                 strlen($opt['page']['absolute_http_url'])
                             )

htdocs/lib2/logic/picture.class.php

Spacing +2 added lines, -2 removed lines

@@ -464,9 +464,9 @@
                 return false;
             } else {
                 // restore picture file
-                $this->setUrl($original_url);     // set the url, so that we can
+                $this->setUrl($original_url); // set the url, so that we can
                 $filename = $this->getFilename(); // .. retrieve the file path+name
-                $this->setFilenames($filename);   // now set url(s) from the new uuid
+                $this->setFilenames($filename); // now set url(s) from the new uuid
                 try {
                     rename($this->deletedFilename($filename), $this->getFilename());
                 } catch (Exception $e) {

Doc Comments +2 added lines, -2 removed lines

@@ -692,7 +692,7 @@ 
     }
 
     /**
-     * @return bool|string
+     * @return string|false
      */
     public function getPageLink()
     {
@@ -724,7 +724,7 @@ 
     /**
      * @param $tmpFile
      * @param $longSideSize
-     * @return bool
+     * @return null|boolean
      */
     public function rotate_and_shrink($tmpFile, $longSideSize)
     {

htdocs/lib2/ss_zip.class.php

Indentation +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
     public $cdir = [];
 
     /**    constructor
-
-*
+     *
 *@param string $zipFile if not empty must contain path to valid zip file, ss_zip will try to open and parse it.
      *               If this parameter is empty, the new empty zip archive is created. This parameter has no meaning in
      *               LIGHT verion, please upgrade to PROfessional version.

Spacing +9 added lines, -9 removed lines

@@ -143,9 +143,9 @@ 
         }
 
         $fnl = strlen($filename);
-        $fh = "\x14\x00";    // ver needed to extract
-        $fh .= "\x00\x00";    // gen purpose bit flag
-        $fh .= "\x08\x00";    // compression method
+        $fh = "\x14\x00"; // ver needed to extract
+        $fh .= "\x00\x00"; // gen purpose bit flag
+        $fh .= "\x08\x00"; // compression method
         $fh .= "\x00\x00\x00\x00"; // last mod time and date
         $fh .=
             pack(
@@ -172,16 +172,16 @@ 
                 "va*v3V2",
                 0,
                 $fh,
-                0,        // file comment length
-                0,        // disk number start
-                0,        // internal file attributes
-                $attr,    // external file attributes - 'archive/directory' bit set
+                0, // file comment length
+                0, // disk number start
+                0, // internal file attributes
+                $attr, // external file attributes - 'archive/directory' bit set
                 $this->offset
             ) . $filename;
 
         $this->offset += 42 + $fnl + $gzsize;
         $this->cdir[] = $cdir;
-        $this->cnt ++;
+        $this->cnt++;
         $this->idx = $this->cnt - 1;
     }
 
@@ -230,7 +230,7 @@ 
                 $cdsl, // size of central dir
                 $zdsl, // offset to start of central dir
                 0
-            );              // .zip file comment length
+            ); // .zip file comment length
         return $this->zipfile;
     }
 

htdocs/lib2/Net/IDNA2.php

Spacing +12 added lines, -14 removed lines

@@ -2322,8 +2322,7 @@ 
         // Forcing conversion of input to UCS4 array
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-            case 'utf8':
-                $decoded = $this->_utf8_to_ucs4($decoded);
+            case 'utf8' : $decoded = $this->_utf8_to_ucs4($decoded);
                 break;
             case 'ucs4_string':
                 $decoded = $this->_ucs4_string_to_ucs4($decoded);
@@ -2478,8 +2477,7 @@ 
         // The output is UTF-8 by default, other output formats need conversion here
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-            case 'utf8':
-                return $return;
+            case 'utf8' : return $return;
                 break;
             case 'ucs4_string':
                 return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
@@ -2714,12 +2712,12 @@ 
                     break;
                 }
 
-                $w = (int) ($w * ($this->_base - $t));
+                $w = (int)($w * ($this->_base - $t));
             }
 
             $bias = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
             $is_first = false;
-            $char += (int) ($idx / ($deco_len + 1));
+            $char += (int)($idx / ($deco_len + 1));
             $idx %= ($deco_len + 1);
 
             if ($deco_len > 0) {
@@ -2746,14 +2744,14 @@ 
      */
     private function _adapt($delta, $npoints, $is_first)
     {
-        $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
-        $delta += (int) ($delta / $npoints);
+        $delta = (int)($is_first ? ($delta / $this->_damp) : ($delta / 2));
+        $delta += (int)($delta / $npoints);
 
         for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
-            $delta = (int) ($delta / ($this->_base - $this->_tmin));
+            $delta = (int)($delta / ($this->_base - $this->_tmin));
         }
 
-        return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
+        return (int)($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
     }
 
     /**
@@ -2899,8 +2897,8 @@ 
 
         $result = [];
         $T = $this->_tbase + $sindex % $this->_tcount;
-        $result[] = (int) ($this->_lbase + $sindex / $this->_ncount);
-        $result[] = (int) ($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
+        $result[] = (int)($this->_lbase + $sindex / $this->_ncount);
+        $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
 
         if ($T != $this->_tbase) {
             $result[] = $T;
@@ -3141,7 +3139,7 @@ 
                     throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte ' . $k);
                 }
                 if ('add' == $mode) {
-                    $output[$out_len] = (int) $v;
+                    $output[$out_len] = (int)$v;
                     ++$out_len;
                     continue;
                 }
@@ -3361,7 +3359,7 @@ 
             return mb_strlen($string, '8bit');
         }
 
-        return strlen((binary) $string);
+        return strlen((binary)$string);
     }
 
     // }}}}

htdocs/lib2/search/search.xml.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
 
 /**
  * @param string $str
- * @return mixed
+ * @return string
  */
 function lf2crlf($str)
 {

htdocs/log.php

Spacing +4 added lines, -4 removed lines

@@ -49,8 +49,8 @@ 
          FROM field_note
          WHERE `id` = &1
            AND `user_id` = &2',
-        (int) $_GET['fieldnoteid'],
-        (int) $user->getUserId()
+        (int)$_GET['fieldnoteid'],
+        (int)$user->getUserId()
     );
     $fieldNote = sql_fetch_assoc($rs);
     if (!empty($fieldNote)) {
@@ -174,7 +174,7 @@ 
     // get log text editor mode (from form or from userprofile)
     // 1 = text; 2 = HTML; 3 = tinyMCE
     if (isset($_POST['descMode'])) {
-        $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
+        $descMode = $_POST['descMode'] + 0; // Ocprop: 2
         if (($descMode < 1) || ($descMode > 3)) {
             $descMode = 3;
         }
@@ -335,7 +335,7 @@ 
             if (isset($_REQUEST['fieldnoteid']) && $_REQUEST['fieldnoteid']) {
                 sql(
                     'DELETE FROM field_note WHERE `id` = &1 AND `user_id` = &2',
-                    (int) $_REQUEST['fieldnoteid'],
+                    (int)$_REQUEST['fieldnoteid'],
                     $user->getUserId()
                 );