OpencachingDeutschland / oc-server3

htdocs/lib2/edithelper.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
  * @param $oldDescMode
  * @param $descMode
  * @param $text
- * @return mixed|string
+ * @return string
  */
 function processEditorInput($oldDescMode, $descMode, $text, &$representText)
 {
@@ -54,9 +54,9 @@ 
 
 /**
  * @param $text
- * @param $texthtml0
+ * @param boolean $texthtml0
  *
- * @return mixed|string
+ * @return string
  */
 function html2plaintext($text, $texthtml0)
 {

Unused Use Statements -2 removed lines

@@ -6,8 +6,6 @@
 
 // used in both lib1 and lib2 code
 
-use OcLegacy\Editor\EditorConstants;
-
 require_once __DIR__ . '/smiley.inc.php';
 
 

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
         // REDMINE-1249: Missing log text in mail notification
         // simpler solution that converts html to text as the previous class html2text emptied the text completely
         // implementation for line wrap, url's and probably more is missing
-        $text = preg_replace( "/\n\s+/", "\n", rtrim(html_entity_decode(strip_tags($text))));
+        $text = preg_replace("/\n\s+/", "\n", rtrim(html_entity_decode(strip_tags($text))));
 
         $text = str_replace(
             [

htdocs/log.php

Spacing +17 added lines, -17 removed lines

@@ -50,8 +50,8 @@ 
     $fieldNoteService = AppKernel::Container()->get(FieldNoteService::class);
 
     $fieldNote = $fieldNoteService->fetchOneBy([
-        'id' => (int) $_GET['fieldnoteid'],
-        'user_id' => (int) $user->getUserId()
+        'id' => (int)$_GET['fieldnoteid'],
+        'user_id' => (int)$user->getUserId()
     ]);
 
     if ($fieldNote !== null) {
@@ -97,7 +97,7 @@ 
     // check if masslog warning is accepted (in cookie)
     $masslogCookieSet = isset($_COOKIE['ocsuppressmasslogwarn']);
     if ($masslogCookieSet) {
-        $masslogCookieContent = (int) $_COOKIE['ocsuppressmasslogwarn'];
+        $masslogCookieContent = (int)$_COOKIE['ocsuppressmasslogwarn'];
     } else {
         // save masslog acception in cookie that expires on midnight if clicked
         if (isset($_REQUEST['suppressMasslogWarning']) && $_REQUEST['suppressMasslogWarning'] == 1) {
@@ -109,17 +109,17 @@ 
     //   logtext, logtype, logday, logmonth, logyear
 
     $logText = isset($_POST['logtext']) ? trim($_POST['logtext']) : '';
-    $logType = isset($_REQUEST['logtype']) ? (int) $_REQUEST['logtype'] : null;
+    $logType = isset($_REQUEST['logtype']) ? (int)$_REQUEST['logtype'] : null;
     $logDateDay = isset($_POST['logday']) ? trim($_POST['logday']) : ($datesaved ? $defaultLogDay : date('d'));
     $logDateMonth = isset($_POST['logmonth']) ? trim($_POST['logmonth']) : ($datesaved ? $defaultLogMonth : date('m'));
     $logDateYear = isset($_POST['logyear']) ? trim($_POST['logyear']) : ($datesaved ? $defaultLogYear : date('Y'));
     $logTimeHour = isset($_POST['loghour']) ? trim($_POST['loghour']) : '';
     $logTimeMinute = isset($_POST['logminute']) ? trim($_POST['logminute']) : '';
-    $needsMaintenance = isset($_POST['needs_maintenance2']) ? (int) $_POST['needs_maintenance2'] : (isset($_POST['needs_maintenance']) ? (int) $_POST['needs_maintenance'] : 0);
-    $listingOutdated = isset($_POST['listing_outdated2']) ? (int) $_POST['listing_outdated2'] : (isset($_POST['listing_outdated']) ? (int) $_POST['listing_outdated'] : 0);
-    $confirmListingOk = isset($_POST['confirm_listing_ok']) ? (int) $_POST['confirm_listing_ok'] : 0;
-    $rateOption = isset($_POST['ratingoption']) ? (int) $_POST['ratingoption'] : 0;
-    $rateCache = isset($_POST['rating']) ? (int) $_POST['rating'] : 0;
+    $needsMaintenance = isset($_POST['needs_maintenance2']) ? (int)$_POST['needs_maintenance2'] : (isset($_POST['needs_maintenance']) ? (int)$_POST['needs_maintenance'] : 0);
+    $listingOutdated = isset($_POST['listing_outdated2']) ? (int)$_POST['listing_outdated2'] : (isset($_POST['listing_outdated']) ? (int)$_POST['listing_outdated'] : 0);
+    $confirmListingOk = isset($_POST['confirm_listing_ok']) ? (int)$_POST['confirm_listing_ok'] : 0;
+    $rateOption = isset($_POST['ratingoption']) ? (int)$_POST['ratingoption'] : 0;
+    $rateCache = isset($_POST['rating']) ? (int)$_POST['rating'] : 0;
     $ocTeamComment = isset($_REQUEST['teamcomment']) ? $_REQUEST['teamcomment'] != 0 : 0;
     $suppressMasslogWarning = isset($_REQUEST['suppressMasslogWarning']) ? $_REQUEST['suppressMasslogWarning'] : ($masslogCookieSet ? $masslogCookieContent : 0);
 
@@ -165,12 +165,12 @@ 
     }
 
     // if not a found log, ignore the rating
-    $rateOption = (int) ($logType == 1 || $logType == 7);
+    $rateOption = (int)($logType == 1 || $logType == 7);
 
     // get log text editor mode (from form or from userprofile)
     // 1 = text; 2 = HTML; 3 = tinyMCE
     if (isset($_POST['descMode'])) {
-        $descMode = (int) $_POST['descMode'];  // Ocprop: 2
+        $descMode = (int)$_POST['descMode']; // Ocprop: 2
         if (($descMode < EditorConstants::HTML_MODE) || ($descMode > EditorConstants::EDITOR_MODE)) {
             $descMode = EditorConstants::EDITOR_MODE;
         }
@@ -248,7 +248,7 @@ 
          * set seconds 00:00:01, means "00:00 was logged"
          * set seconds 00:00:00, means "no time was logged"
          */
-        $logTimeSecond = (int) ($logTimeHour . $logTimeMinute != ''
+        $logTimeSecond = (int)($logTimeHour . $logTimeMinute != ''
                 && $logTimeHour == 0
                 && $logTimeMinute == 0);
 
@@ -256,8 +256,8 @@ 
         $logDate = date(
             $opt['db']['dateformat'],
             mktime(
-                (int) $logTimeHour,
-                (int) $logTimeMinute,
+                (int)$logTimeHour,
+                (int)$logTimeMinute,
                 $logTimeSecond,
                 $logDateMonth,
                 $logDateDay,
@@ -308,7 +308,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()
                 );
 
@@ -395,8 +395,8 @@ 
 
 // prepare template and display
 $tpl->assign('logtype_allows_nm', implode(',', $logtype_allows_nm));
-$tpl->assign('scrollposx', isset($_REQUEST['scrollposx']) ? (int) $_REQUEST['scrollposx']: 0);
-$tpl->assign('scrollposy', isset($_REQUEST['scrollposy']) ? (int) $_REQUEST['scrollposy']: 0);
+$tpl->assign('scrollposx', isset($_REQUEST['scrollposx']) ? (int)$_REQUEST['scrollposx'] : 0);
+$tpl->assign('scrollposy', isset($_REQUEST['scrollposy']) ? (int)$_REQUEST['scrollposy'] : 0);
 $tpl->assign('validate', $validate);
 $tpl->assign('editlog', false);
 

htdocs/editlog.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 
 // editor mode switching
 if (isset($_POST['descMode'])) {
-    $descMode = (int) $_POST['descMode']; // Ocprop: 2
+    $descMode = (int)$_POST['descMode']; // Ocprop: 2
     if (($descMode < EditorConstants::HTML_MODE) || ($descMode > EditorConstants::EDITOR_MODE)) {
         $descMode = EditorConstants::EDITOR_MODE;
     }

htdocs/mydetails.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
     if (isset($_REQUEST['save'])) {
         $purifier = new OcHTMLPurifier($opt);
         $desctext = isset($_REQUEST['desctext']) ? $purifier->purify($_REQUEST['desctext']) : "";
-        $desc_htmledit = isset($_REQUEST['descMode']) && ((int) $_REQUEST['descMode']) == EditorConstants::HTML_MODE ? '0' : '1';
+        $desc_htmledit = isset($_REQUEST['descMode']) && ((int)$_REQUEST['descMode']) == EditorConstants::HTML_MODE ? '0' : '1';
         sql(
             "
             UPDATE `user`

htdocs/editdesc.php

Spacing +6 added lines, -6 removed lines

@@ -24,8 +24,8 @@ 
         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 (mysqli_num_rows($rs) == 1) {
@@ -92,7 +92,7 @@ 
                 //save to DB?
                 if (isset($_POST['post'])) {  // Ocprop
                     //here we read all used information from the form if submitted
-                    $descMode = (int) $_POST['descMode'] ?? EditorConstants::EDITOR_MODE;  // Ocprop
+                    $descMode = (int)$_POST['descMode'] ?? EditorConstants::EDITOR_MODE; // Ocprop
 
                     switch ($descMode) {
                         case EditorConstants::HTML_MODE:
@@ -115,7 +115,7 @@ 
                         $oldDescMode = $descMode;
                     }
 
-                    $short_desc = trim($_POST['short_desc']);  // Ocprop
+                    $short_desc = trim($_POST['short_desc']); // Ocprop
                     $hint = htmlspecialchars(trim($_POST['hints']), ENT_COMPAT, 'UTF-8');
                     $desclang = $_POST['desclang'];
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -130,7 +130,7 @@ 
                     }
 
                     // Text from textarea
-                    $desc = trim($_POST['desc']);  // Ocprop
+                    $desc = trim($_POST['desc']); // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -287,7 +287,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/newcache.php

Spacing +2 added lines, -2 removed lines

@@ -108,12 +108,12 @@
         // descMode auslesen, falls nicht gesetzt aus dem Profil laden
         if (isset($_POST['descMode'])) {
             // Ocprop
-            $descMode = (int) $_POST['descMode'];
+            $descMode = (int)$_POST['descMode'];
             if (($descMode < EditorConstants::HTML_MODE) || ($descMode > EditorConstants::EDITOR_MODE)) {
                 $descMode = EditorConstants::EDITOR_MODE;
             }
             if (isset($_POST['oldDescMode'])) {
-                $oldDescMode = (int) $_POST['oldDescMode'];
+                $oldDescMode = (int)$_POST['oldDescMode'];
                 if (($oldDescMode < EditorConstants::HTML_MODE) || ($oldDescMode > EditorConstants::EDITOR_MODE)) {
                     $oldDescMode = $descMode;
                 }