Inspection of "Feature/publisher namespaces" - XOOPS/XoopsCore - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#598)

by Michael

created 2019-05-15 16:03 UTC

Status

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -164,9 +164,9 @@
 block discarded – undo
 
     $tempEle = new Select(_MB_PUBLISHER_TEMPLATE, 'options[4]', $options[4]);
     $tempEle->addOptionArray([
-                                 'normal' => _MB_PUBLISHER_TEMPLATE_NORMAL,
-                                 'extended' => _MB_PUBLISHER_TEMPLATE_EXTENDED,
-                             ]);
+                                    'normal' => _MB_PUBLISHER_TEMPLATE_NORMAL,
+                                    'extended' => _MB_PUBLISHER_TEMPLATE_EXTENDED,
+                                ]);
 
     $form->addElement($colEle);
     $form->addElement($catEle);

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 /**
  * Function To Show Publisher Items From Categories In Their Own Columns
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
     $block['columns'] = $columns;
     $block['columnwidth'] = (int)(100 / $opt_num_columns);
 
-    $xoTheme->addStylesheet(XoopsBaseConfig::get('url') . '/modules/' . PUBLISHER_DIRNAME . '/css/publisher.css');
+    $xoTheme->addStylesheet(XoopsBaseConfig::get('url').'/modules/'.PUBLISHER_DIRNAME.'/css/publisher.css');
 
     return $block;
 }

Please login to merge, or discard this patch.

htdocs/modules/publisher/blocks/date_to_date.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 use Xoops\Form\DateSelect;
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 /**
  * @param $options
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
         $block['lang_poster']           = _MB_PUBLISHER_POSTEDBY;
         $block['lang_date']             = _MB_PUBLISHER_DATE;
         $modulename                     = $myts->displayTarea($helper->getModule()->getVar('name'));
-        $block['lang_visitItem']        = _MB_PUBLISHER_VISITITEM . ' ' . $modulename;
+        $block['lang_visitItem']        = _MB_PUBLISHER_VISITITEM.' '.$modulename;
         $block['lang_articles_from_to'] = sprintf(_MB_PUBLISHER_ARTICLES_FROM_TO, $options[0], $options[1]);
     }
 

Please login to merge, or discard this patch.

htdocs/modules/publisher/blocks/latest_files.php 2 patches

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -80,10 +80,10 @@
 block discarded – undo
     $catEle = new Label(_MB_PUBLISHER_SELECTCAT, Publisher\Utils::createCategorySelect($options[0], 0, true, 'options[0]'));
     $orderEle = new Select(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
     $orderEle->addOptionArray([
-                                  'datesub' => _MB_PUBLISHER_DATE,
-                                  'counter' => _MB_PUBLISHER_HITS,
-                                  'weight' => _MB_PUBLISHER_WEIGHT,
-                              ]);
+                                    'datesub' => _MB_PUBLISHER_DATE,
+                                    'counter' => _MB_PUBLISHER_HITS,
+                                    'weight' => _MB_PUBLISHER_WEIGHT,
+                                ]);
     $dispEle = new Text(_MB_PUBLISHER_DISP, 'options[2]', 10, 255, $options[2]);
     $directEle = new RadioYesNo(_MB_PUBLISHER_DIRECTDOWNLOAD, 'options[3]', $options[3]);
 

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@
 block discarded – undo
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 /**
  * @param $options

Please login to merge, or discard this patch.

htdocs/modules/publisher/blocks/items_new.php 2 patches

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -128,10 +128,10 @@  discard block
 block discarded – undo
     $catEle = new Label(_MB_PUBLISHER_SELECTCAT, Publisher\Utils::createCategorySelect($options[0], 0, true, 'options[0]'));
     $orderEle = new Select(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
     $orderEle->addOptionArray([
-                                  'datesub' => _MB_PUBLISHER_DATE,
-                                  'counter' => _MB_PUBLISHER_HITS,
-                                  'weight' => _MB_PUBLISHER_WEIGHT,
-                              ]);
+                                    'datesub' => _MB_PUBLISHER_DATE,
+                                    'counter' => _MB_PUBLISHER_HITS,
+                                    'weight' => _MB_PUBLISHER_WEIGHT,
+                                ]);
 
     $showEle = new RadioYesNo(_MB_PUBLISHER_ORDER_SHOW, 'options[2]', $options[2]);
     $dispEle = new Text(_MB_PUBLISHER_DISP, 'options[3]', 2, 255, $options[3]);
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
 
     $imageEle = new Select(_MB_PUBLISHER_IMAGE_TO_DISPLAY, 'options[5]', $options[5]);
     $imageEle->addOptionArray([
-                                  'none' => XoopsLocale::NONE,
-                                  'article' => _MB_PUBLISHER_IMAGE_ARTICLE,
-                                  'category' => _MB_PUBLISHER_IMAGE_CATEGORY,
-                                  'avatar' => _MB_PUBLISHER_IMAGE_AVATAR,
-                              ]);
+                                    'none' => XoopsLocale::NONE,
+                                    'article' => _MB_PUBLISHER_IMAGE_ARTICLE,
+                                    'category' => _MB_PUBLISHER_IMAGE_CATEGORY,
+                                    'avatar' => _MB_PUBLISHER_IMAGE_AVATAR,
+                                ]);
 
     $form->addElement($catEle);
     $form->addElement($orderEle);

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
 
 defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 /**
  * @param $options
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
         $criteria = null;
     } else {
         $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('categoryid', '(' . $options[0] . ')', 'IN'));
+        $criteria->add(new Criteria('categoryid', '('.$options[0].')', 'IN'));
     }
     $xoops = Xoops::getInstance();
     $thumbService = $xoops->service('thumbnail');
@@ -73,11 +73,11 @@  discard block
 block discarded – undo
             $item['poster'] = $iValue->posterName(); // for make poster name linked, use linkedPosterName() instead of posterName()
 
             if ('article' === $image) {
-                $item['image'] = XoopsBaseConfig::get('url') . '/uploads/blank.gif';
+                $item['image'] = XoopsBaseConfig::get('url').'/uploads/blank.gif';
                 $item['image_name'] = '';
                 $images = $iValue->getImages();
                 if (is_object($images['main'])) {
-                    $item['image'] = $thumbService->getImgUrl('uploads/' . $images['main']->getVar('image_name'), 50, 0)->getValue();
+                    $item['image'] = $thumbService->getImgUrl('uploads/'.$images['main']->getVar('image_name'), 50, 0)->getValue();
 
                     $item['image_name'] = $images['main']->getVar('image_nicename');
                 }
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
             } elseif ('avatar' === $image) {
                 $auid = $iValue->getVar('uid');
                 if ('0' == $auid) {
-                    $item['image'] = XoopsBaseConfig::get('url') . '/uploads/blank.gif';
+                    $item['image'] = XoopsBaseConfig::get('url').'/uploads/blank.gif';
                     $images = $iValue->getImages();
                     if (is_object($images['main'])) {
-                        $item['image'] = $thumbService->getImgUrl('uploads/' . $images['main']->getVar('image_name'), 50, 0)->getValue();
+                        $item['image'] = $thumbService->getImgUrl('uploads/'.$images['main']->getVar('image_name'), 50, 0)->getValue();
                     }
                 } else {
                     $item['image'] = $xoops->service('avatar')->getAvatarUrl($auid)->getValue();

Please login to merge, or discard this patch.

htdocs/modules/publisher/blocks/items_random_item.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@
 block discarded – undo
 
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 /**
  * @param $options

Please login to merge, or discard this patch.

htdocs/modules/publisher/blocks/items_menu.php 2 patches

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -84,10 +84,10 @@
 block discarded – undo
     $catEle = new Label(_MB_PUBLISHER_SELECTCAT, Publisher\Utils::createCategorySelect($options[0], 0, true, 'options[0]'));
     $orderEle = new Select(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
     $orderEle->addOptionArray([
-                                  'datesub' => _MB_PUBLISHER_DATE,
-                                  'counter' => _MB_PUBLISHER_HITS,
-                                  'weight' => _MB_PUBLISHER_WEIGHT,
-                              ]);
+                                    'datesub' => _MB_PUBLISHER_DATE,
+                                    'counter' => _MB_PUBLISHER_HITS,
+                                    'weight' => _MB_PUBLISHER_WEIGHT,
+                                ]);
     $dispEle = new Text(_MB_PUBLISHER_DISP, 'options[2]', 10, 255, $options[2]);
 
     $form->addElement($catEle);

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -26,7 +26,7 @@
 block discarded – undo
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 /**
  * @param $options

Please login to merge, or discard this patch.

htdocs/modules/publisher/blocks/category_items_sel.php 2 patches

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -94,10 +94,10 @@
 block discarded – undo
     $catEle = new Label(_MB_PUBLISHER_SELECTCAT, Publisher\Utils::createCategorySelect($options[0]), 'options[0]');
     $orderEle = new Select(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
     $orderEle->addOptionArray([
-                                  'datesub' => _MB_PUBLISHER_DATE,
-                                  'counter' => _MB_PUBLISHER_HITS,
-                                  'weight' => _MB_PUBLISHER_WEIGHT,
-                              ]);
+                                    'datesub' => _MB_PUBLISHER_DATE,
+                                    'counter' => _MB_PUBLISHER_HITS,
+                                    'weight' => _MB_PUBLISHER_WEIGHT,
+                                ]);
     $dispEle = new Text(_MB_PUBLISHER_DISP, 'options[2]', 2, 255, $options[2]);
     $charsEle = new Text(_MB_PUBLISHER_CHARS, 'options[3]', 2, 255, $options[3]);
 

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@
 block discarded – undo
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 /**
  * @param $options

Please login to merge, or discard this patch.

htdocs/modules/publisher/blocks/latest_news.php 1 patch

Spacing +81 added lines, -81 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 /**
  * @param $options
@@ -63,14 +63,14 @@  discard block
 block discarded – undo
         $criteria = null;
     } else {
         $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('categoryid', '(' . $options[29] . ')', 'IN'));
+        $criteria->add(new Criteria('categoryid', '('.$options[29].')', 'IN'));
     }
 
     // Use specific ITEMS
     if (0 != $selected_stories) {
         unset($criteria); //removes category option
         $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('itemid', '(' . $selected_stories . ')', 'IN'));
+        $criteria->add(new Criteria('itemid', '('.$selected_stories.')', 'IN'));
     }
 
     $itemsObj = $helper->getItemHandler()->getItems($limit, $start, [_PUBLISHER_STATUS_PUBLISHED], -1, $sort, $order, '', true, $criteria, 'itemid');
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
 
         $ls_height = '';
         if (0 != $options[12]) {
-            $ls_height = 'height="' . $imgheight . '" ';
+            $ls_height = 'height="'.$imgheight.'" ';
         }
 
         if ('LEFT' === $options[15]) {
@@ -116,17 +116,17 @@  discard block
 block discarded – undo
 
         //Image
         if (1 == $options[10] && '' != $item['image_path']) {
-            $startdiv = '<div style="' . $imgposition . '"><a href="' . $item['itemurl'] . '">';
-            $style = 'style="margin' . $ls_margin . ': 10px; padding: 2px; border: ' . $border . 'px solid #' . $bordercolor . '"';
-            $enddiv = 'width="' . $imgwidth . '" ' . $ls_height . '></a></div>';
-            $image = $startdiv . '<img ' . $style . ' src="' . $item['item_image'] . '" alt="' . $item['image_name'] . '" ' . $enddiv;
+            $startdiv = '<div style="'.$imgposition.'"><a href="'.$item['itemurl'].'">';
+            $style = 'style="margin'.$ls_margin.': 10px; padding: 2px; border: '.$border.'px solid #'.$bordercolor.'"';
+            $enddiv = 'width="'.$imgwidth.'" '.$ls_height.'></a></div>';
+            $image = $startdiv.'<img '.$style.' src="'.$item['item_image'].'" alt="'.$item['image_name'].'" '.$enddiv;
 
             $item['image'] = $image;
         }
 
         if ($helper->isUserAdmin()) {
-            $item['admin'] = "<a href='" . PUBLISHER_URL . '/submit.php?itemid=' . $itemObj->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif'" . " title='" . _CO_PUBLISHER_EDIT . "' alt='" . _CO_PUBLISHER_EDIT . "'></a>&nbsp;";
-            $item['admin'] .= "<a href='" . PUBLISHER_URL . '/admin/item.php?op=del&amp;itemid=' . $itemObj->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png'" . " title='" . _CO_PUBLISHER_DELETE . "' alt='" . _CO_PUBLISHER_DELETE . "'></a>";
+            $item['admin'] = "<a href='".PUBLISHER_URL.'/submit.php?itemid='.$itemObj->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/edit.gif'"." title='"._CO_PUBLISHER_EDIT."' alt='"._CO_PUBLISHER_EDIT."'></a>&nbsp;";
+            $item['admin'] .= "<a href='".PUBLISHER_URL.'/admin/item.php?op=del&amp;itemid='.$itemObj->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/delete.png'"." title='"._CO_PUBLISHER_DELETE."' alt='"._CO_PUBLISHER_DELETE."'></a>";
         } else {
             $item['admin'] = '';
         }
@@ -139,40 +139,40 @@  discard block
 block discarded – undo
          */
         $block['archivelink'] = '';
         if (1 == $options[17]) {
-            $block['archivelink'] = '| <a href="' . PUBLISHER_URL . '/archive.php">' . _MB_PUBLISHER_ARCHIVE . '</a> ';
+            $block['archivelink'] = '| <a href="'.PUBLISHER_URL.'/archive.php">'._MB_PUBLISHER_ARCHIVE.'</a> ';
         }
 
         //TODO: Should we not show link to Anonymous?
         $block['submitlink'] = '';
         if (1 == $options[18] && $xoops->isUser()) {
-            $block['submitlink'] = '| <a href="' . PUBLISHER_URL . '/submit.php">' . _MB_PUBLISHER_SUBMITNEWS . '</a> ';
+            $block['submitlink'] = '| <a href="'.PUBLISHER_URL.'/submit.php">'._MB_PUBLISHER_SUBMITNEWS.'</a> ';
         }
 
         $item['poster'] = '';
         if (1 == $options[19]) {
-            $item['poster'] = _MB_PUBLISHER_POSTER . ' ' . $itemObj->posterName();
+            $item['poster'] = _MB_PUBLISHER_POSTER.' '.$itemObj->posterName();
         }
 
         $item['posttime'] = '';
         if (1 == $options[20]) {
             //todo, check this concatenation
-            $item['posttime'] = mb_strtolower(XoopsLocale::ON) . ' ' . $itemObj->datesub();
+            $item['posttime'] = mb_strtolower(XoopsLocale::ON).' '.$itemObj->datesub();
         }
 
         $item['topic_title'] = '';
         if (1 == $options[21]) {
-            $item['topic_title'] = $itemObj->getCategoryLink() . _MB_PUBLISHER_SP;
+            $item['topic_title'] = $itemObj->getCategoryLink()._MB_PUBLISHER_SP;
         }
 
         $item['read'] = '';
         if (1 == $options[22]) {
             //todo, check this concatenation
-            $item['read'] = '&nbsp;(' . $itemObj->getVar('counter') . ' ' . mb_strtolower(XoopsLocale::READS) . ')';
+            $item['read'] = '&nbsp;('.$itemObj->getVar('counter').' '.mb_strtolower(XoopsLocale::READS).')';
         }
 
         $item['more'] = '';
         if ('' != $itemObj->body() || $itemObj->getVar('comments') > 0) {
-            $item['more'] = '<a class="publisher_spotlight_readmore" href="' . $itemObj->getItemUrl() . '">' . _MB_PUBLISHER_READMORE . '</a>';
+            $item['more'] = '<a class="publisher_spotlight_readmore" href="'.$itemObj->getItemUrl().'">'._MB_PUBLISHER_READMORE.'</a>';
         }
 
         $comments = $itemObj->getVar('comments');
@@ -181,23 +181,23 @@  discard block
 block discarded – undo
                 //shows 1 comment instead of 1 comm. if comments ==1
                 //langugage file modified accordingly
                 if (1 == $comments) {
-                    $item['comment'] = '&nbsp;' . _MB_PUBLISHER_ONECOMMENT . '&nbsp;';
+                    $item['comment'] = '&nbsp;'._MB_PUBLISHER_ONECOMMENT.'&nbsp;';
                 } else {
-                    $item['comment'] = '&nbsp;' . $comments . '&nbsp;' . _MB_PUBLISHER_COMMENTS . '&nbsp;';
+                    $item['comment'] = '&nbsp;'.$comments.'&nbsp;'._MB_PUBLISHER_COMMENTS.'&nbsp;';
                 }
             } else {
-                $item['comment'] = '&nbsp;' . _MB_PUBLISHER_NO_COMMENTS . '&nbsp;';
+                $item['comment'] = '&nbsp;'._MB_PUBLISHER_NO_COMMENTS.'&nbsp;';
             }
         }
 
         $item['print'] = '';
         if (1 == $options[24]) {
-            $item['print'] = '<a href="' . Publisher\Utils::seoGenUrl('print', $itemObj->getVar('itemid'), $itemObj->getVar('short_url')) . '" rel="nofollow"><img src="' . PUBLISHER_URL . '/images/links/print.gif" title="' . _CO_PUBLISHER_PRINT . '" alt="' . _CO_PUBLISHER_PRINT . '"></a>&nbsp;';
+            $item['print'] = '<a href="'.Publisher\Utils::seoGenUrl('print', $itemObj->getVar('itemid'), $itemObj->getVar('short_url')).'" rel="nofollow"><img src="'.PUBLISHER_URL.'/images/links/print.gif" title="'._CO_PUBLISHER_PRINT.'" alt="'._CO_PUBLISHER_PRINT.'"></a>&nbsp;';
         }
 
         $item['pdf'] = '';
         if (1 == $options[25]) {
-            $item['pdf'] = "<a href='" . PUBLISHER_URL . '/makepdf.php?itemid=' . $itemObj->getVar('itemid') . "' rel='nofollow'><img src='" . PUBLISHER_URL . "/images/links/pdf.gif' title='" . _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "'></a>&nbsp;";
+            $item['pdf'] = "<a href='".PUBLISHER_URL.'/makepdf.php?itemid='.$itemObj->getVar('itemid')."' rel='nofollow'><img src='".PUBLISHER_URL."/images/links/pdf.gif' title='"._CO_PUBLISHER_PDF."' alt='"._CO_PUBLISHER_PDF."'></a>&nbsp;";
         }
 
         $item['email'] = '';
@@ -206,12 +206,12 @@  discard block
 block discarded – undo
             $subject = $itemObj->_convert_for_japanese($subject);
             $maillink = Publisher\Utils::tellafriend($subject);
 
-            $item['email'] = '<a href="' . $maillink . '"><img src="' . PUBLISHER_URL . '/images/links/friend.gif" title="' . _CO_PUBLISHER_MAIL . '" alt="' . _CO_PUBLISHER_MAIL . '"></a>&nbsp;';
+            $item['email'] = '<a href="'.$maillink.'"><img src="'.PUBLISHER_URL.'/images/links/friend.gif" title="'._CO_PUBLISHER_MAIL.'" alt="'._CO_PUBLISHER_MAIL.'"></a>&nbsp;';
         }
 
         $block['morelink'] = '';
         if (1 == $options[27]) {
-            $block['morelink'] = '<a href="' . PUBLISHER_URL . '/index.php">' . _MB_PUBLISHER_MORE_ITEMS . '</a> ';
+            $block['morelink'] = '<a href="'.PUBLISHER_URL.'/index.php">'._MB_PUBLISHER_MORE_ITEMS.'</a> ';
         }
 
         $block['latestnews_scroll'] = false;
@@ -260,24 +260,24 @@  discard block
 block discarded – undo
     $tabletag4 = '</td></tr>';
 
     $form = "<table border='0' cellpadding='0' cellspacing='0'>";
-    $form .= $tabletag3 . _MB_PUBLISHER_GENERALCONFIG . $tabletag4; // General Options
-    $form .= $tabletag1 . _MB_PUBLISHER_FIRST . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[0] . "' size='4'>&nbsp;" . _MB_PUBLISHER_ITEMS . '</td></tr>';
-    $form .= $tabletag1 . _MB_PUBLISHER_DISP . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[1] . "' size='4'>&nbsp;" . _MB_PUBLISHER_ITEMS . '</td></tr>';
-    $form .= $tabletag1 . _MB_PUBLISHER_COLUMNS . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[2] . "' size='4'>&nbsp;" . _MB_PUBLISHER_COLUMN . '</td></tr>';
-    $form .= $tabletag1 . _MB_PUBLISHER_TEXTLENGTH . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[3] . "' size='4'>&nbsp;" . _MB_PUBLISHER_LETTER . '</td></tr>';
-    $form .= $tabletag1 . _MB_PUBLISHER_SELECTEDSTORIES . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[4] . "' size='16'></td></tr>";
-    $form .= $tabletag1 . _MB_PUBLISHER_SCROLL . $tabletag2;
+    $form .= $tabletag3._MB_PUBLISHER_GENERALCONFIG.$tabletag4; // General Options
+    $form .= $tabletag1._MB_PUBLISHER_FIRST.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[0]."' size='4'>&nbsp;"._MB_PUBLISHER_ITEMS.'</td></tr>';
+    $form .= $tabletag1._MB_PUBLISHER_DISP.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[1]."' size='4'>&nbsp;"._MB_PUBLISHER_ITEMS.'</td></tr>';
+    $form .= $tabletag1._MB_PUBLISHER_COLUMNS.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[2]."' size='4'>&nbsp;"._MB_PUBLISHER_COLUMN.'</td></tr>';
+    $form .= $tabletag1._MB_PUBLISHER_TEXTLENGTH.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[3]."' size='4'>&nbsp;"._MB_PUBLISHER_LETTER.'</td></tr>';
+    $form .= $tabletag1._MB_PUBLISHER_SELECTEDSTORIES.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[4]."' size='16'></td></tr>";
+    $form .= $tabletag1._MB_PUBLISHER_SCROLL.$tabletag2;
     $form .= publisher_mk_chkbox($options, 5);
-    $form .= $tabletag1 . _MB_PUBLISHER_SCROLLHEIGHT . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[6] . "' size='4'></td></tr>";
-    $form .= $tabletag1 . _MB_PUBLISHER_SCROLLSPEED . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[7] . "' size='4'></td></tr>";
-    $form .= $tabletag1 . _MB_PUBLISHER_SCROLLDIR . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_SCROLLHEIGHT.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[6]."' size='4'></td></tr>";
+    $form .= $tabletag1._MB_PUBLISHER_SCROLLSPEED.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[7]."' size='4'></td></tr>";
+    $form .= $tabletag1._MB_PUBLISHER_SCROLLDIR.$tabletag2;
 
     $form .= "<select size='1' name='options[8]'>";
 
@@ -291,89 +291,89 @@  discard block
 block discarded – undo
     }
     $form .= '</select></td></tr>';
 
-    $form .= $tabletag1 . _MB_PUBLISHER_ORDER . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_ORDER.$tabletag2;
 
     $form .= "<select name='options[9]'>";
     $form .= "<option value='datesub'";
     if ('datesub' === $options[9]) {
         $form .= " selected='selected'";
     }
-    $form .= '>' . _MB_PUBLISHER_DATE . '</option>';
+    $form .= '>'._MB_PUBLISHER_DATE.'</option>';
 
     $form .= "<option value='counter'";
     if ('counter' === $options[9]) {
         $form .= " selected='selected'";
     }
-    $form .= '>' . _MB_PUBLISHER_HITS . '</option>';
+    $form .= '>'._MB_PUBLISHER_HITS.'</option>';
 
     $form .= "<option value='weight'";
     if ('weight' === $options[9]) {
         $form .= " selected='selected'";
     }
-    $form .= '>' . _MB_PUBLISHER_WEIGHT . '</option>';
+    $form .= '>'._MB_PUBLISHER_WEIGHT.'</option>';
 
     $form .= '</select></td></tr>';
 
-    $form .= $tabletag3 . _MB_PUBLISHER_PHOTOSCONFIG . $tabletag4; // Photos Options
-    $form .= $tabletag1 . _MB_PUBLISHER_IMGDISPLAY . $tabletag2;
+    $form .= $tabletag3._MB_PUBLISHER_PHOTOSCONFIG.$tabletag4; // Photos Options
+    $form .= $tabletag1._MB_PUBLISHER_IMGDISPLAY.$tabletag2;
     $form .= publisher_mk_chkbox($options, 10);
-    $form .= $tabletag1 . _MB_PUBLISHER_IMGWIDTH . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[11] . "' size='4'>&nbsp;" . _MB_PUBLISHER_PIXEL . '</td></tr>';
-    $form .= $tabletag1 . _MB_PUBLISHER_IMGHEIGHT . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[12] . "' size='4'>&nbsp;" . _MB_PUBLISHER_PIXEL . '</td></tr>';
-    $form .= $tabletag1 . _MB_PUBLISHER_BORDER . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[13] . "' size='4'>&nbsp;" . _MB_PUBLISHER_PIXEL . '</td></tr>';
-    $form .= $tabletag1 . _MB_PUBLISHER_BORDERCOLOR . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[14] . "' size='8'></td></tr>";
-    $form .= $tabletag1 . _MB_PUBLISHER_IMGPOSITION . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_IMGWIDTH.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[11]."' size='4'>&nbsp;"._MB_PUBLISHER_PIXEL.'</td></tr>';
+    $form .= $tabletag1._MB_PUBLISHER_IMGHEIGHT.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[12]."' size='4'>&nbsp;"._MB_PUBLISHER_PIXEL.'</td></tr>';
+    $form .= $tabletag1._MB_PUBLISHER_BORDER.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[13]."' size='4'>&nbsp;"._MB_PUBLISHER_PIXEL.'</td></tr>';
+    $form .= $tabletag1._MB_PUBLISHER_BORDERCOLOR.$tabletag2;
+    $form .= "<input type='text' name='options[]' value='".$options[14]."' size='8'></td></tr>";
+    $form .= $tabletag1._MB_PUBLISHER_IMGPOSITION.$tabletag2;
     $form .= "<select name='options[]'>";
     $form .= "<option value='LEFT'";
     if ('LEFT' === $options[15]) {
         $form .= " selected='selected'";
     }
-    $form .= '>' . XoopsLocale::LEFT . "</option>\n";
+    $form .= '>'.XoopsLocale::LEFT."</option>\n";
 
     $form .= "<option value='CENTER'";
     if ('CENTER' === $options[15]) {
         $form .= " selected='selected'";
     }
-    $form .= '>' . XoopsLocale::CENTER . "</option>\n";
+    $form .= '>'.XoopsLocale::CENTER."</option>\n";
 
     $form .= "<option value='RIGHT'";
     if ('RIGHT' === $options[15]) {
         $form .= " selected='selected'";
     }
-    $form .= '>' . XoopsLocale::RIGHT . '</option>';
+    $form .= '>'.XoopsLocale::RIGHT.'</option>';
     $form .= '</select></td></tr>';
 
-    $form .= $tabletag3 . _MB_PUBLISHER_LINKSCONFIG . $tabletag4; // Links Options
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_TOPICLINK . $tabletag2;
+    $form .= $tabletag3._MB_PUBLISHER_LINKSCONFIG.$tabletag4; // Links Options
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_TOPICLINK.$tabletag2;
     $form .= publisher_mk_chkbox($options, 16);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_ARCHIVELINK . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_ARCHIVELINK.$tabletag2;
     $form .= publisher_mk_chkbox($options, 17);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_SUBMITLINK . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_SUBMITLINK.$tabletag2;
     $form .= publisher_mk_chkbox($options, 18);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_POSTEDBY . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_POSTEDBY.$tabletag2;
     $form .= publisher_mk_chkbox($options, 19);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_POSTTIME . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_POSTTIME.$tabletag2;
     $form .= publisher_mk_chkbox($options, 20);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_TOPICTITLE . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_TOPICTITLE.$tabletag2;
     $form .= publisher_mk_chkbox($options, 21);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_READ . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_READ.$tabletag2;
     $form .= publisher_mk_chkbox($options, 22);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_COMMENT . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_COMMENT.$tabletag2;
     $form .= publisher_mk_chkbox($options, 23);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_PRINT . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_PRINT.$tabletag2;
     $form .= publisher_mk_chkbox($options, 24);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_PDF . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_PDF.$tabletag2;
     $form .= publisher_mk_chkbox($options, 25);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_EMAIL . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_EMAIL.$tabletag2;
     $form .= publisher_mk_chkbox($options, 26);
-    $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_MORELINK . $tabletag2;
+    $form .= $tabletag1._MB_PUBLISHER_DISPLAY_MORELINK.$tabletag2;
     $form .= publisher_mk_chkbox($options, 27);
 
-    $form .= $tabletag3 . _MB_PUBLISHER_TEMPLATESCONFIG . $tabletag4; // Templates Options
-    $form .= $tabletag1 . _MB_PUBLISHER_TEMPLATE . $tabletag2;
+    $form .= $tabletag3._MB_PUBLISHER_TEMPLATESCONFIG.$tabletag4; // Templates Options
+    $form .= $tabletag1._MB_PUBLISHER_TEMPLATE.$tabletag2;
     $form .= "<select size='1' name='options[28]'>";
 
     $templates = ['normal' => _MB_PUBLISHER_TEMPLATE_NORMAL, 'extended' => _MB_PUBLISHER_TEMPLATE_EXTENDED, 'ticker' => _MB_PUBLISHER_TEMPLATE_TICKER, 'slider1' => _MB_PUBLISHER_TEMPLATE_SLIDER1, 'slider2' => _MB_PUBLISHER_TEMPLATE_SLIDER2];
@@ -387,8 +387,8 @@  discard block
 block discarded – undo
     $form .= '</select></td></tr>';
 
     //Select Which Categories To Show
-    $form .= $tabletag3 . _MB_PUBLISHER_TOPICSCONFIG . $tabletag4; // Topics Options
-    $form .= $tabletag1 . _MB_PUBLISHER_TOPICSDISPLAY . $tabletag2;
+    $form .= $tabletag3._MB_PUBLISHER_TOPICSCONFIG.$tabletag4; // Topics Options
+    $form .= $tabletag1._MB_PUBLISHER_TOPICSDISPLAY.$tabletag2;
     $form .= Publisher\Utils::createCategorySelect($options[29], 0, true, 'options[29]');
     $form .= '</td></tr>';
 
@@ -413,12 +413,12 @@  discard block
 block discarded – undo
     if (1 == $options[$number]) {
         $chk = " checked";
     }
-    $chkbox = "<input type='radio' name='options[{$number}]' value='1'" . $chk . '>&nbsp;' . XoopsLocale::YES . '&nbsp;&nbsp;';
+    $chkbox = "<input type='radio' name='options[{$number}]' value='1'".$chk.'>&nbsp;'.XoopsLocale::YES.'&nbsp;&nbsp;';
     $chk = '';
     if (0 == $options[$number]) {
         $chk = " checked";
     }
-    $chkbox .= "<input type='radio' name='options[{$number}]' value='0'" . $chk . '>&nbsp;' . XoopsLocale::NO . '</td></tr>';
+    $chkbox .= "<input type='radio' name='options[{$number}]' value='0'".$chk.'>&nbsp;'.XoopsLocale::NO.'</td></tr>';
 
     return $chkbox;
 }
@@ -439,17 +439,17 @@  discard block
 block discarded – undo
     if (2 == $options[$number]) {
         $slc = " checked";
     }
-    $select = "<input type='radio' name='options[{$number}]' value='2'" . $slc . '>&nbsp;' . XoopsLocale::LEFT . '&nbsp;&nbsp;';
+    $select = "<input type='radio' name='options[{$number}]' value='2'".$slc.'>&nbsp;'.XoopsLocale::LEFT.'&nbsp;&nbsp;';
     $slc = '';
     if (1 == $options[$number]) {
         $slc = " checked";
     }
-    $select .= "<input type='radio' name='options[{$number}]' value='1'" . $slc . '>&nbsp;' . XoopsLocale::CENTER . '&nbsp;&nbsp;';
+    $select .= "<input type='radio' name='options[{$number}]' value='1'".$slc.'>&nbsp;'.XoopsLocale::CENTER.'&nbsp;&nbsp;';
     $slc = '';
     if (0 == $options[$number]) {
         $slc = " checked";
     }
-    $select .= "<input type='radio' name='options[{$number}]' value='0'" . $slc . '>&nbsp;' . XoopsLocale::RIGHT . '</td></tr>';
+    $select .= "<input type='radio' name='options[{$number}]' value='0'".$slc.'>&nbsp;'.XoopsLocale::RIGHT.'</td></tr>';
 
     return $select;
 }

Please login to merge, or discard this patch.

htdocs/modules/publisher/blocks/search.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
  */
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 /**
  * @param $options
@@ -61,17 +61,17 @@  discard block
 block discarded – undo
     if ('OR' === $andor) {
         $type_select .= ' selected="selected"';
     }
-    $type_select .= '>' . XoopsLocale::ANY_OR . '</option>';
+    $type_select .= '>'.XoopsLocale::ANY_OR.'</option>';
     $type_select .= '<option value="AND"';
     if ('AND' === $andor) {
         $type_select .= ' selected="selected"';
     }
-    $type_select .= '>' . XoopsLocale::ALL . '</option>';
+    $type_select .= '>'.XoopsLocale::ALL.'</option>';
     $type_select .= '<option value="EXACT"';
     if ('exact' === $andor) {
         $type_select .= ' selected="selected"';
     }
-    $type_select .= '>' . XoopsLocale::EXACT_MATCH . '</option>';
+    $type_select .= '>'.XoopsLocale::EXACT_MATCH.'</option>';
     $type_select .= '</select>';
 
     /* category */
@@ -81,13 +81,13 @@  discard block
 block discarded – undo
     if (empty($category) || 0 == count($category)) {
         $select_category .= 'selected="selected"';
     }
-    $select_category .= '>' . XoopsLocale::ALL . '</option>';
+    $select_category .= '>'.XoopsLocale::ALL.'</option>';
     foreach ($categories as $id => $cat) {
-        $select_category .= '<option value="' . $id . '"';
+        $select_category .= '<option value="'.$id.'"';
         if (in_array($id, $category)) {
             $select_category .= 'selected="selected"';
         }
-        $select_category .= '>' . $cat . '</option>';
+        $select_category .= '>'.$cat.'</option>';
     }
     $select_category .= '</select>';
 
@@ -97,32 +97,32 @@  discard block
 block discarded – undo
     if (in_array('title', $searchin)) {
         $searchin_select .= ' checked';
     }
-    $searchin_select .= '>' . _CO_PUBLISHER_TITLE . '&nbsp;&nbsp;';
+    $searchin_select .= '>'._CO_PUBLISHER_TITLE.'&nbsp;&nbsp;';
     $searchin_select .= '<input type="checkbox" name="searchin[]" value="subtitle"';
     if (in_array('subtitle', $searchin)) {
         $searchin_select .= ' checked';
     }
-    $searchin_select .= '>' . _CO_PUBLISHER_SUBTITLE . '&nbsp;&nbsp;';
+    $searchin_select .= '>'._CO_PUBLISHER_SUBTITLE.'&nbsp;&nbsp;';
     $searchin_select .= '<input type="checkbox" name="searchin[]" value="summary"';
     if (in_array('summary', $searchin)) {
         $searchin_select .= ' checked';
     }
-    $searchin_select .= '>' . _CO_PUBLISHER_SUMMARY . '&nbsp;&nbsp;';
+    $searchin_select .= '>'._CO_PUBLISHER_SUMMARY.'&nbsp;&nbsp;';
     $searchin_select .= '<input type="checkbox" name="searchin[]" value="text"';
     if (in_array('body', $searchin)) {
         $searchin_select .= ' checked';
     }
-    $searchin_select .= '>' . _CO_PUBLISHER_BODY . '&nbsp;&nbsp;';
+    $searchin_select .= '>'._CO_PUBLISHER_BODY.'&nbsp;&nbsp;';
     $searchin_select .= '<input type="checkbox" name="searchin[]" value="keywords"';
     if (in_array('meta_keywords', $searchin)) {
         $searchin_select .= ' checked';
     }
-    $searchin_select .= '>' . _CO_PUBLISHER_ITEM_META_KEYWORDS . '&nbsp;&nbsp;';
+    $searchin_select .= '>'._CO_PUBLISHER_ITEM_META_KEYWORDS.'&nbsp;&nbsp;';
     $searchin_select .= '<input type="checkbox" name="searchin[]" value="all"';
     if (in_array('all', $searchin) || empty($searchin)) {
         $searchin_select .= ' checked';
     }
-    $searchin_select .= '>' . XoopsLocale::ALL . '&nbsp;&nbsp;';
+    $searchin_select .= '>'.XoopsLocale::ALL.'&nbsp;&nbsp;';
 
     /* sortby */
     $sortby_select = '<select name="sortby">';
@@ -130,22 +130,22 @@  discard block
 block discarded – undo
     if ('itemid' === $sortby || empty($sortby)) {
         $sortby_select .= ' selected="selected"';
     }
-    $sortby_select .= '>' . XoopsLocale::NONE . '</option>';
+    $sortby_select .= '>'.XoopsLocale::NONE.'</option>';
     $sortby_select .= '<option value="datesub"';
     if ('datesub' === $sortby) {
         $sortby_select .= ' selected="selected"';
     }
-    $sortby_select .= '>' . _CO_PUBLISHER_DATESUB . '</option>';
+    $sortby_select .= '>'._CO_PUBLISHER_DATESUB.'</option>';
     $sortby_select .= '<option value="title"';
     if ('title' === $sortby) {
         $sortby_select .= ' selected="selected"';
     }
-    $sortby_select .= '>' . _CO_PUBLISHER_TITLE . '</option>';
+    $sortby_select .= '>'._CO_PUBLISHER_TITLE.'</option>';
     $sortby_select .= '<option value="categoryid"';
     if ('categoryid' === $sortby) {
         $sortby_select .= ' selected="selected"';
     }
-    $sortby_select .= '>' . _CO_PUBLISHER_CATEGORY . '</option>';
+    $sortby_select .= '>'._CO_PUBLISHER_CATEGORY.'</option>';
     $sortby_select .= '</select>';
 
     $block['type_select'] = $type_select;

Please login to merge, or discard this patch.

		@@ -164,9 +164,9 @@
		block discarded – undo
164	164
165	165	$tempEle = new Select(_MB_PUBLISHER_TEMPLATE, 'options[4]', $options[4]);
166	166	$tempEle->addOptionArray([
167		- 'normal' => _MB_PUBLISHER_TEMPLATE_NORMAL,
168		- 'extended' => _MB_PUBLISHER_TEMPLATE_EXTENDED,
169		- ]);
	167	+ 'normal' => _MB_PUBLISHER_TEMPLATE_NORMAL,
	168	+ 'extended' => _MB_PUBLISHER_TEMPLATE_EXTENDED,
	169	+ ]);
170	170
171	171	$form->addElement($colEle);
172	172	$form->addElement($catEle);

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	*/
22	22	use XoopsModules\Publisher\Helper;
23	23
24		-require_once dirname(__DIR__) . '/include/common.php';
	24	+require_once dirname(__DIR__).'/include/common.php';
25	25
26	26	/**
27	27	* @param $options
		@@ -61,17 +61,17 @@ discard block
		block discarded – undo
61	61	if ('OR' === $andor) {
62	62	$type_select .= ' selected="selected"';
63	63	}
64		- $type_select .= '>' . XoopsLocale::ANY_OR . '</option>';
	64	+ $type_select .= '>'.XoopsLocale::ANY_OR.'</option>';
65	65	$type_select .= '<option value="AND"';
66	66	if ('AND' === $andor) {
67	67	$type_select .= ' selected="selected"';
68	68	}
69		- $type_select .= '>' . XoopsLocale::ALL . '</option>';
	69	+ $type_select .= '>'.XoopsLocale::ALL.'</option>';
70	70	$type_select .= '<option value="EXACT"';
71	71	if ('exact' === $andor) {
72	72	$type_select .= ' selected="selected"';
73	73	}
74		- $type_select .= '>' . XoopsLocale::EXACT_MATCH . '</option>';
	74	+ $type_select .= '>'.XoopsLocale::EXACT_MATCH.'</option>';
75	75	$type_select .= '</select>';
76	76
77	77	/* category */
		@@ -81,13 +81,13 @@ discard block
		block discarded – undo
81	81	if (empty($category) \|\| 0 == count($category)) {
82	82	$select_category .= 'selected="selected"';
83	83	}
84		- $select_category .= '>' . XoopsLocale::ALL . '</option>';
	84	+ $select_category .= '>'.XoopsLocale::ALL.'</option>';
85	85	foreach ($categories as $id => $cat) {
86		- $select_category .= '<option value="' . $id . '"';
	86	+ $select_category .= '<option value="'.$id.'"';
87	87	if (in_array($id, $category)) {
88	88	$select_category .= 'selected="selected"';
89	89	}
90		- $select_category .= '>' . $cat . '</option>';
	90	+ $select_category .= '>'.$cat.'</option>';
91	91	}
92	92	$select_category .= '</select>';
93	93
		@@ -97,32 +97,32 @@ discard block
		block discarded – undo
97	97	if (in_array('title', $searchin)) {
98	98	$searchin_select .= ' checked';
99	99	}
100		- $searchin_select .= '>' . _CO_PUBLISHER_TITLE . '  ';
	100	+ $searchin_select .= '>'._CO_PUBLISHER_TITLE.'  ';
101	101	$searchin_select .= '<input type="checkbox" name="searchin[]" value="subtitle"';
102	102	if (in_array('subtitle', $searchin)) {
103	103	$searchin_select .= ' checked';
104	104	}
105		- $searchin_select .= '>' . _CO_PUBLISHER_SUBTITLE . '  ';
	105	+ $searchin_select .= '>'._CO_PUBLISHER_SUBTITLE.'  ';
106	106	$searchin_select .= '<input type="checkbox" name="searchin[]" value="summary"';
107	107	if (in_array('summary', $searchin)) {
108	108	$searchin_select .= ' checked';
109	109	}
110		- $searchin_select .= '>' . _CO_PUBLISHER_SUMMARY . '  ';
	110	+ $searchin_select .= '>'._CO_PUBLISHER_SUMMARY.'  ';
111	111	$searchin_select .= '<input type="checkbox" name="searchin[]" value="text"';
112	112	if (in_array('body', $searchin)) {
113	113	$searchin_select .= ' checked';
114	114	}
115		- $searchin_select .= '>' . _CO_PUBLISHER_BODY . '  ';
	115	+ $searchin_select .= '>'._CO_PUBLISHER_BODY.'  ';
116	116	$searchin_select .= '<input type="checkbox" name="searchin[]" value="keywords"';
117	117	if (in_array('meta_keywords', $searchin)) {
118	118	$searchin_select .= ' checked';
119	119	}
120		- $searchin_select .= '>' . _CO_PUBLISHER_ITEM_META_KEYWORDS . '  ';
	120	+ $searchin_select .= '>'._CO_PUBLISHER_ITEM_META_KEYWORDS.'  ';
121	121	$searchin_select .= '<input type="checkbox" name="searchin[]" value="all"';
122	122	if (in_array('all', $searchin) \|\| empty($searchin)) {
123	123	$searchin_select .= ' checked';
124	124	}
125		- $searchin_select .= '>' . XoopsLocale::ALL . '  ';
	125	+ $searchin_select .= '>'.XoopsLocale::ALL.'  ';
126	126
127	127	/* sortby */
128	128	$sortby_select = '<select name="sortby">';
		@@ -130,22 +130,22 @@ discard block
		block discarded – undo
130	130	if ('itemid' === $sortby \|\| empty($sortby)) {
131	131	$sortby_select .= ' selected="selected"';
132	132	}
133		- $sortby_select .= '>' . XoopsLocale::NONE . '</option>';
	133	+ $sortby_select .= '>'.XoopsLocale::NONE.'</option>';
134	134	$sortby_select .= '<option value="datesub"';
135	135	if ('datesub' === $sortby) {
136	136	$sortby_select .= ' selected="selected"';
137	137	}
138		- $sortby_select .= '>' . _CO_PUBLISHER_DATESUB . '</option>';
	138	+ $sortby_select .= '>'._CO_PUBLISHER_DATESUB.'</option>';
139	139	$sortby_select .= '<option value="title"';
140	140	if ('title' === $sortby) {
141	141	$sortby_select .= ' selected="selected"';
142	142	}
143		- $sortby_select .= '>' . _CO_PUBLISHER_TITLE . '</option>';
	143	+ $sortby_select .= '>'._CO_PUBLISHER_TITLE.'</option>';
144	144	$sortby_select .= '<option value="categoryid"';
145	145	if ('categoryid' === $sortby) {
146	146	$sortby_select .= ' selected="selected"';
147	147	}
148		- $sortby_select .= '>' . _CO_PUBLISHER_CATEGORY . '</option>';
	148	+ $sortby_select .= '>'._CO_PUBLISHER_CATEGORY.'</option>';
149	149	$sortby_select .= '</select>';
150	150
151	151	$block['type_select'] = $type_select;

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	use XoopsModules\Publisher;
27	27	use XoopsModules\Publisher\Helper;
28	28
29		-require_once dirname(__DIR__) . '/include/common.php';
	29	+require_once dirname(__DIR__).'/include/common.php';
30	30
31	31	/**
32	32	* Function To Show Publisher Items From Categories In Their Own Columns
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	$block['columns'] = $columns;
137	137	$block['columnwidth'] = (int)(100 / $opt_num_columns);
138	138
139		- $xoTheme->addStylesheet(XoopsBaseConfig::get('url') . '/modules/' . PUBLISHER_DIRNAME . '/css/publisher.css');
	139	+ $xoTheme->addStylesheet(XoopsBaseConfig::get('url').'/modules/'.PUBLISHER_DIRNAME.'/css/publisher.css');
140	140
141	141	return $block;
142	142	}

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	use Xoops\Form\DateSelect;
26	26	use XoopsModules\Publisher\Helper;
27	27
28		-require_once dirname(__DIR__) . '/include/common.php';
	28	+require_once dirname(__DIR__).'/include/common.php';
29	29
30	30	/**
31	31	* @param $options
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	$block['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
68	68	$block['lang_date'] = _MB_PUBLISHER_DATE;
69	69	$modulename = $myts->displayTarea($helper->getModule()->getVar('name'));
70		- $block['lang_visitItem'] = _MB_PUBLISHER_VISITITEM . ' ' . $modulename;
	70	+ $block['lang_visitItem'] = _MB_PUBLISHER_VISITITEM.' '.$modulename;
71	71	$block['lang_articles_from_to'] = sprintf(_MB_PUBLISHER_ARTICLES_FROM_TO, $options[0], $options[1]);
72	72	}
73	73

		@@ -80,10 +80,10 @@
		block discarded – undo
80	80	$catEle = new Label(_MB_PUBLISHER_SELECTCAT, Publisher\Utils::createCategorySelect($options[0], 0, true, 'options[0]'));
81	81	$orderEle = new Select(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
82	82	$orderEle->addOptionArray([
83		- 'datesub' => _MB_PUBLISHER_DATE,
84		- 'counter' => _MB_PUBLISHER_HITS,
85		- 'weight' => _MB_PUBLISHER_WEIGHT,
86		- ]);
	83	+ 'datesub' => _MB_PUBLISHER_DATE,
	84	+ 'counter' => _MB_PUBLISHER_HITS,
	85	+ 'weight' => _MB_PUBLISHER_WEIGHT,
	86	+ ]);
87	87	$dispEle = new Text(_MB_PUBLISHER_DISP, 'options[2]', 10, 255, $options[2]);
88	88	$directEle = new RadioYesNo(_MB_PUBLISHER_DIRECTDOWNLOAD, 'options[3]', $options[3]);
89	89

		@@ -27,7 +27,7 @@
		block discarded – undo
27	27	use XoopsModules\Publisher;
28	28	use XoopsModules\Publisher\Helper;
29	29
30		-require_once dirname(__DIR__) . '/include/common.php';
	30	+require_once dirname(__DIR__).'/include/common.php';
31	31
32	32	/**
33	33	* @param $options

		@@ -128,10 +128,10 @@ discard block
		block discarded – undo
128	128	$catEle = new Label(_MB_PUBLISHER_SELECTCAT, Publisher\Utils::createCategorySelect($options[0], 0, true, 'options[0]'));
129	129	$orderEle = new Select(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
130	130	$orderEle->addOptionArray([
131		- 'datesub' => _MB_PUBLISHER_DATE,
132		- 'counter' => _MB_PUBLISHER_HITS,
133		- 'weight' => _MB_PUBLISHER_WEIGHT,
134		- ]);
	131	+ 'datesub' => _MB_PUBLISHER_DATE,
	132	+ 'counter' => _MB_PUBLISHER_HITS,
	133	+ 'weight' => _MB_PUBLISHER_WEIGHT,
	134	+ ]);
135	135
136	136	$showEle = new RadioYesNo(_MB_PUBLISHER_ORDER_SHOW, 'options[2]', $options[2]);
137	137	$dispEle = new Text(_MB_PUBLISHER_DISP, 'options[3]', 2, 255, $options[3]);
		@@ -139,11 +139,11 @@ discard block
		block discarded – undo
139	139
140	140	$imageEle = new Select(_MB_PUBLISHER_IMAGE_TO_DISPLAY, 'options[5]', $options[5]);
141	141	$imageEle->addOptionArray([
142		- 'none' => XoopsLocale::NONE,
143		- 'article' => _MB_PUBLISHER_IMAGE_ARTICLE,
144		- 'category' => _MB_PUBLISHER_IMAGE_CATEGORY,
145		- 'avatar' => _MB_PUBLISHER_IMAGE_AVATAR,
146		- ]);
	142	+ 'none' => XoopsLocale::NONE,
	143	+ 'article' => _MB_PUBLISHER_IMAGE_ARTICLE,
	144	+ 'category' => _MB_PUBLISHER_IMAGE_CATEGORY,
	145	+ 'avatar' => _MB_PUBLISHER_IMAGE_AVATAR,
	146	+ ]);
147	147
148	148	$form->addElement($catEle);
149	149	$form->addElement($orderEle);

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29
30	30	defined('XOOPS_ROOT_PATH') \|\| die('XOOPS root path not defined');
31	31
32		-require_once dirname(__DIR__) . '/include/common.php';
	32	+require_once dirname(__DIR__).'/include/common.php';
33	33
34	34	/**
35	35	* @param $options
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	$criteria = null;
60	60	} else {
61	61	$criteria = new CriteriaCompo();
62		- $criteria->add(new Criteria('categoryid', '(' . $options[0] . ')', 'IN'));
	62	+ $criteria->add(new Criteria('categoryid', '('.$options[0].')', 'IN'));
63	63	}
64	64	$xoops = Xoops::getInstance();
65	65	$thumbService = $xoops->service('thumbnail');
		@@ -73,11 +73,11 @@ discard block
		block discarded – undo
73	73	$item['poster'] = $iValue->posterName(); // for make poster name linked, use linkedPosterName() instead of posterName()
74	74
75	75	if ('article' === $image) {
76		- $item['image'] = XoopsBaseConfig::get('url') . '/uploads/blank.gif';
	76	+ $item['image'] = XoopsBaseConfig::get('url').'/uploads/blank.gif';
77	77	$item['image_name'] = '';
78	78	$images = $iValue->getImages();
79	79	if (is_object($images['main'])) {
80		- $item['image'] = $thumbService->getImgUrl('uploads/' . $images['main']->getVar('image_name'), 50, 0)->getValue();
	80	+ $item['image'] = $thumbService->getImgUrl('uploads/'.$images['main']->getVar('image_name'), 50, 0)->getValue();
81	81
82	82	$item['image_name'] = $images['main']->getVar('image_nicename');
83	83	}
		@@ -87,10 +87,10 @@ discard block
		block discarded – undo
87	87	} elseif ('avatar' === $image) {
88	88	$auid = $iValue->getVar('uid');
89	89	if ('0' == $auid) {
90		- $item['image'] = XoopsBaseConfig::get('url') . '/uploads/blank.gif';
	90	+ $item['image'] = XoopsBaseConfig::get('url').'/uploads/blank.gif';
91	91	$images = $iValue->getImages();
92	92	if (is_object($images['main'])) {
93		- $item['image'] = $thumbService->getImgUrl('uploads/' . $images['main']->getVar('image_name'), 50, 0)->getValue();
	93	+ $item['image'] = $thumbService->getImgUrl('uploads/'.$images['main']->getVar('image_name'), 50, 0)->getValue();
94	94	}
95	95	} else {
96	96	$item['image'] = $xoops->service('avatar')->getAvatarUrl($auid)->getValue();

		@@ -22,7 +22,7 @@
		block discarded – undo
22	22
23	23	use XoopsModules\Publisher\Helper;
24	24
25		-require_once dirname(__DIR__) . '/include/common.php';
	25	+require_once dirname(__DIR__).'/include/common.php';
26	26
27	27	/**
28	28	* @param $options

		@@ -84,10 +84,10 @@
		block discarded – undo
84	84	$catEle = new Label(_MB_PUBLISHER_SELECTCAT, Publisher\Utils::createCategorySelect($options[0], 0, true, 'options[0]'));
85	85	$orderEle = new Select(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
86	86	$orderEle->addOptionArray([
87		- 'datesub' => _MB_PUBLISHER_DATE,
88		- 'counter' => _MB_PUBLISHER_HITS,
89		- 'weight' => _MB_PUBLISHER_WEIGHT,
90		- ]);
	87	+ 'datesub' => _MB_PUBLISHER_DATE,
	88	+ 'counter' => _MB_PUBLISHER_HITS,
	89	+ 'weight' => _MB_PUBLISHER_WEIGHT,
	90	+ ]);
91	91	$dispEle = new Text(_MB_PUBLISHER_DISP, 'options[2]', 10, 255, $options[2]);
92	92
93	93	$form->addElement($catEle);

		@@ -26,7 +26,7 @@
		block discarded – undo
26	26	use XoopsModules\Publisher;
27	27	use XoopsModules\Publisher\Helper;
28	28
29		-require_once dirname(__DIR__) . '/include/common.php';
	29	+require_once dirname(__DIR__).'/include/common.php';
30	30
31	31	/**
32	32	* @param $options

		@@ -94,10 +94,10 @@
		block discarded – undo
94	94	$catEle = new Label(_MB_PUBLISHER_SELECTCAT, Publisher\Utils::createCategorySelect($options[0]), 'options[0]');
95	95	$orderEle = new Select(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
96	96	$orderEle->addOptionArray([
97		- 'datesub' => _MB_PUBLISHER_DATE,
98		- 'counter' => _MB_PUBLISHER_HITS,
99		- 'weight' => _MB_PUBLISHER_WEIGHT,
100		- ]);
	97	+ 'datesub' => _MB_PUBLISHER_DATE,
	98	+ 'counter' => _MB_PUBLISHER_HITS,
	99	+ 'weight' => _MB_PUBLISHER_WEIGHT,
	100	+ ]);
101	101	$dispEle = new Text(_MB_PUBLISHER_DISP, 'options[2]', 2, 255, $options[2]);
102	102	$charsEle = new Text(_MB_PUBLISHER_CHARS, 'options[3]', 2, 255, $options[3]);
103	103

		@@ -24,7 +24,7 @@
		block discarded – undo
24	24	use XoopsModules\Publisher;
25	25	use XoopsModules\Publisher\Helper;
26	26
27		-require_once dirname(__DIR__) . '/include/common.php';
	27	+require_once dirname(__DIR__).'/include/common.php';
28	28
29	29	/**
30	30	* @param $options

XOOPS / XoopsCore

Pull Request — master (#598)

Status

Category

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +81 added lines, -81 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch