XOOPS / XoopsCore

htdocs/modules/publisher/admin/pw_delete_file.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
  * @version         $Id$
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 $xoops = Xoops::getInstance();
 if (isset($_POST["op"]) && ($_POST["op"] === "delfileok")) {
     $dir = PublisherUtils::getUploadDir(true, 'content');
-    @unlink($dir . '/' . $_POST["address"]);
+    @unlink($dir.'/'.$_POST["address"]);
     $xoops->redirect($_POST['backto'], 2, _AM_PUBLISHER_FDELETED);
 } else {
     $xoops->header();

htdocs/modules/publisher/admin/main.php

Spacing +60 added lines, -60 removed lines

@@ -19,7 +19,7 @@ 
  * @version         $Id:main.php  335 2011-12-05 20:24:01Z lusopoemas@gmail.com $
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 
@@ -79,16 +79,16 @@ 
 PublisherUtils::openCollapsableBar('inventorytable', 'inventoryicon', _AM_PUBLISHER_INVENTORY);
 echo "<br />";
 echo "<table width='100%' class='outer' cellspacing='1' cellpadding='3' border='0' ><tr>";
-echo "<td class='head'>" . _AM_PUBLISHER_TOTALCAT . "</td><td align='center' class='even'>" . $totalcategories . "</td>";
-echo "<td class='head'>" . _AM_PUBLISHER_TOTALSUBMITTED . "</td><td align='center' class='even'>" . $totalsubmitted . "</td>";
-echo "<td class='head'>" . _AM_PUBLISHER_TOTALPUBLISHED . "</td><td align='center' class='even'>" . $totalpublished . "</td>";
-echo "<td class='head'>" . _AM_PUBLISHER_TOTAL_OFFLINE . "</td><td align='center' class='even'>" . $totaloffline . "</td>";
+echo "<td class='head'>"._AM_PUBLISHER_TOTALCAT."</td><td align='center' class='even'>".$totalcategories."</td>";
+echo "<td class='head'>"._AM_PUBLISHER_TOTALSUBMITTED."</td><td align='center' class='even'>".$totalsubmitted."</td>";
+echo "<td class='head'>"._AM_PUBLISHER_TOTALPUBLISHED."</td><td align='center' class='even'>".$totalpublished."</td>";
+echo "<td class='head'>"._AM_PUBLISHER_TOTAL_OFFLINE."</td><td align='center' class='even'>".$totaloffline."</td>";
 echo "</tr></table>";
 echo "<br />";
 
 echo "<form><div style=\"margin-bottom: 12px;\">";
-echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='" . _AM_PUBLISHER_CATEGORY_CREATE . "'>&nbsp;&nbsp;";
-echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
+echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='"._AM_PUBLISHER_CATEGORY_CREATE."'>&nbsp;&nbsp;";
+echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='"._AM_PUBLISHER_CREATEITEM."'>&nbsp;&nbsp;";
 echo "</div></form>";
 
 PublisherUtils::closeCollapsableBar('inventorytable', 'inventoryicon');
@@ -152,57 +152,57 @@ 
     case _PUBLISHER_STATUS_SUBMITTED:
         $selectedtxt1 = "selected='selected'";
         $caption = _CO_PUBLISHER_SUBMITTED;
-        $cond = " WHERE status = " . _PUBLISHER_STATUS_SUBMITTED . " ";
+        $cond = " WHERE status = "._PUBLISHER_STATUS_SUBMITTED." ";
         $status_explaination = _AM_PUBLISHER_SUBMITTED_EXP;
         break;
 
     case _PUBLISHER_STATUS_PUBLISHED:
         $selectedtxt2 = "selected='selected'";
         $caption = _CO_PUBLISHER_PUBLISHED;
-        $cond = " WHERE status = " . _PUBLISHER_STATUS_PUBLISHED . " ";
+        $cond = " WHERE status = "._PUBLISHER_STATUS_PUBLISHED." ";
         $status_explaination = _AM_PUBLISHER_PUBLISHED_EXP;
         break;
 
     case _PUBLISHER_STATUS_OFFLINE:
         $selectedtxt3 = "selected='selected'";
         $caption = _CO_PUBLISHER_OFFLINE;
-        $cond = " WHERE status = " . _PUBLISHER_STATUS_OFFLINE . " ";
+        $cond = " WHERE status = "._PUBLISHER_STATUS_OFFLINE." ";
         $status_explaination = _AM_PUBLISHER_OFFLINE_EXP;
         break;
 
     case _PUBLISHER_STATUS_REJECTED:
         $selectedtxt4 = "selected='selected'";
         $caption = _CO_PUBLISHER_REJECTED;
-        $cond = " WHERE status = " . _PUBLISHER_STATUS_REJECTED . " ";
+        $cond = " WHERE status = "._PUBLISHER_STATUS_REJECTED." ";
         $status_explaination = _AM_PUBLISHER_REJECTED_ITEM_EXP;
         break;
 }
 
 /* -- Code to show selected terms -- */
-echo "<form name='pick' id='pick' action='" . $_SERVER['PHP_SELF'] . "' method='POST' style='margin: 0;'>";
+echo "<form name='pick' id='pick' action='".$_SERVER['PHP_SELF']."' method='POST' style='margin: 0;'>";
 
 echo "
     <table width='100%' cellspacing='1' cellpadding='2' border='0' style='border-left: 1px solid silver; border-top: 1px solid silver; border-right: 1px solid silver;'>
         <tr>
-            <td><span style='font-weight: bold; font-variant: small-caps;'>" . _AM_PUBLISHER_SHOWING . " " . $caption . "</span></td>
-            <td align='right'>" . _AM_PUBLISHER_SELECT_SORT . "
+            <td><span style='font-weight: bold; font-variant: small-caps;'>" . _AM_PUBLISHER_SHOWING." ".$caption."</span></td>
+            <td align='right'>" . _AM_PUBLISHER_SELECT_SORT."
                 <select name='sortsel' onchange='submit()'>
-                    <option value='itemid' $sorttxtitemid>" . _AM_PUBLISHER_ID . "</option>
-                    <option value='title' $sorttxttitle>" . _AM_PUBLISHER_TITLE . "</option>
-                    <option value='datesub' $sorttxtcreated>" . _AM_PUBLISHER_CREATED . "</option>
-                    <option value='weight' $sorttxtweight>" . _CO_PUBLISHER_WEIGHT . "</option>
+                    <option value='itemid' $sorttxtitemid>"._AM_PUBLISHER_ID."</option>
+                    <option value='title' $sorttxttitle>"._AM_PUBLISHER_TITLE."</option>
+                    <option value='datesub' $sorttxtcreated>"._AM_PUBLISHER_CREATED."</option>
+                    <option value='weight' $sorttxtweight>"._CO_PUBLISHER_WEIGHT."</option>
                 </select>
                 <select name='ordersel' onchange='submit()'>
-                    <option value='ASC' $ordertxtasc>" . _AM_PUBLISHER_ASC . "</option>
-                    <option value='DESC' $ordertxtdesc>" . _AM_PUBLISHER_DESC . "</option>
+                    <option value='ASC' $ordertxtasc>"._AM_PUBLISHER_ASC."</option>
+                    <option value='DESC' $ordertxtdesc>"._AM_PUBLISHER_DESC."</option>
                 </select>
-            " . _AM_PUBLISHER_SELECT_STATUS . " :
+            " . _AM_PUBLISHER_SELECT_STATUS." :
                 <select name='statussel' onchange='submit()'>
-                    <option value='0' $selectedtxt0>" . _AM_PUBLISHER_ALL . " [$totalitems]</option>
-                    <option value='1' $selectedtxt1>" . _CO_PUBLISHER_SUBMITTED . " [$totalsubmitted]</option>
-                    <option value='2' $selectedtxt2>" . _CO_PUBLISHER_PUBLISHED . " [$totalpublished]</option>
-                    <option value='3' $selectedtxt3>" . _CO_PUBLISHER_OFFLINE . " [$totaloffline]</option>
-                    <option value='4' $selectedtxt4>" . _CO_PUBLISHER_REJECTED . " [$totalrejected]</option>
+                    <option value='0' $selectedtxt0>"._AM_PUBLISHER_ALL." [$totalitems]</option>
+                    <option value='1' $selectedtxt1>"._CO_PUBLISHER_SUBMITTED." [$totalsubmitted]</option>
+                    <option value='2' $selectedtxt2>"._CO_PUBLISHER_PUBLISHED." [$totalpublished]</option>
+                    <option value='3' $selectedtxt3>"._CO_PUBLISHER_OFFLINE." [$totaloffline]</option>
+                    <option value='4' $selectedtxt4>"._CO_PUBLISHER_REJECTED." [$totalrejected]</option>
                 </select>
             </td>
         </tr>
@@ -233,34 +233,34 @@ 
 
             case _PUBLISHER_STATUS_SUBMITTED:
                 $statustxt = _CO_PUBLISHER_SUBMITTED;
-                $approve = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/approve.gif' title='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' alt='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' /></a>&nbsp;";
+                $approve = "<a href='item.php?op=mod&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/approve.gif' title='"._AM_PUBLISHER_SUBMISSION_MODERATE."' alt='"._AM_PUBLISHER_SUBMISSION_MODERATE."' /></a>&nbsp;";
                 $clone = '';
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."' /></a>";
                 $modify = "";
                 break;
 
             case _PUBLISHER_STATUS_PUBLISHED:
                 $statustxt = _CO_PUBLISHER_PUBLISHED;
                 $approve = "";
-                $clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>&nbsp;";
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/edit.gif' title='" . _AM_PUBLISHER_ITEM_EDIT . "' alt='" . _AM_PUBLISHER_ITEM_EDIT . "' /></a>&nbsp;";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
+                $clone = "<a href='item.php?op=clone&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/clone.gif' title='"._AM_PUBLISHER_CLONE_ITEM."' alt='"._AM_PUBLISHER_CLONE_ITEM."' /></a>&nbsp;";
+                $modify = "<a href='item.php?op=mod&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/edit.gif' title='"._AM_PUBLISHER_ITEM_EDIT."' alt='"._AM_PUBLISHER_ITEM_EDIT."' /></a>&nbsp;";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."' /></a>";
                 break;
 
             case _PUBLISHER_STATUS_OFFLINE:
                 $statustxt = _CO_PUBLISHER_OFFLINE;
                 $approve = "";
-                $clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>&nbsp;";
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/edit.gif' title='" . _AM_PUBLISHER_ITEM_EDIT . "' alt='" . _AM_PUBLISHER_ITEM_EDIT . "' /></a>&nbsp;";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
+                $clone = "<a href='item.php?op=clone&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/clone.gif' title='"._AM_PUBLISHER_CLONE_ITEM."' alt='"._AM_PUBLISHER_CLONE_ITEM."' /></a>&nbsp;";
+                $modify = "<a href='item.php?op=mod&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/edit.gif' title='"._AM_PUBLISHER_ITEM_EDIT."' alt='"._AM_PUBLISHER_ITEM_EDIT."' /></a>&nbsp;";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."' /></a>";
                 break;
 
             case _PUBLISHER_STATUS_REJECTED:
                 $statustxt = _CO_PUBLISHER_REJECTED;
                 $approve = "";
-                $clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>&nbsp;";
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/edit.gif' title='" . _AM_PUBLISHER_REJECTED_EDIT . "' alt='" . _AM_PUBLISHER_REJECTED_EDIT . "' /></a>&nbsp;";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
+                $clone = "<a href='item.php?op=clone&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/clone.gif' title='"._AM_PUBLISHER_CLONE_ITEM."' alt='"._AM_PUBLISHER_CLONE_ITEM."' /></a>&nbsp;";
+                $modify = "<a href='item.php?op=mod&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/edit.gif' title='"._AM_PUBLISHER_REJECTED_EDIT."' alt='"._AM_PUBLISHER_REJECTED_EDIT."' /></a>&nbsp;";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."' /></a>";
                 break;
 
             case "default":
@@ -268,24 +268,24 @@ 
                 $statustxt = _AM_PUBLISHER_STATUS0;
                 $approve = "";
                 $clone = '';
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/edit.gif' title='" . _AM_PUBLISHER_REJECTED_EDIT . "' alt='" . _AM_PUBLISHER_REJECTED_EDIT . "' /></a>&nbsp;";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
+                $modify = "<a href='item.php?op=mod&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/edit.gif' title='"._AM_PUBLISHER_REJECTED_EDIT."' alt='"._AM_PUBLISHER_REJECTED_EDIT."' /></a>&nbsp;";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."' /></a>";
                 break;
         }
 
         echo "<tr>";
-        echo "<td class='head' align='center'>" . $itemsObj[$i]->getVar('itemid'). "</td>";
-        echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . "</td>";
-        echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . "</td>";
-        echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . "</td>";
-        echo "<td class='even' align='center'>" . $statustxt . "</td>";
-        echo "<td class='even' align='center'> " . $approve . $clone . $modify . $delete . "</td>";
+        echo "<td class='head' align='center'>".$itemsObj[$i]->getVar('itemid')."</td>";
+        echo "<td class='even' align='left'>".$categoryObj->getCategoryLink()."</td>";
+        echo "<td class='even' align='left'>".$itemsObj[$i]->getItemLink()."</td>";
+        echo "<td class='even' align='center'>".$itemsObj[$i]->datesub()."</td>";
+        echo "<td class='even' align='center'>".$statustxt."</td>";
+        echo "<td class='even' align='center'> ".$approve.$clone.$modify.$delete."</td>";
         echo "</tr>";
     }
 } else {
     // that is, $numrows = 0, there's no entries yet
     echo "<tr>";
-    echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMSSEL . "</td>";
+    echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMSSEL."</td>";
     echo "</tr>";
 }
 echo "</table>\n";
@@ -293,9 +293,9 @@ 
 $pagenav = new XoopsPageNav($numrows, $publisher->getConfig('idxcat_perpage'), $startentry, 'startentry', "statussel=$statussel&amp;sortsel=$sortsel&amp;ordersel=$ordersel");
 
 if ($publisher->getConfig('format_image_nav') == 1) {
-    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">' . $pagenav->renderImageNav() . '</div>';
+    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">'.$pagenav->renderImageNav().'</div>';
 } else {
-    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">' . $pagenav->renderNav() . '</div>';
+    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">'.$pagenav->renderNav().'</div>';
 }
 // ENDs code to show active entries
 PublisherUtils::closeCollapsableBar('allitemstable', 'allitemsicon');
@@ -322,8 +322,8 @@ 
         $res = PublisherUtils::mkdir($thePath);
 
         if ($res) {
-            $source = PUBLISHER_ROOT_PATH . "/images/blank.png";
-            $dest = $thePath . "blank.png";
+            $source = PUBLISHER_ROOT_PATH."/images/blank.png";
+            $dest = $thePath."blank.png";
             PublisherUtils::copyr($source, $dest);
         }
         $msg = $res ? _AM_PUBLISHER_DIRCREATED : _AM_PUBLISHER_DIRNOTCREATED;
@@ -334,8 +334,8 @@ 
         $res = PublisherUtils::mkdir($thePath);
 
         if ($res) {
-            $source = PUBLISHER_ROOT_PATH . '/images/blank.png';
-            $dest = $thePath . 'blank.png';
+            $source = PUBLISHER_ROOT_PATH.'/images/blank.png';
+            $dest = $thePath.'blank.png';
             PublisherUtils::copyr($source, $dest);
         }
         $msg = $res ? _AM_PUBLISHER_DIRCREATED : _AM_PUBLISHER_DIRNOTCREATED;
@@ -346,8 +346,8 @@ 
         $res = PublisherUtils::mkdir($thePath);
 
         if ($res) {
-            $source = PUBLISHER_ROOT_PATH . '/images/blank.png';
-            $dest = $thePath . 'blank.png';
+            $source = PUBLISHER_ROOT_PATH.'/images/blank.png';
+            $dest = $thePath.'blank.png';
             PublisherUtils::copyr($source, $dest);
         }
         $msg = $res ? _AM_PUBLISHER_DIRCREATED : _AM_PUBLISHER_DIRNOTCREATED;
@@ -364,11 +364,11 @@ 
 {
     echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
     echo "<tr>";
-    echo "<td width='40px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-    echo "<td width='100px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMCAT . "</strong></td>";
-    echo "<td class='bg3' align='center'><strong>" . _AM_PUBLISHER_TITLE . "</strong></td>";
-    echo "<td width='90px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-    echo "<td width='90px' class='bg3' align='center'><strong>" . _CO_PUBLISHER_STATUS . "</strong></td>";
-    echo "<td width='90px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
+    echo "<td width='40px' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMID."</strong></td>";
+    echo "<td width='100px' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMCAT."</strong></td>";
+    echo "<td class='bg3' align='center'><strong>"._AM_PUBLISHER_TITLE."</strong></td>";
+    echo "<td width='90px' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED."</strong></td>";
+    echo "<td width='90px' class='bg3' align='center'><strong>"._CO_PUBLISHER_STATUS."</strong></td>";
+    echo "<td width='90px' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION."</strong></td>";
     echo "</tr>";
 }

htdocs/modules/publisher/admin/pw_upload_file.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  * @version         $Id$
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 $errors = array();
@@ -46,7 +46,7 @@ 
         mkdir(PublisherUtils::getUploadDir(true, 'content'), 0757);
     }
     $allowed_mimetypes = array('text/html', 'text/plain', 'application/xhtml+xml');
-    $uploader = new XoopsMediaUploader(PublisherUtils::getUploadDir(true, 'content') . '/', $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
+    $uploader = new XoopsMediaUploader(PublisherUtils::getUploadDir(true, 'content').'/', $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
     if ($uploader->fetchMedia($post_field)) {
         $uploader->setTargetFileName($uploader->getMediaName());
         if ($uploader->upload()) {

htdocs/modules/publisher/admin/pagewrap.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
  * @version         $Id$
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 PublisherUtils::cpHeader();
@@ -30,15 +30,15 @@ 
 $dir = PublisherUtils::getUploadDir(true, 'content');
 
 if (!preg_match('/777/i', decoct(fileperms($dir)))) {
-    echo "<font color='FF0000'><h4>" . _AM_PUBLISHER_PERMERROR . "</h4></font>";
+    echo "<font color='FF0000'><h4>"._AM_PUBLISHER_PERMERROR."</h4></font>";
 }
 
 // Upload File
 echo "<form name='form_name2' id='form_name2' action='pw_upload_file.php' method='post' enctype='multipart/form-data'>";
 echo "<table cellspacing='1' width='100%' class='outer'>";
-echo "<tr><th colspan='2'>" . _AM_PUBLISHER_UPLOAD_FILE . "</th></tr>";
-echo "<tr valign='top' align='left'><td class='head'>" . _AM_PUBLISHER_SEARCH . "</td><td class='even'><input type='file' name='fileupload' id='fileupload' size='30' /></td></tr>";
-echo "<tr valign='top' align='left'><td class='head'><input type='hidden' name='MAX_FILE_SIZE' id='op' value='500000' /></td><td class='even'><input type='submit' name='submit' value='" . _AM_PUBLISHER_UPLOAD . "' /></td></tr>";
+echo "<tr><th colspan='2'>"._AM_PUBLISHER_UPLOAD_FILE."</th></tr>";
+echo "<tr valign='top' align='left'><td class='head'>"._AM_PUBLISHER_SEARCH."</td><td class='even'><input type='file' name='fileupload' id='fileupload' size='30' /></td></tr>";
+echo "<tr valign='top' align='left'><td class='head'><input type='hidden' name='MAX_FILE_SIZE' id='op' value='500000' /></td><td class='even'><input type='submit' name='submit' value='"._AM_PUBLISHER_UPLOAD."' /></td></tr>";
 echo "</table>";
 echo "</form>";
 

htdocs/modules/publisher/admin/item.php

Spacing +66 added lines, -66 removed lines

@@ -21,7 +21,7 @@ 
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 
@@ -127,7 +127,7 @@ 
 
         // Storing the item
         if (!$itemObj->store()) {
-            $xoops->redirect("javascript:history.go(-1)", 3, $error_msg . PublisherUtils::formatErrors($itemObj->getErrors()));
+            $xoops->redirect("javascript:history.go(-1)", 3, $error_msg.PublisherUtils::formatErrors($itemObj->getErrors()));
         }
 
         // attach file if any
@@ -153,7 +153,7 @@ 
 
         if ($confirm) {
             if (!$publisher->getItemHandler()->delete($itemObj)) {
-                $xoops->redirect("item.php", 2, _AM_PUBLISHER_ITEM_DELETE_ERROR . PublisherUtils::formatErrors($itemObj->getErrors()));
+                $xoops->redirect("item.php", 2, _AM_PUBLISHER_ITEM_DELETE_ERROR.PublisherUtils::formatErrors($itemObj->getErrors()));
                 exit();
             }
             $xoops->redirect("item.php", 2, sprintf(_AM_PUBLISHER_ITEMISDELETED, $itemObj->title()));
@@ -161,7 +161,7 @@ 
             $xoops->header();
             echo $xoops->confirm(array(
                 'op' => 'del', 'itemid' => $itemObj->getVar('itemid'), 'confirm' => 1, 'name' => $itemObj->title()
-            ), 'item.php', _AM_PUBLISHER_DELETETHISITEM . " <br />'" . $itemObj->title() . "'. <br /> <br />", _AM_PUBLISHER_DELETE);
+            ), 'item.php', _AM_PUBLISHER_DELETETHISITEM." <br />'".$itemObj->title()."'. <br /> <br />", _AM_PUBLISHER_DELETE);
             $xoops->footer();
         }
         exit();
@@ -174,7 +174,7 @@ 
 
         echo "<br />\n";
         echo "<form><div style=\"margin-bottom: 12px;\">";
-        echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
+        echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='"._AM_PUBLISHER_CREATEITEM."'>&nbsp;&nbsp;";
         echo "</div></form>";
 
         $orderBy = 'datesub';
@@ -193,40 +193,40 @@ 
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo "<tr>";
-        echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-        echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>";
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . "</strong></td>";
-        echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-        echo "<td width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
+        echo "<td width='40' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMID."</strong></td>";
+        echo "<td width='20%' class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMCATEGORYNAME."</strong></td>";
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_TITLE."</strong></td>";
+        echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED."</strong></td>";
+        echo "<td width='80' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION."</strong></td>";
         echo "</tr>";
         if ($totalitems > 0) {
             for ($i = 0; $i < $totalItemsOnPage; ++$i) {
                 $categoryObj = $itemsObj[$i]->category();
 
-                $approve = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/approve.gif' title='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' alt='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' /></a>&nbsp;";
+                $approve = "<a href='item.php?op=mod&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/approve.gif' title='"._AM_PUBLISHER_SUBMISSION_MODERATE."' alt='"._AM_PUBLISHER_SUBMISSION_MODERATE."' /></a>&nbsp;";
                 $clone = '';
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."' /></a>";
                 $modify = "";
 
                 echo "<tr>";
-                echo "<td class='head' align='center'>" . $itemsObj[$i]->getVar('itemid') . "</td>";
-                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . "</td>";
-                echo "<td class='even' align='left'><a href='" . PUBLISHER_URL . "/item.php?itemid=" . $itemsObj[$i]->getVar('itemid') . "'>" . $itemsObj[$i]->title() . "</a></td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . "</td>";
+                echo "<td class='head' align='center'>".$itemsObj[$i]->getVar('itemid')."</td>";
+                echo "<td class='even' align='left'>".$categoryObj->getCategoryLink()."</td>";
+                echo "<td class='even' align='left'><a href='".PUBLISHER_URL."/item.php?itemid=".$itemsObj[$i]->getVar('itemid')."'>".$itemsObj[$i]->title()."</a></td>";
+                echo "<td class='even' align='center'>".$itemsObj[$i]->datesub()."</td>";
                 echo "<td class='even' align='center'> $approve $clone $modify $delete </td>";
                 echo "</tr>";
             }
         } else {
             $itemid = 0;
             echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_SUBMITTED . "</td>";
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS_SUBMITTED."</td>";
             echo "</tr>";
         }
         echo "</table>\n";
         echo "<br />\n";
 
         $pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $submittedstartitem, 'submittedstartitem');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 
         PublisherUtils::closeCollapsableBar('submiteditemstable', 'submiteditemsicon');
 
@@ -243,44 +243,44 @@ 
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo "<tr>";
-        echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-        echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>";
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . "</strong></td>";
-        echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-        echo "<td width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
+        echo "<td width='40' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMID."</strong></td>";
+        echo "<td width='20%' class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMCATEGORYNAME."</strong></td>";
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_TITLE."</strong></td>";
+        echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED."</strong></td>";
+        echo "<td width='80' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION."</strong></td>";
         echo "</tr>";
         if ($totalitems > 0) {
             for ($i = 0; $i < $totalItemsOnPage; ++$i) {
                 $categoryObj = $itemsObj[$i]->category();
 
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
-                $clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>";
+                $modify = "<a href='item.php?op=mod&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/edit.gif' title='"._AM_PUBLISHER_EDITITEM."' alt='"._AM_PUBLISHER_EDITITEM."' /></a>";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."'/></a>";
+                $clone = "<a href='item.php?op=clone&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/clone.gif' title='"._AM_PUBLISHER_CLONE_ITEM."' alt='"._AM_PUBLISHER_CLONE_ITEM."' /></a>";
 
                 echo "<tr>";
-                echo "<td class='head' align='center'>" . $itemsObj[$i]->getVar('itemid') . "</td>";
-                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . "</td>";
-                echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . "</td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . "</td>";
+                echo "<td class='head' align='center'>".$itemsObj[$i]->getVar('itemid')."</td>";
+                echo "<td class='even' align='left'>".$categoryObj->getCategoryLink()."</td>";
+                echo "<td class='even' align='left'>".$itemsObj[$i]->getItemLink()."</td>";
+                echo "<td class='even' align='center'>".$itemsObj[$i]->datesub()."</td>";
                 echo "<td class='even' align='center'> $clone $modify $delete </td>";
                 echo "</tr>";
             }
         } else {
             $itemid = 0;
             echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . "</td>";
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS."</td>";
             echo "</tr>";
         }
         echo "</table>\n";
         echo "<br />\n";
 
         $pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $publishedstartitem, 'publishedstartitem');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 
         PublisherUtils::closeCollapsableBar('item_publisheditemstable', 'item_publisheditemsicon');
 
         // Display Offline articles
-        PublisherUtils::openCollapsableBar('offlineitemstable', 'offlineitemsicon', _AM_PUBLISHER_ITEMS . " " . _CO_PUBLISHER_OFFLINE, _AM_PUBLISHER_OFFLINE_EXP);
+        PublisherUtils::openCollapsableBar('offlineitemstable', 'offlineitemsicon', _AM_PUBLISHER_ITEMS." "._CO_PUBLISHER_OFFLINE, _AM_PUBLISHER_OFFLINE_EXP);
 
         $totalitems = $publisher->getItemHandler()->getItemsCount(-1, array(_PUBLISHER_STATUS_OFFLINE));
 
@@ -291,39 +291,39 @@ 
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo "<tr>";
-        echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-        echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>";
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . "</strong></td>";
-        echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-        echo "<td width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
+        echo "<td width='40' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMID."</strong></td>";
+        echo "<td width='20%' class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMCATEGORYNAME."</strong></td>";
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_TITLE."</strong></td>";
+        echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED."</strong></td>";
+        echo "<td width='80' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION."</strong></td>";
         echo "</tr>";
         if ($totalitems > 0) {
             for ($i = 0; $i < $totalItemsOnPage; ++$i) {
                 $categoryObj = $itemsObj[$i]->category();
 
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
-                $clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>";
+                $modify = "<a href='item.php?op=mod&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/edit.gif' title='"._AM_PUBLISHER_EDITITEM."' alt='"._AM_PUBLISHER_EDITITEM."' /></a>";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."'/></a>";
+                $clone = "<a href='item.php?op=clone&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/clone.gif' title='"._AM_PUBLISHER_CLONE_ITEM."' alt='"._AM_PUBLISHER_CLONE_ITEM."' /></a>";
 
                 echo "<tr>";
-                echo "<td class='head' align='center'>" . $itemsObj[$i]->getVar('itemid') . "</td>";
-                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . "</td>";
-                echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . "</td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . "</td>";
+                echo "<td class='head' align='center'>".$itemsObj[$i]->getVar('itemid')."</td>";
+                echo "<td class='even' align='left'>".$categoryObj->getCategoryLink()."</td>";
+                echo "<td class='even' align='left'>".$itemsObj[$i]->getItemLink()."</td>";
+                echo "<td class='even' align='center'>".$itemsObj[$i]->datesub()."</td>";
                 echo "<td class='even' align='center'> $clone $modify $delete </td>";
                 echo "</tr>";
             }
         } else {
             $itemid = 0;
             echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_OFFLINE . "</td>";
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS_OFFLINE."</td>";
             echo "</tr>";
         }
         echo "</table>\n";
         echo "<br />\n";
 
         $pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $offlinestartitem, 'offlinestartitem');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 
         PublisherUtils::closeCollapsableBar('offlineitemstable', 'offlineitemsicon');
 
@@ -340,39 +340,39 @@ 
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo "<tr>";
-        echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-        echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>";
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . "</strong></td>";
-        echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-        echo "<td width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
+        echo "<td width='40' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMID."</strong></td>";
+        echo "<td width='20%' class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMCATEGORYNAME."</strong></td>";
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_TITLE."</strong></td>";
+        echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED."</strong></td>";
+        echo "<td width='80' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION."</strong></td>";
         echo "</tr>";
         if ($totalitems > 0) {
             for ($i = 0; $i < $totalItemsOnPage; ++$i) {
                 $categoryObj = $itemsObj[$i]->category();
 
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
-                $clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>";
+                $modify = "<a href='item.php?op=mod&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/edit.gif' title='"._AM_PUBLISHER_EDITITEM."' alt='"._AM_PUBLISHER_EDITITEM."' /></a>";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."'/></a>";
+                $clone = "<a href='item.php?op=clone&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/clone.gif' title='"._AM_PUBLISHER_CLONE_ITEM."' alt='"._AM_PUBLISHER_CLONE_ITEM."' /></a>";
 
                 echo "<tr>";
-                echo "<td class='head' align='center'>" . $itemsObj[$i]->getVar('itemid') . "</td>";
-                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . "</td>";
-                echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . "</td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . "</td>";
+                echo "<td class='head' align='center'>".$itemsObj[$i]->getVar('itemid')."</td>";
+                echo "<td class='even' align='left'>".$categoryObj->getCategoryLink()."</td>";
+                echo "<td class='even' align='left'>".$itemsObj[$i]->getItemLink()."</td>";
+                echo "<td class='even' align='center'>".$itemsObj[$i]->datesub()."</td>";
                 echo "<td class='even' align='center'> $clone $modify $delete </td>";
                 echo "</tr>";
             }
         } else {
             $itemid = 0;
             echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_REJECTED . "</td>";
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS_REJECTED."</td>";
             echo "</tr>";
         }
         echo "</table>\n";
         echo "<br />\n";
 
         $pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $rejectedstartitem, 'rejectedstartitem');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 
         PublisherUtils::closeCollapsableBar('Rejecteditemstable', 'rejecteditemsicon');
         break;
@@ -446,7 +446,7 @@ 
 
         if (!$clone) {
             echo "<form><div style=\"margin-bottom: 10px;\">";
-            echo "<input type='button' name='button' onclick=\"location='item.php?op=clone&itemid=" . $itemObj->getVar('itemid') . "'\" value='" . _AM_PUBLISHER_CLONE_ITEM . "'>&nbsp;&nbsp;";
+            echo "<input type='button' name='button' onclick=\"location='item.php?op=clone&itemid=".$itemObj->getVar('itemid')."'\" value='"._AM_PUBLISHER_CLONE_ITEM."'>&nbsp;&nbsp;";
             echo "</div></form>";
         }
     } else {
@@ -476,15 +476,15 @@ 
     $dir = PublisherUtils::getUploadDir(true, 'content');
 
     if (!preg_match('/777/i', decoct(fileperms($dir)))) {
-        echo "<font color='FF0000'><h4>" . _AM_PUBLISHER_PERMERROR . "</h4></font>";
+        echo "<font color='FF0000'><h4>"._AM_PUBLISHER_PERMERROR."</h4></font>";
     }
 
     // Upload File
     echo "<form name='form_name2' id='form_name2' action='pw_upload_file.php' method='post' enctype='multipart/form-data'>";
     echo "<table cellspacing='1' width='100%' class='outer'>";
-    echo "<tr><th colspan='2'>" . _AM_PUBLISHER_UPLOAD_FILE . "</th></tr>";
-    echo "<tr valign='top' align='left'><td class='head'>" . _AM_PUBLISHER_SEARCH_PW . "</td><td class='even'><input type='file' name='fileupload' id='fileupload' size='30' /></td></tr>";
-    echo "<tr valign='top' align='left'><td class='head'><input type='hidden' name='MAX_FILE_SIZE' id='op' value='500000' /></td><td class='even'><input type='submit' name='submit' value='" . _AM_PUBLISHER_UPLOAD . "' /></td></tr>";
+    echo "<tr><th colspan='2'>"._AM_PUBLISHER_UPLOAD_FILE."</th></tr>";
+    echo "<tr valign='top' align='left'><td class='head'>"._AM_PUBLISHER_SEARCH_PW."</td><td class='even'><input type='file' name='fileupload' id='fileupload' size='30' /></td></tr>";
+    echo "<tr valign='top' align='left'><td class='head'><input type='hidden' name='MAX_FILE_SIZE' id='op' value='500000' /></td><td class='even'><input type='submit' name='submit' value='"._AM_PUBLISHER_UPLOAD."' /></td></tr>";
     echo "<input type='hidden' name='backto' value='$publisher_current_page'/>";
     echo "</table>";
     echo "</form>";

htdocs/modules/publisher/admin/category.php

Spacing +40 added lines, -40 removed lines

@@ -21,7 +21,7 @@ 
  * @version         $Id$
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 $op = Request::getCmd('op');
@@ -49,7 +49,7 @@ 
             $xoops->redirect("category.php", 1, sprintf(_AM_PUBLISHER_COLISDELETED, $name));
         } else {
             $xoops->header();
-            echo $xoops->confirm(array('op' => 'del', 'categoryid' => $categoryObj->getVar('categoryid'), 'confirm' => 1, 'name' => $categoryObj->getVar('name')), 'category.php', _AM_PUBLISHER_DELETECOL . " '" . $categoryObj->getVar('name') . "'. <br /> <br />" . _AM_PUBLISHER_DELETE_CAT_CONFIRM, _AM_PUBLISHER_DELETE);
+            echo $xoops->confirm(array('op' => 'del', 'categoryid' => $categoryObj->getVar('categoryid'), 'confirm' => 1, 'name' => $categoryObj->getVar('name')), 'category.php', _AM_PUBLISHER_DELETECOL." '".$categoryObj->getVar('name')."'. <br /> <br />"._AM_PUBLISHER_DELETE_CAT_CONFIRM, _AM_PUBLISHER_DELETE);
             $xoops->footer();
         }
         break;
@@ -94,7 +94,7 @@ 
                 if ($uploader->fetchMedia($filename) && $uploader->upload()) {
                     $categoryObj->setVar('image', $uploader->getSavedFileName());
                 } else {
-                    $xoops->redirect('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR . $uploader->getErrors());
+                    $xoops->redirect('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR.$uploader->getErrors());
                 }
             }
         } else {
@@ -145,7 +145,7 @@ 
         }
 
         if (!$categoryObj->store()) {
-            $xoops->redirect("javascript:history.go(-1)", 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . PublisherUtils::formatErrors($categoryObj->getErrors()));
+            $xoops->redirect("javascript:history.go(-1)", 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR.PublisherUtils::formatErrors($categoryObj->getErrors()));
         }
         // TODO : put this function in the category class
         PublisherUtils::saveCategoryPermissions($grpread, $categoryObj->getVar('categoryid'), 'category_read');
@@ -163,7 +163,7 @@ 
                 $categoryObj->setVar('parentid', $parentCat);
 
                 if (!$categoryObj->store()) {
-                    $xoops->redirect("javascript:history.go(-1)", 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . PublisherUtils::formatErrors($categoryObj->getErrors()));
+                    $xoops->redirect("javascript:history.go(-1)", 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR.PublisherUtils::formatErrors($categoryObj->getErrors()));
                 }
                 // TODO : put this function in the category class
                 PublisherUtils::saveCategoryPermissions($grpread, $categoryObj->getVar('categoryid'), 'category_read');
@@ -206,7 +206,7 @@ 
 
         echo "<br />\n";
         echo "<form><div style=\"margin-bottom: 12px;\">";
-        echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='" . _AM_PUBLISHER_CATEGORY_CREATE . "'>&nbsp;&nbsp;";
+        echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='"._AM_PUBLISHER_CATEGORY_CREATE."'>&nbsp;&nbsp;";
         //echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
         echo "</div></form>";
 
@@ -217,9 +217,9 @@ 
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo "<tr>";
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>";
-        echo "<td width='60' class='bg3' width='65' align='center'><strong>" . _CO_PUBLISHER_WEIGHT . "</strong></td>";
-        echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMCATEGORYNAME."</strong></td>";
+        echo "<td width='60' class='bg3' width='65' align='center'><strong>"._CO_PUBLISHER_WEIGHT."</strong></td>";
+        echo "<td width='60' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION."</strong></td>";
         echo "</tr>";
         $totalCategories = $publisher->getCategoryHandler()->getCategoriesCount(0);
         if (count($categoriesObj) > 0) {
@@ -228,13 +228,13 @@ 
             }
         } else {
             echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOCAT . "</td>";
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOCAT."</td>";
             echo "</tr>";
             $categoryid = '0';
         }
         echo "</table>\n";
         $pagenav = new XoopsPageNav($totalCategories, $publisher->getConfig('idxcat_perpage'), $startcategory, 'startcategory');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
         echo "<br />";
         PublisherUtils::closeCollapsableBar('createdcategories', 'createdcategoriesicon');
         echo "<br>";
@@ -251,11 +251,11 @@ 
     $description = $categoryObj->getVar('description');
     if (!XoopsLocale::isMultiByte()) {
         if (strlen($description) >= 100) {
-            $description = substr($description, 0, (100 - 1)) . "...";
+            $description = substr($description, 0, (100 - 1))."...";
         }
     }
-    $modify = "<a href='category.php?op=mod&amp;categoryid=" . $categoryObj->getVar('categoryid') . "&amp;parentid=" . $categoryObj->getVar('parentid') . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITCOL . "' alt='" . _AM_PUBLISHER_EDITCOL . "' /></a>";
-    $delete = "<a href='category.php?op=del&amp;categoryid=" . $categoryObj->getVar('categoryid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETECOL . "' alt='" . _AM_PUBLISHER_DELETECOL . "' /></a>";
+    $modify = "<a href='category.php?op=mod&amp;categoryid=".$categoryObj->getVar('categoryid')."&amp;parentid=".$categoryObj->getVar('parentid')."'><img src='".PUBLISHER_URL."/images/links/edit.gif' title='"._AM_PUBLISHER_EDITCOL."' alt='"._AM_PUBLISHER_EDITCOL."' /></a>";
+    $delete = "<a href='category.php?op=del&amp;categoryid=".$categoryObj->getVar('categoryid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETECOL."' alt='"._AM_PUBLISHER_DELETECOL."' /></a>";
 
     $spaces = '';
     for ($j = 0; $j < $level; ++$j) {
@@ -263,8 +263,8 @@ 
     }
 
     echo "<tr>";
-    echo "<td class='even' align='left'>" . $spaces . "<a href='" . PUBLISHER_URL . "/category.php?categoryid=" . $categoryObj->getVar('categoryid') . "'><img src='" . PUBLISHER_URL . "/images/links/subcat.gif' alt='' />&nbsp;" . $categoryObj->getVar('name') . "</a></td>";
-    echo "<td class='even' align='center'>" . $categoryObj->getVar('weight') . "</td>";
+    echo "<td class='even' align='left'>".$spaces."<a href='".PUBLISHER_URL."/category.php?categoryid=".$categoryObj->getVar('categoryid')."'><img src='".PUBLISHER_URL."/images/links/subcat.gif' alt='' />&nbsp;".$categoryObj->getVar('name')."</a></td>";
+    echo "<td class='even' align='center'>".$categoryObj->getVar('weight')."</td>";
     echo "<td class='even' align='center'> $modify $delete </td>";
     echo "</tr>";
     $subCategoriesObj = $publisher->getCategoryHandler()->getCategories(0, 0, $categoryObj->getVar('categoryid'));
@@ -333,26 +333,26 @@ 
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo "<tr>";
-        echo "<td width='60' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATID . "</strong></td>";
-        echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATCOLNAME . "</strong></td>";
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_SUBDESCRIPT . "</strong></td>";
-        echo "<td width='60' class='bg3' align='right'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
+        echo "<td width='60' class='bg3' align='left'><strong>"._AM_PUBLISHER_CATID."</strong></td>";
+        echo "<td width='20%' class='bg3' align='left'><strong>"._AM_PUBLISHER_CATCOLNAME."</strong></td>";
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_SUBDESCRIPT."</strong></td>";
+        echo "<td width='60' class='bg3' align='right'><strong>"._AM_PUBLISHER_ACTION."</strong></td>";
         echo "</tr>";
         if ($totalsubs > 0) {
             /* @var $subcat PublisherCategory */
             foreach ($subcatsObj as $subcat) {
-                $modify = "<a href='category.php?op=mod&amp;categoryid=" . $subcat->getVar('categoryid') . "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/edit.gif' title='" . _AM_PUBLISHER_MODIFY . "' alt='" . _AM_PUBLISHER_MODIFY . "' /></a>";
-                $delete = "<a href='category.php?op=del&amp;categoryid=" . $subcat->getVar('categoryid') . "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETE . "' alt='" . _AM_PUBLISHER_DELETE . "' /></a>";
+                $modify = "<a href='category.php?op=mod&amp;categoryid=".$subcat->getVar('categoryid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/edit.gif' title='"._AM_PUBLISHER_MODIFY."' alt='"._AM_PUBLISHER_MODIFY."' /></a>";
+                $delete = "<a href='category.php?op=del&amp;categoryid=".$subcat->getVar('categoryid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/delete.png' title='"._AM_PUBLISHER_DELETE."' alt='"._AM_PUBLISHER_DELETE."' /></a>";
                 echo "<tr>";
-                echo "<td class='head' align='left'>" . $subcat->getVar('categoryid') . "</td>";
-                echo "<td class='even' align='left'><a href='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/category.php?categoryid=" . $subcat->getVar('categoryid') . "&amp;parentid=" . $subcat->getVar('parentid'). "'>" . $subcat->getVar('name') . "</a></td>";
-                echo "<td class='even' align='left'>" . $subcat->getVar('description') . "</td>";
+                echo "<td class='head' align='left'>".$subcat->getVar('categoryid')."</td>";
+                echo "<td class='even' align='left'><a href='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/category.php?categoryid=".$subcat->getVar('categoryid')."&amp;parentid=".$subcat->getVar('parentid')."'>".$subcat->getVar('name')."</a></td>";
+                echo "<td class='even' align='left'>".$subcat->getVar('description')."</td>";
                 echo "<td class='even' align='right'> {$modify} {$delete} </td>";
                 echo "</tr>";
             }
         } else {
             echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOSUBCAT . "</td>";
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOSUBCAT."</td>";
             echo "</tr>";
         }
         echo "</table>\n";
@@ -369,28 +369,28 @@ 
         $allcats = $publisher->getCategoryHandler()->getObjects(null, true);
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo "<tr>";
-        echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-        echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCOLNAME . "</strong></td>";
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMDESC . "</strong></td>";
-        echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-        echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
+        echo "<td width='40' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMID."</strong></td>";
+        echo "<td width='20%' class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMCOLNAME."</strong></td>";
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMDESC."</strong></td>";
+        echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED."</strong></td>";
+        echo "<td width='60' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION."</strong></td>";
         echo "</tr>";
         if ($totalitems > 0) {
             for ($i = 0; $i < $totalitemsOnPage; ++$i) {
                 $categoryObj = $allcats[$itemsObj[$i]->getVar('categoryid')];
-                $modify = "<a href='item.php?op=mod&amp;itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
-                $delete = "<a href='item.php?op=del&amp;itemid=" . $itemsObj[$i]->getVar('itemid'). "'><img src='" . \XoopsBaseConfig::get('url') . "/modules/" . $publisher->getModule()->dirname() . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
+                $modify = "<a href='item.php?op=mod&amp;itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/edit.gif' title='"._AM_PUBLISHER_EDITITEM."' alt='"._AM_PUBLISHER_EDITITEM."' /></a>";
+                $delete = "<a href='item.php?op=del&amp;itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".\XoopsBaseConfig::get('url')."/modules/".$publisher->getModule()->dirname()."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."'/></a>";
                 echo "<tr>";
-                echo "<td class='head' align='center'>" . $itemsObj[$i]->getVar('itemid'). "</td>";
-                echo "<td class='even' align='left'>" . $categoryObj->getVar('name') . "</td>";
-                echo "<td class='even' align='left'>" . $itemsObj[$i]->getitemLink() . "</td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub('s') . "</td>";
+                echo "<td class='head' align='center'>".$itemsObj[$i]->getVar('itemid')."</td>";
+                echo "<td class='even' align='left'>".$categoryObj->getVar('name')."</td>";
+                echo "<td class='even' align='left'>".$itemsObj[$i]->getitemLink()."</td>";
+                echo "<td class='even' align='center'>".$itemsObj[$i]->datesub('s')."</td>";
                 echo "<td class='even' align='center'> $modify $delete </td>";
                 echo "</tr>";
             }
         } else {
             echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . "</td>";
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS."</td>";
             echo "</tr>";
         }
         echo "</table>\n";
@@ -398,8 +398,8 @@ 
         $parentid = Request::getInt('parentid');
         $pagenav_extra_args = "op=mod&categoryid=$sel_cat&parentid=$parentid";
         $pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $startitem, 'startitem', $pagenav_extra_args);
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
-        echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=" . $sel_cat . "'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
+        echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=".$sel_cat."'\" value='"._AM_PUBLISHER_CREATEITEM."'>&nbsp;&nbsp;";
         echo "</div>";
     }
     //end of fx2024 code

htdocs/modules/publisher/admin/menu.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/include/common.php';
+include_once dirname(__DIR__).'/include/common.php';
 
 $publisher = Publisher::getInstance();
 $publisher->loadLanguage('admin');

htdocs/modules/publisher/admin/import.php

Switch Indentation +66 added lines, -66 removed lines

@@ -33,27 +33,27 @@ 
 
 switch ($op) {
 
-    case "importExecute":
+        case "importExecute":
 
-        $importfile = (isset($_POST['importfile'])) ? $_POST['importfile'] : 'nonselected';
-        $importfile_path = \XoopsBaseConfig::get('root-path') . "/modules/" . $publisher->getModule()->dirname() . "/admin/import/" . $importfile . ".php";
-        include_once $importfile_path;
-        break;
+            $importfile = (isset($_POST['importfile'])) ? $_POST['importfile'] : 'nonselected';
+            $importfile_path = \XoopsBaseConfig::get('root-path') . "/modules/" . $publisher->getModule()->dirname() . "/admin/import/" . $importfile . ".php";
+            include_once $importfile_path;
+            break;
 
-    case "default":
-    default:
+        case "default":
+        default:
 
-        $importfile = 'none';
+            $importfile = 'none';
 
-        PublisherUtils::cpHeader();
-        //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
+            PublisherUtils::cpHeader();
+            //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
 
-        PublisherUtils::openCollapsableBar('import', 'importicon', _AM_PUBLISHER_IMPORT_TITLE, _AM_PUBLISHER_IMPORT_INFO);
+            PublisherUtils::openCollapsableBar('import', 'importicon', _AM_PUBLISHER_IMPORT_TITLE, _AM_PUBLISHER_IMPORT_INFO);
 
-        $module_handler = $xoops->getHandlerModule();
+            $module_handler = $xoops->getHandlerModule();
 
-        // WF-Section
-        /*$wfs_version = 0;
+            // WF-Section
+            /*$wfs_version = 0;
         $moduleObj = $module_handler->getByDirname('wfsection');
         if ($moduleObj) {
         $from_module_version = round($moduleObj->getVar('version') / 100, 2);
@@ -63,30 +63,30 @@ 
         }
         } */
 
-        // News
-        $news_version = 0;
-        $moduleObj = $xoops->getModuleByDirname('news');
-        if ($moduleObj) {
-            $from_module_version = round($moduleObj->getVar('version') / 100, 2);
-            if (($from_module_version >= 1.1)) {
-                $importfile_select_array["news"] = "News " . $from_module_version;
-                $news_version = $from_module_version;
+            // News
+            $news_version = 0;
+            $moduleObj = $xoops->getModuleByDirname('news');
+            if ($moduleObj) {
+                $from_module_version = round($moduleObj->getVar('version') / 100, 2);
+                if (($from_module_version >= 1.1)) {
+                    $importfile_select_array["news"] = "News " . $from_module_version;
+                    $news_version = $from_module_version;
+                }
             }
-        }
 
-        // Smartsection
-        $smartsection_version = 0;
-        $moduleObj = $xoops->getModuleByDirname('smartsection');
-        if ($moduleObj) {
-            $from_module_version = round($moduleObj->getVar('version') / 100, 2);
-            if (($from_module_version >= 1.1)) {
-                $importfile_select_array["smartsection"] = "Smartsection " . $from_module_version;
-                $smartsection_version = $from_module_version;
+            // Smartsection
+            $smartsection_version = 0;
+            $moduleObj = $xoops->getModuleByDirname('smartsection');
+            if ($moduleObj) {
+                $from_module_version = round($moduleObj->getVar('version') / 100, 2);
+                if (($from_module_version >= 1.1)) {
+                    $importfile_select_array["smartsection"] = "Smartsection " . $from_module_version;
+                    $smartsection_version = $from_module_version;
+                }
             }
-        }
 
-        //  XF-Section
-        /*$xfs_version = 0;
+            //  XF-Section
+            /*$xfs_version = 0;
         $moduleObj = $module_handler->getByDirname('xfsection');
         If ($moduleObj) {
         $from_module_version = round($moduleObj->getVar('version') / 100, 2);
@@ -97,48 +97,48 @@ 
         } */
 
 
-        if (isset($importfile_select_array) && count($importfile_select_array) > 0) {
+            if (isset($importfile_select_array) && count($importfile_select_array) > 0) {
 
-            $sform = new Xoops\Form\ThemeForm(_AM_PUBLISHER_IMPORT_SELECTION, "op", xoops_getenv('PHP_SELF'));
-            $sform->setExtra('enctype="multipart/form-data"');
+                $sform = new Xoops\Form\ThemeForm(_AM_PUBLISHER_IMPORT_SELECTION, "op", xoops_getenv('PHP_SELF'));
+                $sform->setExtra('enctype="multipart/form-data"');
 
-            // Partners to import
-            $importfile_select = new Xoops\Form\Select('', 'importfile', $importfile);
-            $importfile_select->addOptionArray($importfile_select_array);
-            $importfile_tray = new Xoops\Form\ElementTray(_AM_PUBLISHER_IMPORT_SELECT_FILE, ' ');
-            $importfile_tray->addElement($importfile_select);
-            $importfile_tray->setDescription(_AM_PUBLISHER_IMPORT_SELECT_FILE_DSC);
-            $sform->addElement($importfile_tray);
+                // Partners to import
+                $importfile_select = new Xoops\Form\Select('', 'importfile', $importfile);
+                $importfile_select->addOptionArray($importfile_select_array);
+                $importfile_tray = new Xoops\Form\ElementTray(_AM_PUBLISHER_IMPORT_SELECT_FILE, ' ');
+                $importfile_tray->addElement($importfile_select);
+                $importfile_tray->setDescription(_AM_PUBLISHER_IMPORT_SELECT_FILE_DSC);
+                $sform->addElement($importfile_tray);
 
-            // Buttons
-            $buttonTray = new Xoops\Form\ElementTray('', '');
-            $hidden = new Xoops\Form\Hidden('op', 'importExecute');
-            $buttonTray->addElement($hidden);
+                // Buttons
+                $buttonTray = new Xoops\Form\ElementTray('', '');
+                $hidden = new Xoops\Form\Hidden('op', 'importExecute');
+                $buttonTray->addElement($hidden);
 
-            $buttonImport = new Xoops\Form\Button('', '', _AM_PUBLISHER_IMPORT, 'submit');
-            $buttonImport->setExtra('onclick="this.form.elements.op.value=\'importExecute\'"');
-            $buttonTray->addElement($buttonImport);
+                $buttonImport = new Xoops\Form\Button('', '', _AM_PUBLISHER_IMPORT, 'submit');
+                $buttonImport->setExtra('onclick="this.form.elements.op.value=\'importExecute\'"');
+                $buttonTray->addElement($buttonImport);
 
-            $buttonCancel = new Xoops\Form\Button('', '', _AM_PUBLISHER_CANCEL, 'button');
-            $buttonCancel->setExtra('onclick="history.go(-1)"');
-            $buttonTray->addElement($buttonCancel);
+                $buttonCancel = new Xoops\Form\Button('', '', _AM_PUBLISHER_CANCEL, 'button');
+                $buttonCancel->setExtra('onclick="history.go(-1)"');
+                $buttonTray->addElement($buttonCancel);
 
-            $sform->addElement($buttonTray);
-            /*$sform->addElement(new Xoops\Form\Hidden('xfs_version', $xfs_version));
+                $sform->addElement($buttonTray);
+                /*$sform->addElement(new Xoops\Form\Hidden('xfs_version', $xfs_version));
              $sform->addElement(new Xoops\Form\Hidden('wfs_version', $wfs_version));*/
-            $sform->addElement(new Xoops\Form\Hidden('news_version', $news_version));
-            $sform->addElement(new Xoops\Form\Hidden('smartsection_version', $smartsection_version));
-            $sform->display();
-            unset($hidden);
-        } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_MODULE . "</span>";
-        }
+                $sform->addElement(new Xoops\Form\Hidden('news_version', $news_version));
+                $sform->addElement(new Xoops\Form\Hidden('smartsection_version', $smartsection_version));
+                $sform->display();
+                unset($hidden);
+            } else {
+                echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_MODULE . "</span>";
+            }
 
-        // End of collapsable bar
+            // End of collapsable bar
 
-        PublisherUtils::closeCollapsableBar('import', 'importicon');
+            PublisherUtils::closeCollapsableBar('import', 'importicon');
 
-        break;
+            break;
 }
 
 $xoops->footer();

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
  * @version         $Id$
  */
 
-include_once __DIR__ . "/admin_header.php";
+include_once __DIR__."/admin_header.php";
 $xoops = Xoops::getInstance();
 
 $op = 'none';
@@ -36,7 +36,7 @@ 
     case "importExecute":
 
         $importfile = (isset($_POST['importfile'])) ? $_POST['importfile'] : 'nonselected';
-        $importfile_path = \XoopsBaseConfig::get('root-path') . "/modules/" . $publisher->getModule()->dirname() . "/admin/import/" . $importfile . ".php";
+        $importfile_path = \XoopsBaseConfig::get('root-path')."/modules/".$publisher->getModule()->dirname()."/admin/import/".$importfile.".php";
         include_once $importfile_path;
         break;
 
@@ -69,7 +69,7 @@ 
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
             if (($from_module_version >= 1.1)) {
-                $importfile_select_array["news"] = "News " . $from_module_version;
+                $importfile_select_array["news"] = "News ".$from_module_version;
                 $news_version = $from_module_version;
             }
         }
@@ -80,7 +80,7 @@ 
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
             if (($from_module_version >= 1.1)) {
-                $importfile_select_array["smartsection"] = "Smartsection " . $from_module_version;
+                $importfile_select_array["smartsection"] = "Smartsection ".$from_module_version;
                 $smartsection_version = $from_module_version;
             }
         }
@@ -131,7 +131,7 @@ 
             $sform->display();
             unset($hidden);
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_MODULE . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">"._AM_PUBLISHER_IMPORT_NO_MODULE."</span>";
         }
 
         // End of collapsable bar

htdocs/modules/publisher/admin/permissions.php

Indentation +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
     _PUBLISHER_WEIGHT => _CO_PUBLISHER_WEIGHT,
     _PUBLISHER_ALLOWCOMMENTS => _CO_PUBLISHER_ALLOWCOMMENTS,
     //_PUBLISHER_PERMISSIONS_ITEM => _CO_PUBLISHER_PERMISSIONS_ITEM,
-   // _PUBLISHER_PARTIAL_VIEW => _CO_PUBLISHER_PARTIAL_VIEW,
+    // _PUBLISHER_PARTIAL_VIEW => _CO_PUBLISHER_PARTIAL_VIEW,
     _PUBLISHER_DOHTML => _CO_PUBLISHER_DOHTML,
     _PUBLISHER_DOSMILEY => _CO_PUBLISHER_DOSMILEY,
     _PUBLISHER_DOXCODE => _CO_PUBLISHER_DOXCODE,

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @version         $Id$
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 $myts = \Xoops\Core\Text\Sanitizer::getInstance();