OpencachingDeutschland / oc-server3

htdocs/lib2/util.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -284,7 +284,7 @@ 
  * @param $filename
  * @param $maxLength
  *
- * @return bool|string
+ * @return false|string
  */
 function read_file($filename, $maxLength = 4096)
 {
@@ -453,7 +453,7 @@ 
  *
  * @param $n
  *
- * @return mixed|string
+ * @return string
  */
 function number1000($n)
 {

Spacing +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
     while ($nCurPos < mb_strlen($str)) {
         $nNextSep = mb_strlen($str);
         $sepLength = mb_strlen($sep);
-        for ($nSepPos = 0; $nSepPos < $sepLength; $nSepPos ++) {
+        for ($nSepPos = 0; $nSepPos < $sepLength; $nSepPos++) {
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
             if ($nThisPos !== false && $nNextSep > $nThisPos) {
                 $nNextSep = $nThisPos;

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/lib/clicompatbase.inc.php

Doc Comments +3 added lines

@@ -506,6 +506,9 @@
     return mysql_fetch_assoc($rs);
 }
 
+/**
+ * @param resource $rs
+ */
 function sql_fetch_row($rs)
 {
     return mysql_fetch_row($rs);

Spacing +3 added lines, -3 removed lines

@@ -38,9 +38,9 @@
 mb_language('uni');
 
 //load default webserver-settings and common includes
-require_once __DIR__  . '/consts.inc.php';
-require_once __DIR__  . '/settings.inc.php';
-require_once __DIR__  . '/../lib2/errorhandler.inc.php';
+require_once __DIR__ . '/consts.inc.php';
+require_once __DIR__ . '/settings.inc.php';
+require_once __DIR__ . '/../lib2/errorhandler.inc.php';
 
 // check for banned UAs
 $useragent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";

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

htdocs/translate.php

Switch Indentation +100 added lines, -100 removed lines

@@ -86,83 +86,83 @@ 
 }
 
 switch ($action) {
-    case 'selectlang':
-        break;
+        case 'selectlang':
+            break;
 
-    case 'verify':
-        verify();
-        break;
+        case 'verify':
+            verify();
+            break;
 
-    case 'resetids':
-        resetIds();
-        break;
+        case 'resetids':
+            resetIds();
+            break;
 
-    case 'clearcache':
-        clearCache();
-        break;
+        case 'clearcache':
+            clearCache();
+            break;
 
-    case 'export':
-        export();
-        break;
+        case 'export':
+            export();
+            break;
 
-    case 'xmlexport':
-        xmlexport();
-        break;
+        case 'xmlexport':
+            xmlexport();
+            break;
 
-    case 'xmlimport':
-        break;
+        case 'xmlimport':
+            break;
 
-    case 'xmlimport2':
-        xmlimport2();
-        break;
+        case 'xmlimport2':
+            xmlimport2();
+            break;
 
-    case 'xmlimport3':
-        xmlimport3();
-        break;
+        case 'xmlimport3':
+            xmlimport3();
+            break;
 
-    case 'textexportnew':
-        textexport($translang, false);
-        break;
+        case 'textexportnew':
+            textexport($translang, false);
+            break;
 
-    case 'textexportall':
-        textexport($translang, true);
-        break;
+        case 'textexportall':
+            textexport($translang, true);
+            break;
 
-    case 'textimport':
-        break;
+        case 'textimport':
+            break;
 
-    case 'textimport2':
-        textimport($translang);
-        break;
+        case 'textimport2':
+            textimport($translang);
+            break;
 
-    case 'edit':
-        if (!$access->mayTranslate($translang)) {
-            $tpl->error(ERROR_NO_ACCESS);
-        }
-        edit();
-        break;
+        case 'edit':
+            if (!$access->mayTranslate($translang)) {
+                $tpl->error(ERROR_NO_ACCESS);
+            }
+            edit();
+            break;
 
-    case 'copy_en':
-        copy_english_texts();
-        break;
+        case 'copy_en':
+            copy_english_texts();
+            break;
 
-    case 'listfaults':
-        $trans = sql(
-            'SELECT `sys_trans`.`id`,
+        case 'listfaults':
+            $trans = sql(
+                'SELECT `sys_trans`.`id`,
                     `sys_trans`.`text`
              FROM `sys_trans`
              LEFT JOIN `sys_trans_ref`
                 ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id`
              WHERE ISNULL(`sys_trans_ref`.`trans_id`)
              ORDER BY `sys_trans`.`id` DESC'
-        );
-        $tpl->assign_rs('trans', $trans);
-        sql_free_result($trans);
-        break;
+            );
+            $tpl->assign_rs('trans', $trans);
+            sql_free_result($trans);
+            break;
 
-    case 'listall':
-        $trans = sql(
-            "SELECT `sys_trans`.`id`,
+        case 'listall':
+            $trans = sql(
+                "SELECT `sys_trans`.`id`,
                     `sys_trans`.`text`,
                     `sys_trans_text`.`text` AS `trans`
              FROM `sys_trans`
@@ -170,48 +170,48 @@ 
                ON `sys_trans`.`id`=`sys_trans_text`.`trans_id`
                AND `sys_trans_text`.`lang`='&1'
              ORDER BY `sys_trans`.`id` DESC",
-            $translang
-        );
-        $tpl->assign_rs('trans', $trans);
-        sql_free_result($trans);
-        break;
+                $translang
+            );
+            $tpl->assign_rs('trans', $trans);
+            sql_free_result($trans);
+            break;
 
-    case 'remove':
-        if (!$access->mayTranslate($translang)) {
-            $tpl->error(ERROR_NO_ACCESS);
-        }
-        remove();
-        break;
-
-    case 'scan':
-        scan();
-        break;
-
-    case 'scanstart':
-        scanStart();
-        break;
-
-    case 'scanfile':
-        $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : '';
-        scanFile($filename);
-        exit;
-
-    case 'quicknone':
-        $cookie->un_set('translate_mode');
-        break;
-
-    case 'quicknew':
-        $cookie->set('translate_mode', 'new');
-        break;
-
-    case 'quickall':
-        $cookie->set('translate_mode', 'all');
-        break;
-
-    default:
-        $action = 'listnew';
-        $trans = sql(
-            "SELECT DISTINCT `sys_trans`.`id`,
+        case 'remove':
+            if (!$access->mayTranslate($translang)) {
+                $tpl->error(ERROR_NO_ACCESS);
+            }
+            remove();
+            break;
+
+        case 'scan':
+            scan();
+            break;
+
+        case 'scanstart':
+            scanStart();
+            break;
+
+        case 'scanfile':
+            $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : '';
+            scanFile($filename);
+            exit;
+
+        case 'quicknone':
+            $cookie->un_set('translate_mode');
+            break;
+
+        case 'quicknew':
+            $cookie->set('translate_mode', 'new');
+            break;
+
+        case 'quickall':
+            $cookie->set('translate_mode', 'all');
+            break;
+
+        default:
+            $action = 'listnew';
+            $trans = sql(
+                "SELECT DISTINCT `sys_trans`.`id`,
                              `sys_trans`.`text`
              FROM `sys_trans`
              LEFT JOIN `sys_trans_text`
@@ -222,10 +222,10 @@ 
              WHERE ISNULL(`sys_trans_text`.`trans_id`)
                OR `sys_trans_text`.`text`=''
              ORDER BY `sys_trans`.`id` DESC",
-            $translang
-        );
-        $tpl->assign_rs('trans', $trans);
-        sql_free_result($trans);
+                $translang
+            );
+            $tpl->assign_rs('trans', $trans);
+            sql_free_result($trans);
 }
 
 $languages = [];

htdocs/lib2/db.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -1256,7 +1256,7 @@
 }
 
 /**
- * @param $f
+ * @param resource $f
  * @param resource $rs
  * @param $table
  * @param bool $truncate