XOOPS / XoopsCore

htdocs/modules/publisher/src/Utils.php

Spacing +51 added lines, -51 removed lines

@@ -183,7 +183,7 @@ 
             return $helper->getModule()->getVar('name');
         }
 
-        return '<a href="' . $xoops->url(\PUBLISHER_URL) . '/">' . $helper->getModule()->getVar('name') . '</a>';
+        return '<a href="'.$xoops->url(\PUBLISHER_URL).'/">'.$helper->getModule()->getVar('name').'</a>';
     }
 
     /**
@@ -260,10 +260,10 @@ 
             $path_status = _AM_PUBLISHER_AVAILABLE;
         } elseif (!@\is_dir($thePath)) {
             $pathCheckResult = -1;
-            $path_status = _AM_PUBLISHER_NOTAVAILABLE . " <a href='" . $helper->url("admin/index.php?op=createdir&amp;path={$item}") . "'>" . _AM_PUBLISHER_CREATETHEDIR . '</a>';
+            $path_status = _AM_PUBLISHER_NOTAVAILABLE." <a href='".$helper->url("admin/index.php?op=createdir&amp;path={$item}")."'>"._AM_PUBLISHER_CREATETHEDIR.'</a>';
         } else {
             $pathCheckResult = -2;
-            $path_status = \_AM_PUBLISHER_NOTWRITABLE . " <a href='" . $helper->url("admin/index.php?op=setperm&amp;path={$item}") . "'>" . _AM_SCS_SETMPERM . '</a>';
+            $path_status = \_AM_PUBLISHER_NOTWRITABLE." <a href='".$helper->url("admin/index.php?op=setperm&amp;path={$item}")."'>"._AM_SCS_SETMPERM.'</a>';
         }
         if (!$getStatus) {
             return $path_status;
@@ -327,17 +327,17 @@ 
             if ('root' === $item) {
                 $item = '';
             } else {
-                $item = $item . '/';
+                $item = $item.'/';
             }
         } else {
             $item = '';
         }
 
         if ($hasPath) {
-            return $xoops->path(\PUBLISHER_UPLOADS_PATH . '/' . $item);
+            return $xoops->path(\PUBLISHER_UPLOADS_PATH.'/'.$item);
         }
 
-        return $xoops->url(\PUBLISHER_UPLOADS_URL . '/' . $item);
+        return $xoops->url(\PUBLISHER_UPLOADS_URL.'/'.$item);
     }
 
     /**
@@ -362,7 +362,7 @@ 
     {
         $ret = '';
         foreach ($errors as $value) {
-            $ret .= '<br> - ' . $value;
+            $ret .= '<br> - '.$value;
         }
 
         return $ret;
@@ -447,11 +447,11 @@ 
             $display = 'block';
         }
 
-        echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"toggle('" . $tablename . "'); toggleIcon('" . $iconname . "')\";>";
-        echo "<img id='" . $iconname . "' src='" . $helper->url('images/links/' . $image) . "' alt=''></a>&nbsp;" . $tabletitle . '</h3>';
-        echo "<div id='" . $tablename . "' style='display: " . $display . ";'>";
+        echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"toggle('".$tablename."'); toggleIcon('".$iconname."')\";>";
+        echo "<img id='".$iconname."' src='".$helper->url('images/links/'.$image)."' alt=''></a>&nbsp;".$tabletitle.'</h3>';
+        echo "<div id='".$tablename."' style='display: ".$display.";'>";
         if ('' != $tabledsc) {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $tabledsc . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$tabledsc.'</span>';
         }
     }
 
@@ -466,14 +466,14 @@ 
         $urls = self::getCurrentUrls();
         $path = $urls['phpself'];
 
-        $cookie_name = $path . '_publisher_collaps_' . $name;
+        $cookie_name = $path.'_publisher_collaps_'.$name;
         $cookie_name = \str_replace('.', '_', $cookie_name);
         $cookie = self::getCookieVar($cookie_name, '');
 
         if ('none' === $cookie) {
             echo '
         <script type="text/javascript"><!--
-        toggle("' . $name . '"); toggleIcon("' . $icon . '");
+        toggle("' . $name.'"); toggleIcon("'.$icon.'");
         //-->
         </script>
         ';
@@ -516,10 +516,10 @@ 
         $querystring = $_SERVER['QUERY_STRING'] ?? '';
 
         if ('' != $querystring) {
-            $querystring = '?' . $querystring;
+            $querystring = '?'.$querystring;
         }
 
-        $currenturl = $http . $httphost . $phpself . $querystring;
+        $currenturl = $http.$httphost.$phpself.$querystring;
 
         $urls = [];
         $urls['http'] = $http;
@@ -555,13 +555,13 @@ 
             $spaces .= '--';
         }
 
-        $ret .= "<option value='" . $categoryObj->getVar('categoryid') . "'";
+        $ret .= "<option value='".$categoryObj->getVar('categoryid')."'";
         if (\is_array($selectedid) && \in_array($categoryObj->getVar('categoryid'), $selectedid)) {
             $ret .= " selected='selected'";
         } elseif ($categoryObj->getVar('categoryid') == $selectedid) {
             $ret .= " selected='selected'";
         }
-        $ret .= '>' . $spaces . $categoryObj->getVar('name') . "</option>\n";
+        $ret .= '>'.$spaces.$categoryObj->getVar('name')."</option>\n";
 
         $subCategoriesObj = $helper->getCategoryHandler()->getCategories(0, 0, $categoryObj->getVar('categoryid'));
         if (\count($subCategoriesObj) > 0) {
@@ -588,13 +588,13 @@ 
 
         $selectedid = \explode(',', $selectedid);
 
-        $ret = "<select name='" . $selectname . "[]' multiple='multiple' size='10'>";
+        $ret = "<select name='".$selectname."[]' multiple='multiple' size='10'>";
         if ($allCatOption) {
             $ret .= "<option value='0'";
             if (\in_array(0, $selectedid)) {
                 $ret .= " selected='selected'";
             }
-            $ret .= '>' . _MB_PUBLISHER_ALLCAT . '</option>';
+            $ret .= '>'._MB_PUBLISHER_ALLCAT.'</option>';
         }
 
         // Creating category objects
@@ -624,7 +624,7 @@ 
         $ret = '';
         if ($allCatOption) {
             $ret .= "<option value='0'";
-            $ret .= '>' . _MB_PUBLISHER_ALLCAT . "</option>\n";
+            $ret .= '>'._MB_PUBLISHER_ALLCAT."</option>\n";
         }
 
         // Creating category objects
@@ -647,12 +647,12 @@ 
     public static function renderErrors(&$err_arr, $reseturl = ''): void
     {
         if (\is_array($err_arr) && \count($err_arr) > 0) {
-            echo '<div id="readOnly" class="errorMsg" style="border:1px solid #D24D00; background:#FEFECC url(' . \PUBLISHER_URL . '/images/important-32.png) no-repeat 7px 50%;color:#333;padding-left:45px;">';
+            echo '<div id="readOnly" class="errorMsg" style="border:1px solid #D24D00; background:#FEFECC url('.\PUBLISHER_URL.'/images/important-32.png) no-repeat 7px 50%;color:#333;padding-left:45px;">';
 
-            echo '<h4 style="text-align:left;margin:0; padding-top:0">' . _AM_PUBLISHER_MSG_SUBMISSION_ERR;
+            echo '<h4 style="text-align:left;margin:0; padding-top:0">'._AM_PUBLISHER_MSG_SUBMISSION_ERR;
 
             if ($reseturl) {
-                echo ' <a href="' . $reseturl . '">[' . _AM_PUBLISHER_TEXT_SESSION_RESET . ']</a>';
+                echo ' <a href="'.$reseturl.'">['._AM_PUBLISHER_TEXT_SESSION_RESET.']</a>';
             }
 
             echo '</h4><ul>';
@@ -660,10 +660,10 @@ 
             foreach ($err_arr as $key => $error) {
                 if (\is_array($error)) {
                     foreach ($error as $err) {
-                        echo '<li><a href="#' . $key . '" onclick="var e = xoopsGetElementById(\'' . $key . '\'); e.focus();">' . \htmlspecialchars($err) . '</a></li>';
+                        echo '<li><a href="#'.$key.'" onclick="var e = xoopsGetElementById(\''.$key.'\'); e.focus();">'.\htmlspecialchars($err).'</a></li>';
                     }
                 } else {
-                    echo '<li><a href="#' . $key . '" onclick="var e = xoopsGetElementById(\'' . $key . '\'); e.focus();">' . \htmlspecialchars($error) . '</a></li>';
+                    echo '<li><a href="#'.$key.'" onclick="var e = xoopsGetElementById(\''.$key.'\'); e.focus();">'.\htmlspecialchars($error).'</a></li>';
                 }
             }
             echo '</ul></div><br>';
@@ -691,11 +691,11 @@ 
 
         $qs = '';
         foreach ($vars as $key => $value) {
-            $qs .= $joinStr . $key . '=' . $value;
+            $qs .= $joinStr.$key.'='.$value;
             $joinStr = $amp;
         }
 
-        return $page . '?' . $qs;
+        return $page.'?'.$qs;
     }
 
     /**
@@ -709,7 +709,7 @@ 
         }
         $target_uri = $xoops->url($_SERVER['REQUEST_URI']);
 
-        return $xoops->url('modules/tellafriend/index.php?target_uri=' . \rawurlencode($target_uri) . '&amp;subject=' . \rawurlencode($subject));
+        return $xoops->url('modules/tellafriend/index.php?target_uri='.\rawurlencode($target_uri).'&amp;subject='.\rawurlencode($subject));
     }
 
     /**
@@ -757,7 +757,7 @@ 
 
                 $message = \sprintf(_CO_PUBLISHER_MESSAGE_FILE_ERROR, $errorstxt);
                 if ($withRedirect) {
-                    $xoops->redirect('file.php?op=mod&itemid=' . $itemid, 5, $message);
+                    $xoops->redirect('file.php?op=mod&itemid='.$itemid, 5, $message);
                 } else {
                     return $message;
                 }
@@ -767,15 +767,15 @@ 
         // Storing the file
         if (!$fileObj->store($allowed_mimetypes)) {
             if ($withRedirect) {
-                $xoops->redirect('file.php?op=mod&itemid=' . $fileObj->getVar('itemid'), 3, _CO_PUBLISHER_FILEUPLOAD_ERROR . self::formatErrors($fileObj->getErrors()));
+                $xoops->redirect('file.php?op=mod&itemid='.$fileObj->getVar('itemid'), 3, _CO_PUBLISHER_FILEUPLOAD_ERROR.self::formatErrors($fileObj->getErrors()));
             } else {
-                return _CO_PUBLISHER_FILEUPLOAD_ERROR . self::formatErrors($fileObj->getErrors());
+                return _CO_PUBLISHER_FILEUPLOAD_ERROR.self::formatErrors($fileObj->getErrors());
             }
         }
 
         if ($withRedirect) {
             $redirect_page = $another ? 'file.php' : 'item.php';
-            $xoops->redirect($redirect_page . '?op=mod&itemid=' . $fileObj->getVar('itemid'), 2, _CO_PUBLISHER_FILEUPLOAD_SUCCESS);
+            $xoops->redirect($redirect_page.'?op=mod&itemid='.$fileObj->getVar('itemid'), 2, _CO_PUBLISHER_FILEUPLOAD_SUCCESS);
         }
 
         return true;
@@ -783,7 +783,7 @@ 
 
     public static function newFeatureTag(): string
     {
-        $ret = '<span style="padding-right: 4px; font-weight: bold; color: #ff0000;">' . _CO_PUBLISHER_NEW_FEATURE . '</span>';
+        $ret = '<span style="padding-right: 4px; font-weight: bold; color: #ff0000;">'._CO_PUBLISHER_NEW_FEATURE.'</span>';
 
         return $ret;
     }
@@ -826,7 +826,7 @@ 
                 $string = self::closeTags($string);
             }
 
-            return $string . $etc;
+            return $string.$etc;
         }
 
         return $string;
@@ -862,7 +862,7 @@ 
 
             $complete_tags = \array_reverse($complete_tags);
             foreach ($complete_tags as $iValue) {
-                $string .= '</' . $iValue . '>';
+                $string .= '</'.$iValue.'>';
             }
         }
 
@@ -902,36 +902,36 @@ 
         $tense = 1 == $count ? _MD_PUBLISHER_VOTE_lVOTE : _MD_PUBLISHER_VOTE_lVOTES; //plural form votes/vote
 
         // now draw the rating bar
-        $rating_width = @\number_format($count==0 ? 0 : ($current_rating / $count), 2) * $rating_unitwidth;
-        $rating1 = @\number_format($count==0 ? 0 : ($current_rating / $count), 1);
-        $rating2 = @\number_format($count==0 ? 0 : ($current_rating / $count), 2);
+        $rating_width = @\number_format($count == 0 ? 0 : ($current_rating / $count), 2) * $rating_unitwidth;
+        $rating1 = @\number_format($count == 0 ? 0 : ($current_rating / $count), 1);
+        $rating2 = @\number_format($count == 0 ? 0 : ($current_rating / $count), 2);
 
         $groups = $xoops->getUserGroups();
         $gpermHandler = $helper->getGrouppermHandler();
 
         if (!$gpermHandler->checkRight('global', \_PUBLISHER_RATE, $groups, $helper->getModule()->getVar('mid'))) {
             $static_rater = [];
-            $static_rater[] .= "\n" . '<div class="publisher_ratingblock">';
-            $static_rater[] .= '<div id="unit_long' . $itemid . '">';
-            $static_rater[] .= '<div id="unit_ul' . $itemid . '" class="publisher_unit-rating" style="width:' . $rating_unitwidth * $units . 'px;">';
-            $static_rater[] .= '<div class="publisher_current-rating" style="width:' . $rating_width . 'px;">' . _MD_PUBLISHER_VOTE_RATING . ' ' . $rating2 . '/' . $units . '</div>';
+            $static_rater[] .= "\n".'<div class="publisher_ratingblock">';
+            $static_rater[] .= '<div id="unit_long'.$itemid.'">';
+            $static_rater[] .= '<div id="unit_ul'.$itemid.'" class="publisher_unit-rating" style="width:'.$rating_unitwidth * $units.'px;">';
+            $static_rater[] .= '<div class="publisher_current-rating" style="width:'.$rating_width.'px;">'._MD_PUBLISHER_VOTE_RATING.' '.$rating2.'/'.$units.'</div>';
             $static_rater[] .= '</div>';
-            $static_rater[] .= '<div class="publisher_static">' . _MD_PUBLISHER_VOTE_RATING . ': <strong> ' . $rating1 . '</strong>/' . $units . ' (' . $count . ' ' . $tense . ') <br><em>' . _MD_PUBLISHER_VOTE_DISABLE . '</em></div>';
+            $static_rater[] .= '<div class="publisher_static">'._MD_PUBLISHER_VOTE_RATING.': <strong> '.$rating1.'</strong>/'.$units.' ('.$count.' '.$tense.') <br><em>'._MD_PUBLISHER_VOTE_DISABLE.'</em></div>';
             $static_rater[] .= '</div>';
-            $static_rater[] .= '</div>' . "\n\n";
+            $static_rater[] .= '</div>'."\n\n";
 
             return \implode("\n", $static_rater);
         }
 
         $rater = '';
         $rater .= '<div class="publisher_ratingblock">';
-        $rater .= '<div id="unit_long' . $itemid . '">';
-        $rater .= '<div id="unit_ul' . $itemid . '" class="publisher_unit-rating" style="width:' . $rating_unitwidth * $units . 'px;">';
-        $rater .= '<div class="publisher_current-rating" style="width:' . $rating_width . 'px;">' . _MD_PUBLISHER_VOTE_RATING . ' ' . $rating2 . '/' . $units . '</div>';
+        $rater .= '<div id="unit_long'.$itemid.'">';
+        $rater .= '<div id="unit_ul'.$itemid.'" class="publisher_unit-rating" style="width:'.$rating_unitwidth * $units.'px;">';
+        $rater .= '<div class="publisher_current-rating" style="width:'.$rating_width.'px;">'._MD_PUBLISHER_VOTE_RATING.' '.$rating2.'/'.$units.'</div>';
 
         for ($ncount = 1; $ncount <= $units; ++$ncount) { // loop from 1 to the number of units
             if (!$voted) { // if the user hasn't yet voted, draw the voting stars
-                $rater .= '<div><a href="' . \PUBLISHER_URL . '/rate.php?itemid=' . $itemid . '&amp;rating=' . $ncount . '" title="' . $ncount . ' ' . _MD_PUBLISHER_VOTE_OUTOF . ' ' . $units . '" class="publisher_r' . $ncount . '-unit rater" rel="nofollow">' . $ncount . '</a></div>';
+                $rater .= '<div><a href="'.\PUBLISHER_URL.'/rate.php?itemid='.$itemid.'&amp;rating='.$ncount.'" title="'.$ncount.' '._MD_PUBLISHER_VOTE_OUTOF.' '.$units.'" class="publisher_r'.$ncount.'-unit rater" rel="nofollow">'.$ncount.'</a></div>';
             }
         }
 
@@ -942,7 +942,7 @@ 
             $rater .= ' class="publisher_voted"';
         }
 
-        $rater .= '>' . _MD_PUBLISHER_VOTE_RATING . ': <strong> ' . $rating1 . '</strong>/' . $units . ' (' . $count . ' ' . $tense . ')';
+        $rater .= '>'._MD_PUBLISHER_VOTE_RATING.': <strong> '.$rating1.'</strong>/'.$units.' ('.$count.' '.$tense.')';
         $rater .= '  </div>';
         $rater .= '</div>';
         $rater .= '</div>';
@@ -1152,12 +1152,12 @@ 
         $helper = Helper::getInstance();
         if ('none' !== $helper->getConfig('seo_url_rewrite')) {
             if (!empty($short_url)) {
-                $short_url = $short_url . '.html';
+                $short_url = $short_url.'.html';
             }
 
             if ('htaccess' === $helper->getConfig('seo_url_rewrite')) {
                 // generate SEO url using htaccess
-                return XoopsBaseConfig::get('url') . '/' . $helper->getConfig('seo_module_name') . ".${op}.${id}/${short_url}";
+                return XoopsBaseConfig::get('url').'/'.$helper->getConfig('seo_module_name').".${op}.${id}/${short_url}";
             }
 
             if ('path-info' === $helper->getConfig('seo_url_rewrite')) {