XOOPS / XoopsCore

htdocs/modules/publisher/blocks/search.php

Spacing +17 added lines, -17 removed lines

@@ -20,7 +20,7 @@ 
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/include/common.php';
+include_once dirname(__DIR__).'/include/common.php';
 
 function publisher_search_show($options)
 {
@@ -52,13 +52,13 @@ 
     $type_select = "<select name=\"andor\">";
     $type_select .= "<option value=\"OR\"";
     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 */
@@ -66,11 +66,11 @@ 
     $select_category = "<select name=\"category[]\" size=\"5\" multiple=\"multiple\" width=\"150\" style=\"width:150px;\">";
     $select_category .= "<option value=\"all\"";
     if (empty($category) || count($category) == 0) $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>";
 
@@ -78,37 +78,37 @@ 
     $searchin_select = "";
     $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
     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\">";
     $sortby_select .= "<option value=\"itemid\"";
     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;

Braces +48 added lines, -16 removed lines

@@ -28,7 +28,9 @@ 
     $xoops = Xoops::getInstance();
     $publisher = Publisher::getInstance();
     $categories = $publisher->getCategoryHandler()->getCategoriesForSearch();
-    if (count($categories) == 0) return $block;
+    if (count($categories) == 0) {
+        return $block;
+    }
 
     $andor = isset($_POST["andor"]) ? $_POST["andor"] : (isset($_GET["andor"]) ? $_GET["andor"] : "");
 
@@ -51,13 +53,19 @@ 
     /* type */
     $type_select = "<select name=\"andor\">";
     $type_select .= "<option value=\"OR\"";
-    if ("OR" === $andor) $type_select .= " selected=\"selected\"";
+    if ("OR" === $andor) {
+        $type_select .= " selected=\"selected\"";
+    }
     $type_select .= ">" . XoopsLocale::ANY_OR . "</option>";
     $type_select .= "<option value=\"AND\"";
-    if ("AND" === $andor) $type_select .= " selected=\"selected\"";
+    if ("AND" === $andor) {
+        $type_select .= " selected=\"selected\"";
+    }
     $type_select .= ">" . XoopsLocale::ALL . "</option>";
     $type_select .= "<option value=\"EXACT\"";
-    if ("exact" === $andor) $type_select .= " selected=\"selected\"";
+    if ("exact" === $andor) {
+        $type_select .= " selected=\"selected\"";
+    }
     $type_select .= ">" . XoopsLocale::EXACT_MATCH . "</option>";
     $type_select .= "</select>";
 
@@ -65,11 +73,15 @@ 
 
     $select_category = "<select name=\"category[]\" size=\"5\" multiple=\"multiple\" width=\"150\" style=\"width:150px;\">";
     $select_category .= "<option value=\"all\"";
-    if (empty($category) || count($category) == 0) $select_category .= "selected=\"selected\"";
+    if (empty($category) || count($category) == 0) {
+        $select_category .= "selected=\"selected\"";
+    }
     $select_category .= ">" . XoopsLocale::ALL . "</option>";
     foreach ($categories as $id => $cat) {
         $select_category .= "<option value=\"" . $id . "\"";
-        if (in_array($id, $category)) $select_category .= "selected=\"selected\"";
+        if (in_array($id, $category)) {
+            $select_category .= "selected=\"selected\"";
+        }
         $select_category .= ">" . $cat . "</option>";
     }
     $select_category .= "</select>";
@@ -77,37 +89,57 @@ 
     /* scope */
     $searchin_select = "";
     $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
-    if (in_array("title", $searchin)) $searchin_select .= " checked";
+    if (in_array("title", $searchin)) {
+        $searchin_select .= " checked";
+    }
     $searchin_select .= " />" . _CO_PUBLISHER_TITLE . "&nbsp;&nbsp;";
     $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"subtitle\"";
-    if (in_array("subtitle", $searchin)) $searchin_select .= " checked";
+    if (in_array("subtitle", $searchin)) {
+        $searchin_select .= " checked";
+    }
     $searchin_select .= " />" . _CO_PUBLISHER_SUBTITLE . "&nbsp;&nbsp;";
     $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"summary\"";
-    if (in_array("summary", $searchin)) $searchin_select .= " checked";
+    if (in_array("summary", $searchin)) {
+        $searchin_select .= " checked";
+    }
     $searchin_select .= " />" . _CO_PUBLISHER_SUMMARY . "&nbsp;&nbsp;";
     $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
-    if (in_array("body", $searchin)) $searchin_select .= " checked";
+    if (in_array("body", $searchin)) {
+        $searchin_select .= " checked";
+    }
     $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";
+    if (in_array("meta_keywords", $searchin)) {
+        $searchin_select .= " checked";
+    }
     $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";
+    if (in_array("all", $searchin) || empty($searchin)) {
+        $searchin_select .= " checked";
+    }
     $searchin_select .= " />" . XoopsLocale::ALL . "&nbsp;&nbsp;";
 
     /* sortby */
     $sortby_select = "<select name=\"sortby\">";
     $sortby_select .= "<option value=\"itemid\"";
-    if ("itemid" === $sortby || empty($sortby)) $sortby_select .= " selected=\"selected\"";
+    if ("itemid" === $sortby || empty($sortby)) {
+        $sortby_select .= " selected=\"selected\"";
+    }
     $sortby_select .= ">" . XoopsLocale::NONE . "</option>";
     $sortby_select .= "<option value=\"datesub\"";
-    if ("datesub" === $sortby) $sortby_select .= " selected=\"selected\"";
+    if ("datesub" === $sortby) {
+        $sortby_select .= " selected=\"selected\"";
+    }
     $sortby_select .= ">" . _CO_PUBLISHER_DATESUB . "</option>";
     $sortby_select .= "<option value=\"title\"";
-    if ("title" === $sortby) $sortby_select .= " selected=\"selected\"";
+    if ("title" === $sortby) {
+        $sortby_select .= " selected=\"selected\"";
+    }
     $sortby_select .= ">" . _CO_PUBLISHER_TITLE . "</option>";
     $sortby_select .= "<option value=\"categoryid\"";
-    if ("categoryid" === $sortby) $sortby_select .= " selected=\"selected\"";
+    if ("categoryid" === $sortby) {
+        $sortby_select .= " selected=\"selected\"";
+    }
     $sortby_select .= ">" . _CO_PUBLISHER_CATEGORY . "</option>";
     $sortby_select .= "</select>";
 

htdocs/modules/publisher/blocks/items_random_item.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/include/common.php';
+include_once dirname(__DIR__).'/include/common.php';
 
 function publisher_items_random_item_show($options)
 {

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
     // creating the ITEM object
     $itemsObj = $publisher->getItemHandler()->getRandomItem('', array(_PUBLISHER_STATUS_PUBLISHED));
 
-    if (!is_object($itemsObj)) return $block;
+    if (!is_object($itemsObj)) {
+        return $block;
+    }
 
     $block['content'] = $itemsObj->getBlockSummary(300, true); //show complete summary  but truncate to 300 if only body available
     $block['id'] = $itemsObj->getVar('itemid');

htdocs/modules/publisher/blocks/items_recent.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/include/common.php';
+include_once dirname(__DIR__).'/include/common.php';
 
 function publisher_items_recent_show($options)
 {
@@ -47,7 +47,7 @@ 
         $criteria = null;
     } else {
         $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('categoryid', '(' . $options[0] . ')', 'IN'));
+        $criteria->add(new Criteria('categoryid', '('.$options[0].')', 'IN'));
     }
     $itemsObj = $publisher->getItemHandler()->getItems($limit, $start, array(_PUBLISHER_STATUS_PUBLISHED), -1, $sort, $order, '', true, $criteria, true);
 
@@ -73,7 +73,7 @@ 
         $block['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
         $block['lang_date'] = _MB_PUBLISHER_DATE;
         $modulename = $myts->displayTarea($publisher->getModule()->getVar('name'));
-        $block['lang_visitItem'] = _MB_PUBLISHER_VISITITEM . " " . $modulename;
+        $block['lang_visitItem'] = _MB_PUBLISHER_VISITITEM." ".$modulename;
     }
 
     return $block;

htdocs/modules/publisher/blocks/category_items_sel.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/include/common.php';
+include_once dirname(__DIR__).'/include/common.php';
 
 function publisher_category_items_sel_show($options)
 {

htdocs/modules/publisher/blocks/latest_files.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/include/common.php';
+include_once dirname(__DIR__).'/include/common.php';
 
 function publisher_latest_files_show($options)
 {

htdocs/modules/publisher/blocks/items_spot.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/include/common.php';
+include_once dirname(__DIR__).'/include/common.php';
 
 function publisher_items_spot_show($options)
 {
@@ -48,7 +48,7 @@ 
                 $category['name'] = $cat->getVar('name');
                 $category['categoryurl'] = $cat->getCategoryUrl();
                 if ($cat->image() !== 'blank.png') {
-                    $category['image_path'] = PublisherUtils::getImageDir('category', false) . $cat->image();
+                    $category['image_path'] = PublisherUtils::getImageDir('category', false).$cat->image();
                 } else {
                     $category['image_path'] = '';
                 }

htdocs/modules/publisher/blocks/latest_news.php

Spacing +81 added lines, -81 removed lines

@@ -21,7 +21,7 @@ 
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/include/common.php';
+include_once dirname(__DIR__).'/include/common.php';
 
 function publisher_latest_news_show($options)
 {
@@ -57,14 +57,14 @@ 
         $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 ($selected_stories != 0) {
         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 = $publisher->getItemHandler()->getItems($limit, $start, array(_PUBLISHER_STATUS_PUBLISHED), -1, $sort, $order, '', true, $criteria, 'itemid');
@@ -96,7 +96,7 @@ 
 
         $ls_height = '';
         if ($options[12] != 0) {
-            $ls_height = 'height="' . $imgheight . '" ';
+            $ls_height = 'height="'.$imgheight.'" ';
         }
 
         if ($options[15] === 'LEFT') {
@@ -113,17 +113,17 @@ 
 
         //Image
         if ($options[10] == 1 && $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 ($publisher->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'] = '';
         }
@@ -136,40 +136,40 @@ 
          */
         $block['archivelink'] = '';
         if ($options[17] == 1) {
-            $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 ($options[18] == 1 && $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 ($options[19] == 1) {
-            $item['poster'] = _MB_PUBLISHER_POSTER . ' ' . $itemObj->posterName();
+            $item['poster'] = _MB_PUBLISHER_POSTER.' '.$itemObj->posterName();
         }
 
         $item['posttime'] = '';
         if ($options[20] == 1) {
             //todo, check this concatenation
-            $item['posttime'] = strtolower(XoopsLocale::ON) . ' ' . $itemObj->datesub();
+            $item['posttime'] = strtolower(XoopsLocale::ON).' '.$itemObj->datesub();
         }
 
         $item['topic_title'] = '';
         if ($options[21] == 1) {
-            $item['topic_title'] = $itemObj->getCategoryLink() . _MB_PUBLISHER_SP;
+            $item['topic_title'] = $itemObj->getCategoryLink()._MB_PUBLISHER_SP;
         }
 
         $item['read'] = '';
         if ($options[22] == 1) {
             //todo, check this concatenation
-            $item['read'] = '&nbsp;(' . $itemObj->getVar('counter') . ' ' . strtolower(XoopsLocale::READS) . ')';
+            $item['read'] = '&nbsp;('.$itemObj->getVar('counter').' '.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');
@@ -178,23 +178,23 @@ 
                 //shows 1 comment instead of 1 comm. if comments ==1
                 //langugage file modified accordingly
                 if ($comments == 1) {
-                    $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 ($options[24] == 1) {
-            $item['print'] = '<a href="' . PublisherUtils::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="'.PublisherUtils::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 ($options[25] == 1) {
-            $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'] = '';
@@ -203,12 +203,12 @@ 
             $subject = $itemObj->_convert_for_japanese($subject);
             $maillink = PublisherUtils::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 ($options[27] == 1) {
-            $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;
@@ -249,24 +249,24 @@ 
     $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]'>";
 
@@ -280,90 +280,90 @@ 
     }
     $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 ($options[9] === "datesub") {
         $form .= " selected='selected'";
     }
-    $form .= ">" . _MB_PUBLISHER_DATE . "</option>";
+    $form .= ">"._MB_PUBLISHER_DATE."</option>";
 
     $form .= "<option value='counter'";
     if ($options[9] === "counter") {
         $form .= " selected='selected'";
     }
-    $form .= ">" . _MB_PUBLISHER_HITS . "</option>";
+    $form .= ">"._MB_PUBLISHER_HITS."</option>";
 
     $form .= "<option value='weight'";
     if ($options[9] === "weight") {
         $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 ($options[15] === 'LEFT') {
         $form .= " selected='selected'";
     }
-    $form .= '>' . XoopsLocale::LEFT . "</option>\n";
+    $form .= '>'.XoopsLocale::LEFT."</option>\n";
 
     $form .= "<option value='CENTER'";
     if ($options[15] === 'CENTER') {
         $form .= " selected='selected'";
     }
-    $form .= '>' . XoopsLocale::CENTER . "</option>\n";
+    $form .= '>'.XoopsLocale::CENTER."</option>\n";
 
     $form .= "<option value='RIGHT'";
     if ($options[15] === 'RIGHT') {
         $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 = array('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);
@@ -377,8 +377,8 @@ 
     $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 .= PublisherUtils::createCategorySelect($options[29], 0, true, 'options[29]');
     $form .= '</td></tr>';
 
@@ -392,12 +392,12 @@ 
     if ($options[$number] == 1) {
         $chk = " checked='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 ($options[$number] == 0) {
         $chk = " checked='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;
 }
 
@@ -407,16 +407,16 @@ 
     if ($options[$number] == 2) {
         $slc = " checked='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 ($options[$number] == 1) {
         $slc = " checked='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 ($options[$number] == 0) {
         $slc = " checked='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;
 }

htdocs/modules/publisher/blocks/items_menu.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/include/common.php';
+include_once dirname(__DIR__).'/include/common.php';
 
 function publisher_items_menu_show($options)
 {

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
     // Getting all top cats
     $block_categoriesObj = $publisher->getCategoryHandler()->getCategories(0, 0, 0);
 
-    if (count($block_categoriesObj) == 0) return $block;
+    if (count($block_categoriesObj) == 0) {
+        return $block;
+    }
 
     // Are we in Publisher ?
     $block['inModule'] = $publisher->isCurrentModule();

htdocs/modules/publisher/class/file.php

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/include/common.php';
+include_once dirname(__DIR__).'/include/common.php';
 
 // File status
 define("_PUBLISHER_STATUS_FILE_NOTSET", -1);
@@ -114,9 +114,9 @@ 
         if (!is_dir(PublisherUtils::getUploadDir())) {
             mkdir(PublisherUtils::getUploadDir(), 0757);
         }
-        $uploader = new XoopsMediaUploader(PublisherUtils::getUploadDir() . '/', $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+        $uploader = new XoopsMediaUploader(PublisherUtils::getUploadDir().'/', $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
         if ($uploader->fetchMedia($post_field)) {
-            $uploader->setTargetFileName($itemid . "_" . $uploader->getMediaName());
+            $uploader->setTargetFileName($itemid."_".$uploader->getMediaName());
             if ($uploader->upload()) {
                 $this->setVar('filename', $uploader->getSavedFileName());
                 if ($this->getVar('name') == '') {
@@ -184,7 +184,7 @@ 
      */
     public function getFileUrl()
     {
-        return PublisherUtils::getUploadDir(false) . $this->getVar('filename');
+        return PublisherUtils::getUploadDir(false).$this->getVar('filename');
     }
 
     /**
@@ -192,7 +192,7 @@ 
      */
     public function getFilePath()
     {
-        return PublisherUtils::getUploadDir() . $this->getVar('filename');
+        return PublisherUtils::getUploadDir().$this->getVar('filename');
     }
 
     /**
@@ -200,7 +200,7 @@ 
      */
     public function getFileLink()
     {
-        return "<a href='" . PUBLISHER_URL . "/visit.php?fileid=" . $this->getVar('fileid') . "'>" . $this->getVar('name') . "</a>";
+        return "<a href='".PUBLISHER_URL."/visit.php?fileid=".$this->getVar('fileid')."'>".$this->getVar('name')."</a>";
     }
 
     /**
@@ -208,7 +208,7 @@ 
      */
     public function getItemLink()
     {
-        return "<a href='" . PUBLISHER_URL . "/item.php?itemid=" . $this->getVar('itemid') . "'>" . $this->getVar('name') . "</a>";
+        return "<a href='".PUBLISHER_URL."/item.php?itemid=".$this->getVar('itemid')."'>".$this->getVar('name')."</a>";
     }
 
     /**