XOOPS / XoopsCore

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();

htdocs/modules/publisher/admin/admin_header.php

Spacing +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@
  * @version         $Id$
  */
 
-include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+include_once dirname(dirname(dirname(__DIR__))).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $publisher = Publisher::getInstance();
 $publisher->loadLanguage('modinfo');
 
-XoopsLoad::loadFile($xoops->path(dirname(__DIR__) . '/include/common.php'));
-XoopsLoad::loadFile($xoops->path(XOOPS_ROOT_PATH . '/include/cp_header.php'));
+XoopsLoad::loadFile($xoops->path(dirname(__DIR__).'/include/common.php'));
+XoopsLoad::loadFile($xoops->path(XOOPS_ROOT_PATH.'/include/cp_header.php'));

htdocs/modules/publisher/admin/mimetypes.php

Indentation +4 added lines, -4 removed lines

@@ -35,10 +35,10 @@
 }
 
 $aSortBy = array('mime_id' => _AM_PUBLISHER_MIME_ID,
-                 'mime_name' => _AM_PUBLISHER_MIME_NAME,
-                 'mime_ext' => _AM_PUBLISHER_MIME_EXT,
-                 'mime_admin' => _AM_PUBLISHER_MIME_ADMIN,
-                 'mime_user' => _AM_PUBLISHER_MIME_USER);
+                    'mime_name' => _AM_PUBLISHER_MIME_NAME,
+                    'mime_ext' => _AM_PUBLISHER_MIME_EXT,
+                    'mime_admin' => _AM_PUBLISHER_MIME_ADMIN,
+                    'mime_user' => _AM_PUBLISHER_MIME_USER);
 $aOrderBy = array('ASC' => _AM_PUBLISHER_TEXT_ASCENDING, 'DESC' => _AM_PUBLISHER_TEXT_DESCENDING);
 $aLimitBy = array('10' => 10, '15' => 15, '20' => 20, '25' => 25, '50' => 50, '100' => 100);
 $aSearchBy = array('mime_id' => _AM_PUBLISHER_MIME_ID, 'mime_name' => _AM_PUBLISHER_MIME_NAME, 'mime_ext' => _AM_PUBLISHER_MIME_EXT);

Switch Indentation +32 added lines, -32 removed lines

@@ -50,38 +50,38 @@
 
 switch ($op)
 {
-    case "add":
-        add();
-        break;
-
-    case "delete":
-        delete();
-        break;
-
-    case "edit":
-        edit();
-        break;
-
-    case "search":
-        search();
-        break;
-
-    case "updateMimeValue":
-        updateMimeValue();
-        break;
-
-    case "clearAddSession":
-        clearAddSession();
-        break;
-
-    case "clearEditSession":
-        clearEditSession();
-        break;
-
-    case "manage":
-    default:
-        manage();
-        break;
+        case "add":
+            add();
+            break;
+
+        case "delete":
+            delete();
+            break;
+
+        case "edit":
+            edit();
+            break;
+
+        case "search":
+            search();
+            break;
+
+        case "updateMimeValue":
+            updateMimeValue();
+            break;
+
+        case "clearAddSession":
+            clearAddSession();
+            break;
+
+        case "clearEditSession":
+            clearEditSession();
+            break;
+
+        case "manage":
+        default:
+            manage();
+            break;
 }
 
 function add()

Spacing +127 added lines, -127 removed lines

@@ -22,7 +22,7 @@ 
  * @version         $Id$
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $start = $limit = 0;
 if (isset($_REQUEST['limit'])) {
@@ -102,7 +102,7 @@ 
 
         //Display any form errors
         if (!$mime_errors === false) {
-            PublisherUtils::renderErrors($mime_errors, PublisherUtils::makeURI(PUBLISHER_ADMIN_URL . 'mimetypes.php', array('op' => 'clearAddSession')));
+            PublisherUtils::renderErrors($mime_errors, PublisherUtils::makeURI(PUBLISHER_ADMIN_URL.'mimetypes.php', array('op' => 'clearAddSession')));
         }
 
         if ($mime_type === false) {
@@ -123,38 +123,38 @@ 
         // Display add form
         echo "<form action='mimetypes.php?op=add' method='post'>";
         echo "<table width='100%' cellspacing='1' class='outer'>";
-        echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_CREATEF . "</th></tr>";
+        echo "<tr><th colspan='2'>"._AM_PUBLISHER_MIME_CREATEF."</th></tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_EXTF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_EXTF."</td>
         <td class='even'><input type='text' name='mime_ext' id='mime_ext' value='$mime_ext' size='5' /></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_NAMEF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_NAMEF."</td>
         <td class='even'><input type='text' name='mime_name' id='mime_name' value='$mime_name' /></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_TYPEF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_TYPEF."</td>
         <td class='even'><textarea name='mime_types' id='mime_types' cols='60' rows='5'>$mime_types</textarea></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_ADMINF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_ADMINF."</td>
         <td class='even'>";
-        echo "<input type='radio' name='mime_admin' value='1' " . ($mime_admin == 1 ? "checked='checked'" : "") . " />" . XoopsLocale::YES;
-        echo "<input type='radio' name='mime_admin' value='0' " . ($mime_admin == 0 ? "checked='checked'" : "") . " />" . XoopsLocale::NO . "
+        echo "<input type='radio' name='mime_admin' value='1' ".($mime_admin == 1 ? "checked='checked'" : "")." />".XoopsLocale::YES;
+        echo "<input type='radio' name='mime_admin' value='0' ".($mime_admin == 0 ? "checked='checked'" : "")." />".XoopsLocale::NO."
         </td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_USERF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_USERF."</td>
         <td class='even'>";
-        echo "<input type='radio' name='mime_user' value='1'" . ($mime_user == 1 ? "checked='checked'" : "") . " />" . XoopsLocale::YES;
-        echo "<input type='radio' name='mime_user' value='0'" . ($mime_user == 0 ? "checked='checked'" : "") . "/>" . XoopsLocale::NO . "
+        echo "<input type='radio' name='mime_user' value='1'".($mime_user == 1 ? "checked='checked'" : "")." />".XoopsLocale::YES;
+        echo "<input type='radio' name='mime_user' value='0'".($mime_user == 0 ? "checked='checked'" : "")."/>".XoopsLocale::NO."
         </td>
         </tr>";
         echo "<tr valign='top'>
         <td class='head'></td>
         <td class='even'>
-        <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_BUTTON_SUBMIT . "' class='formButton' />
-        <input type='button' name='cancel' value='" . _AM_PUBLISHER_BUTTON_CANCEL . "' onclick='history.go(-1)' class='formButton' />
+        <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_BUTTON_SUBMIT."' class='formButton' />
+        <input type='button' name='cancel' value='" . _AM_PUBLISHER_BUTTON_CANCEL."' onclick='history.go(-1)' class='formButton' />
         </td>
         </tr>";
         echo "</table></form>";
@@ -163,10 +163,10 @@ 
         // Find new mimetypes table
         echo "<form action='http://www.filext.com' method='post'>";
         echo "<table width='100%' cellspacing='1' class='outer'>";
-        echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE . "</th></tr>";
+        echo "<tr><th colspan='2'>"._AM_PUBLISHER_MIME_FINDMIMETYPE."</th></tr>";
 
         echo "<tr class='foot'>
-        <td colspan='2'><input type='submit' name='find_mime' id='find_mime' value='" . _AM_PUBLISHER_MIME_FINDIT . "' class='formButton' /></td>
+        <td colspan='2'><input type='submit' name='find_mime' id='find_mime' value='" . _AM_PUBLISHER_MIME_FINDIT."' class='formButton' /></td>
         </tr>";
 
         echo "</table></form>";
@@ -209,7 +209,7 @@ 
             $mime['mime_user'] = $mime_user;
             $session->set('publisher_addMime', $mime);
             $session->set('publisher_addMimeErr', $error);
-            header('Location: ' . PublisherUtils::makeURI(PUBLISHER_ADMIN_URL . 'mimetypes.php', array('op' => 'add'), false));
+            header('Location: '.PublisherUtils::makeURI(PUBLISHER_ADMIN_URL.'mimetypes.php', array('op' => 'add'), false));
         }
 
         $mimetype = $publisher->getMimetypeHandler()->create();
@@ -220,10 +220,10 @@ 
         $mimetype->setVar('mime_user', $mime_user);
 
         if (!$publisher->getMimetypeHandler()->insert($mimetype)) {
-            $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_ADD_MIME_ERROR);
+            $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_ADD_MIME_ERROR);
         } else {
             _clearAddSessionVars();
-            header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start");
+            header("Location: ".PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage&limit=$limit&start=$start");
         }
     }
 }
@@ -234,15 +234,15 @@ 
     $xoops = Xoops::getInstance();
     global $start, $limit;
     if (!isset($_REQUEST['id'])) {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID);
+        $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID);
     }
     $mime_id = (int)($_REQUEST['id']);
 
     $mimetype = $publisher->getMimetypeHandler()->get($mime_id); // Retrieve mimetype object
     if (!$publisher->getMimetypeHandler()->delete($mimetype, true)) {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&id=$mime_id&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
+        $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage&id=$mime_id&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
     } else {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start", 3, "Deleted");
+        $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage&limit=$limit&start=$start", 3, "Deleted");
     }
 }
 
@@ -253,7 +253,7 @@ 
     global $start, $limit, $oAdminButton;
 
     if (!isset($_REQUEST['id'])) {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID);
+        $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID);
     }
     $mime_id = (int)($_REQUEST['id']);
 
@@ -272,7 +272,7 @@ 
 
         //Display any form errors
         if (!$mime_errors === false) {
-            PublisherUtils::renderErrors($mime_errors, PublisherUtils::makeURI(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'clearEditSession', 'id' => $mime_id)));
+            PublisherUtils::renderErrors($mime_errors, PublisherUtils::makeURI(PUBLISHER_ADMIN_URL.'/mimetypes.php', array('op' => 'clearEditSession', 'id' => $mime_id)));
         }
 
         if ($mime_type === false) {
@@ -290,42 +290,42 @@ 
         }
 
         // Display edit form
-        echo "<form action='mimetypes.php?op=edit&amp;id=" . $mime_id . "' method='post'>";
-        echo "<input type='hidden' name='limit' value='" . $limit . "' />";
-        echo "<input type='hidden' name='start' value='" . $start . "' />";
+        echo "<form action='mimetypes.php?op=edit&amp;id=".$mime_id."' method='post'>";
+        echo "<input type='hidden' name='limit' value='".$limit."' />";
+        echo "<input type='hidden' name='start' value='".$start."' />";
         echo "<table width='100%' cellspacing='1' class='outer'>";
-        echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_MODIFYF . "</th></tr>";
+        echo "<tr><th colspan='2'>"._AM_PUBLISHER_MIME_MODIFYF."</th></tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_EXTF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_EXTF."</td>
         <td class='even'><input type='text' name='mime_ext' id='mime_ext' value='$mime_ext' size='5' /></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_NAMEF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_NAMEF."</td>
         <td class='even'><input type='text' name='mime_name' id='mime_name' value='$mime_name' /></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_TYPEF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_TYPEF."</td>
         <td class='even'><textarea name='mime_types' id='mime_types' cols='60' rows='5'>$mime_types</textarea></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_ADMINF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_ADMINF."</td>
         <td class='even'>
-        <input type='radio' name='mime_admin' value='1' " . ($mime_admin == 1 ? "checked='checked'" : '') . " />" . XoopsLocale::YES . "
-        <input type='radio' name='mime_admin' value='0' " . ($mime_admin == 0 ? "checked='checked'" : '') . " />" . XoopsLocale::NO . "
+        <input type='radio' name='mime_admin' value='1' " . ($mime_admin == 1 ? "checked='checked'" : '')." />".XoopsLocale::YES."
+        <input type='radio' name='mime_admin' value='0' " . ($mime_admin == 0 ? "checked='checked'" : '')." />".XoopsLocale::NO."
         </td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_USERF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_USERF."</td>
         <td class='even'>
-        <input type='radio' name='mime_user' value='1' " . ($mime_user == 1 ? "checked='checked'" : '') . " />" . XoopsLocale::YES . "
-        <input type='radio' name='mime_user' value='0' " . ($mime_user == 0 ? "checked='checked'" : '') . " />" . XoopsLocale::NO . "
+        <input type='radio' name='mime_user' value='1' " . ($mime_user == 1 ? "checked='checked'" : '')." />".XoopsLocale::YES."
+        <input type='radio' name='mime_user' value='0' " . ($mime_user == 0 ? "checked='checked'" : '')." />".XoopsLocale::NO."
         </td>
         </tr>";
         echo "<tr valign='top'>
         <td class='head'></td>
         <td class='even'>
-        <input type='submit' name='edit_mime' id='edit_mime' value='" . _AM_PUBLISHER_BUTTON_UPDATE . "' class='formButton' />
-        <input type='button' name='cancel' value='" . _AM_PUBLISHER_BUTTON_CANCEL . "' onclick='history.go(-1)' class='formButton' />
+        <input type='submit' name='edit_mime' id='edit_mime' value='" . _AM_PUBLISHER_BUTTON_UPDATE."' class='formButton' />
+        <input type='button' name='cancel' value='" . _AM_PUBLISHER_BUTTON_CANCEL."' onclick='history.go(-1)' class='formButton' />
         </td>
         </tr>";
         echo "</table></form>";
@@ -368,9 +368,9 @@ 
             $mime['mime_types'] = $_POST['mime_types'];
             $mime['mime_admin'] = $mime_admin;
             $mime['mime_user'] = $mime_user;
-            $session->set('publisher_editMime_' . $mime_id, $mime);
-            $session->set('publisher_editMimeErr_' . $mime_id, $error);
-            header('Location: ' . PublisherUtils::makeURI(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'edit', 'id' => $mime_id), false));
+            $session->set('publisher_editMime_'.$mime_id, $mime);
+            $session->set('publisher_editMimeErr_'.$mime_id, $error);
+            header('Location: '.PublisherUtils::makeURI(PUBLISHER_ADMIN_URL.'/mimetypes.php', array('op' => 'edit', 'id' => $mime_id), false));
         }
 
         $mimetype->setVar('mime_ext', $_POST['mime_ext']);
@@ -380,10 +380,10 @@ 
         $mimetype->setVar('mime_user', $mime_user);
 
         if (!$publisher->getMimetypeHandler()->insert($mimetype, true)) {
-            $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=edit&id=$mime_id", 3, _AM_PUBLISHER_MESSAGE_EDIT_MIME_ERROR);
+            $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?op=edit&id=$mime_id", 3, _AM_PUBLISHER_MESSAGE_EDIT_MIME_ERROR);
         } else {
             _clearEditSessionVars($mime_id);
-            header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start");
+            header("Location: ".PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage&limit=$limit&start=$start");
         }
     }
 }
@@ -394,30 +394,30 @@ 
     $publisher = Publisher::getInstance();
 
     $imagearray = array(
-        'editimg' => "<img src='" . $publisher->url("images/button_edit.png") . "' alt='" . _AM_PUBLISHER_ICO_EDIT . "' align='middle' />",
-        'deleteimg' => "<img src='" . $publisher->url("images/button_delete.png") . "' alt='" . _AM_PUBLISHER_ICO_DELETE . "' align='middle' />",
-        'online' => "<img src='" . $publisher->url("images/on.png") . "' alt='" . _AM_PUBLISHER_ICO_ONLINE . "' align='middle' />",
-        'offline' => "<img src='" . $publisher->url("images/off.png") . "' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle' />",
+        'editimg' => "<img src='".$publisher->url("images/button_edit.png")."' alt='"._AM_PUBLISHER_ICO_EDIT."' align='middle' />",
+        'deleteimg' => "<img src='".$publisher->url("images/button_delete.png")."' alt='"._AM_PUBLISHER_ICO_DELETE."' align='middle' />",
+        'online' => "<img src='".$publisher->url("images/on.png")."' alt='"._AM_PUBLISHER_ICO_ONLINE."' align='middle' />",
+        'offline' => "<img src='".$publisher->url("images/off.png")."' alt='"._AM_PUBLISHER_ICO_OFFLINE."' align='middle' />",
     );
     global $start, $limit, $aSortBy, $aOrderBy, $aLimitBy, $aSearchBy;
 
     if (isset($_POST['deleteMimes'])) {
         $aMimes = $_POST['mimes'];
 
-        $crit = new Criteria('mime_id', "(" . implode($aMimes, ',') . ")", "IN");
+        $crit = new Criteria('mime_id', "(".implode($aMimes, ',').")", "IN");
 
         if ($publisher->getMimetypeHandler()->deleteAll($crit)) {
-            header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
+            header("Location: ".PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start");
         } else {
-            $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
+            $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
         }
     }
     if (isset($_POST['add_mime'])) {
-        header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=add&start=$start&limit=$limit");
+        header("Location: ".PUBLISHER_ADMIN_URL."/mimetypes.php?op=add&start=$start&limit=$limit");
         exit();
     }
     if (isset($_POST['mime_search'])) {
-        header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search");
+        header("Location: ".PUBLISHER_ADMIN_URL."/mimetypes.php?op=search");
         exit();
     }
 
@@ -445,25 +445,25 @@ 
 
     echo "<table width='100%' cellspacing='1' class='outer'>";
     echo "<tr><td colspan='6' align='right'>";
-    echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
+    echo "<form action='".PUBLISHER_ADMIN_URL."/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
     echo "<table>";
     echo "<tr>";
-    echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . "</td>";
+    echo "<td align='right'>"._AM_PUBLISHER_TEXT_SEARCH_BY."</td>";
     echo "<td align='left'><select name='search_by'>";
     foreach ($aSearchBy as $value => $text) {
         ($sort == $value) ? $selected = "selected='selected'" : $selected = '';
         echo "<option value='$value' $selected>$text</option>";
     }
     echo "</select></td>";
-    echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . "</td>";
+    echo "<td align='right'>"._AM_PUBLISHER_TEXT_SEARCH_TEXT."</td>";
     echo "<td align='left'><input type='text' name='search_text' id='search_text' value='' /></td>";
-    echo "<td><input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH . "' /></td>";
+    echo "<td><input type='submit' name='mime_search' id='mime_search' value='"._AM_PUBLISHER_BUTTON_SEARCH."' /></td>";
     echo "</tr></table></form></td></tr>";
 
     echo "<tr><td colspan='6'>";
-    echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage' style='margin:0; padding:0;' method='post'>";
+    echo "<form action='".PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage' style='margin:0; padding:0;' method='post'>";
     echo "<table width='100%'>";
-    echo "<tr><td align='right'>" . _AM_PUBLISHER_TEXT_SORT_BY . "
+    echo "<tr><td align='right'>"._AM_PUBLISHER_TEXT_SORT_BY."
     <select name='sort'>";
     foreach ($aSortBy as $value => $text) {
         ($sort == $value) ? $selected = "selected='selected'" : $selected = '';
@@ -471,7 +471,7 @@ 
     }
     echo "</select>
     &nbsp;&nbsp;&nbsp;
-    " . _AM_PUBLISHER_TEXT_ORDER_BY . "
+    " . _AM_PUBLISHER_TEXT_ORDER_BY."
     <select name='order'>";
     foreach ($aOrderBy as $value => $text) {
         ($order == $value) ? $selected = "selected='selected'" : $selected = '';
@@ -479,56 +479,56 @@ 
     }
     echo "</select>
     &nbsp;&nbsp;&nbsp;
-    " . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE . "
+    " . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE."
     <select name='limit'>";
     foreach ($aLimitBy as $value => $text) {
         ($limit == $value) ? $selected = "selected='selected'" : $selected = '';
         echo "<option value='$value' $selected>$text</option>";
     }
     echo "</select>
-    <input type='submit' name='mime_sort' id='mime_sort' value='" . _AM_PUBLISHER_BUTTON_SUBMIT . "' />
+    <input type='submit' name='mime_sort' id='mime_sort' value='" . _AM_PUBLISHER_BUTTON_SUBMIT."' />
     </td>
     </tr>";
     echo "</table>";
     echo "</td></tr>";
-    echo "<tr><th colspan='6'>" . _AM_PUBLISHER_MIME_MANAGE_TITLE . "</th></tr>";
+    echo "<tr><th colspan='6'>"._AM_PUBLISHER_MIME_MANAGE_TITLE."</th></tr>";
     echo "<tr class='head'>
-    <td>" . _AM_PUBLISHER_MIME_ID . "</td>
-    <td>" . _AM_PUBLISHER_MIME_NAME . "</td>
-    <td>" . _AM_PUBLISHER_MIME_EXT . "</td>
-    <td>" . _AM_PUBLISHER_MIME_ADMIN . "</td>
-    <td>" . _AM_PUBLISHER_MIME_USER . "</td>
-    <td>" . _AM_PUBLISHER_MINDEX_ACTION . "</td>
+    <td>" . _AM_PUBLISHER_MIME_ID."</td>
+    <td>" . _AM_PUBLISHER_MIME_NAME."</td>
+    <td>" . _AM_PUBLISHER_MIME_EXT."</td>
+    <td>" . _AM_PUBLISHER_MIME_ADMIN."</td>
+    <td>" . _AM_PUBLISHER_MIME_USER."</td>
+    <td>" . _AM_PUBLISHER_MINDEX_ACTION."</td>
     </tr>";
     foreach ($mimetypes as $mime) {
         echo "<tr class='even'>
-        <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id') . "' />" . $mime->getVar('mime_id') . "</td>
-        <td>" . $mime->getVar('mime_name') . "</td>
-        <td>" . $mime->getVar('mime_ext') . "</td>
+        <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id')."' />".$mime->getVar('mime_id')."</td>
+        <td>" . $mime->getVar('mime_name')."</td>
+        <td>" . $mime->getVar('mime_ext')."</td>
         <td>
-        <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=updateMimeValue&amp;id=" . $mime->getVar('mime_id') . "&amp;mime_admin=" . $mime->getVar('mime_admin') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>
-        " . ($mime->getVar('mime_admin') ? $imagearray['online'] : $imagearray['offline']) . "</a>
+        <a href='" . PUBLISHER_ADMIN_URL."/mimetypes.php?op=updateMimeValue&amp;id=".$mime->getVar('mime_id')."&amp;mime_admin=".$mime->getVar('mime_admin')."&amp;limit=".$limit."&amp;start=".$start."'>
+        " . ($mime->getVar('mime_admin') ? $imagearray['online'] : $imagearray['offline'])."</a>
         </td>
         <td>
-        <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=updateMimeValue&amp;id=" . $mime->getVar('mime_id') . "&amp;mime_user=" . $mime->getVar('mime_user') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>
-        " . ($mime->getVar('mime_user') ? $imagearray['online'] : $imagearray['offline']) . "</a>
+        <a href='" . PUBLISHER_ADMIN_URL."/mimetypes.php?op=updateMimeValue&amp;id=".$mime->getVar('mime_id')."&amp;mime_user=".$mime->getVar('mime_user')."&amp;limit=".$limit."&amp;start=".$start."'>
+        " . ($mime->getVar('mime_user') ? $imagearray['online'] : $imagearray['offline'])."</a>
         </td>
         <td>
-        <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=edit&amp;id=" . $mime->getVar('mime_id') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>" . $imagearray['editimg'] . "</a>
-        <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=delete&amp;id=" . $mime->getVar('mime_id') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>" . $imagearray['deleteimg'] . "</a>
+        <a href='" . PUBLISHER_ADMIN_URL."/mimetypes.php?op=edit&amp;id=".$mime->getVar('mime_id')."&amp;limit=".$limit."&amp;start=".$start."'>".$imagearray['editimg']."</a>
+        <a href='" . PUBLISHER_ADMIN_URL."/mimetypes.php?op=delete&amp;id=".$mime->getVar('mime_id')."&amp;limit=".$limit."&amp;start=".$start."'>".$imagearray['deleteimg']."</a>
         </td>
         </tr>";
     }
     echo "<tr class='foot'>
     <td colspan='6' valign='top'>
-    <a href='http://www.filext.com' style='float: right' target='_blank'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE . "</a>
+    <a href='http://www.filext.com' style='float: right' target='_blank'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE."</a>
     <input type='checkbox' name='checkAllMimes' value='0' onclick='selectAll(this.form,\"mimes[]\",this.checked);' />
-    <input type='submit' name='deleteMimes' id='deleteMimes' value='" . _AM_PUBLISHER_BUTTON_DELETE . "' />
-    <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_MIME_CREATEF . "' class='formButton' />
+    <input type='submit' name='deleteMimes' id='deleteMimes' value='" . _AM_PUBLISHER_BUTTON_DELETE."' />
+    <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_MIME_CREATEF."' class='formButton' />
     </td>
     </tr>";
     echo "</table>";
-    echo "<div id='staff_nav'>" . $nav->renderNav() . "</div>";
+    echo "<div id='staff_nav'>".$nav->renderNav()."</div>";
 
     PublisherUtils::closeCollapsableBar('mimemanagetable', 'mimemanageicon');
 
@@ -545,16 +545,16 @@ 
     if (isset($_POST['deleteMimes'])) {
         $aMimes = $_POST['mimes'];
 
-        $crit = new Criteria('mime_id', "(" . implode($aMimes, ',') . ")", "IN");
+        $crit = new Criteria('mime_id', "(".implode($aMimes, ',').")", "IN");
 
         if ($publisher->getMimetypeHandler()->deleteAll($crit)) {
-            header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
+            header("Location: ".PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start");
         } else {
-            $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
+            $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
         }
     }
     if (isset($_POST['add_mime'])) {
-        header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=add&start=$start&limit=$limit");
+        header("Location: ".PUBLISHER_ADMIN_URL."/mimetypes.php?op=add&start=$start&limit=$limit");
         exit();
     }
     if (isset($_REQUEST['order'])) {
@@ -577,8 +577,8 @@ 
 
         echo "<form action='mimetypes.php?op=search' method='post'>";
         echo "<table width='100%' cellspacing='1' class='outer'>";
-        echo "<tr><th colspan='2'>" . _AM_PUBLISHER_TEXT_SEARCH_MIME . "</th></tr>";
-        echo "<tr><td class='head' width='20%'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . "</td>
+        echo "<tr><th colspan='2'>"._AM_PUBLISHER_TEXT_SEARCH_MIME."</th></tr>";
+        echo "<tr><td class='head' width='20%'>"._AM_PUBLISHER_TEXT_SEARCH_BY."</td>
         <td class='even'>
         <select name='search_by'>";
         foreach ($aSortBy as $value => $text) {
@@ -587,14 +587,14 @@ 
         echo "</select>
         </td>
         </tr>";
-        echo "<tr><td class='head'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . "</td>
+        echo "<tr><td class='head'>"._AM_PUBLISHER_TEXT_SEARCH_TEXT."</td>
         <td class='even'>
         <input type='text' name='search_text' id='search_text' value='' />
         </td>
         </tr>";
         echo "<tr class='foot'>
         <td colspan='2'>
-        <input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH . "' />
+        <input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH."' />
         </td>
         </tr>";
         echo "</table></form>";
@@ -611,29 +611,29 @@ 
         $mimetypes = $publisher->getMimetypeHandler()->getObjects($crit);
         $nav = new XoopsPageNav($mime_count, $limit, $start, 'start', "op=search&amp;limit=$limit&amp;order=$order&amp;sort=$sort&amp;mime_search=1&amp;search_by=$search_field&amp;search_text=$search_text");
         // Display results
-        echo '<script type="text/javascript" src="' . PUBLISHER_URL . '/include/functions.js"></script>';
+        echo '<script type="text/javascript" src="'.PUBLISHER_URL.'/include/functions.js"></script>';
 
         echo "<table width='100%' cellspacing='1' class='outer'>";
         echo "<tr><td colspan='6' align='right'>";
-        echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
+        echo "<form action='".PUBLISHER_ADMIN_URL."/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
         echo "<table>";
         echo "<tr>";
-        echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . "</td>";
+        echo "<td align='right'>"._AM_PUBLISHER_TEXT_SEARCH_BY."</td>";
         echo "<td align='left'><select name='search_by'>";
         foreach ($aSearchBy as $value => $text) {
             ($search_field == $value) ? $selected = "selected='selected'" : $selected = '';
             echo "<option value='$value' $selected>$text</option>";
         }
         echo "</select></td>";
-        echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . "</td>";
+        echo "<td align='right'>"._AM_PUBLISHER_TEXT_SEARCH_TEXT."</td>";
         echo "<td align='left'><input type='text' name='search_text' id='search_text' value='$search_text' /></td>";
-        echo "<td><input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH . "' /></td>";
+        echo "<td><input type='submit' name='mime_search' id='mime_search' value='"._AM_PUBLISHER_BUTTON_SEARCH."' /></td>";
         echo "</tr></table></form></td></tr>";
 
         echo "<tr><td colspan='6'>";
-        echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
+        echo "<form action='".PUBLISHER_ADMIN_URL."/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
         echo "<table width='100%'>";
-        echo "<tr><td align='right'>" . _AM_PUBLISHER_TEXT_SORT_BY . "
+        echo "<tr><td align='right'>"._AM_PUBLISHER_TEXT_SORT_BY."
         <select name='sort'>";
         foreach ($aSortBy as $value => $text) {
             ($sort == $value) ? $selected = "selected='selected'" : $selected = '';
@@ -641,7 +641,7 @@ 
         }
         echo "</select>
         &nbsp;&nbsp;&nbsp;
-        " . _AM_PUBLISHER_TEXT_ORDER_BY . "
+        " . _AM_PUBLISHER_TEXT_ORDER_BY."
         <select name='order'>";
         foreach ($aOrderBy as $value => $text) {
             ($order == $value) ? $selected = "selected='selected'" : $selected = '';
@@ -649,14 +649,14 @@ 
         }
         echo "</select>
         &nbsp;&nbsp;&nbsp;
-        " . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE . "
+        " . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE."
         <select name='limit'>";
         foreach ($aLimitBy as $value => $text) {
             ($limit == $value) ? $selected = "selected='selected'" : $selected = '';
             echo "<option value='$value' $selected>$text</option>";
         }
         echo "</select>
-        <input type='submit' name='mime_sort' id='mime_sort' value='" . _AM_PUBLISHER_BUTTON_SUBMIT . "' />
+        <input type='submit' name='mime_sort' id='mime_sort' value='" . _AM_PUBLISHER_BUTTON_SUBMIT."' />
         <input type='hidden' name='mime_search' id='mime_search' value='1' />
         <input type='hidden' name='search_by' id='search_by' value='$search_field' />
         <input type='hidden' name='search_text' id='search_text' value='$search_text' />
@@ -665,50 +665,50 @@ 
         echo "</table>";
         echo "</td></tr>";
         if (count($mimetypes) > 0) {
-            echo "<tr><th colspan='6'>" . _AM_PUBLISHER_TEXT_SEARCH_MIME . "</th></tr>";
+            echo "<tr><th colspan='6'>"._AM_PUBLISHER_TEXT_SEARCH_MIME."</th></tr>";
             echo "<tr class='head'>
-            <td>" . _AM_PUBLISHER_MIME_ID . "</td>
-            <td>" . _AM_PUBLISHER_MIME_NAME . "</td>
-            <td>" . _AM_PUBLISHER_MIME_EXT . "</td>
-            <td>" . _AM_PUBLISHER_MIME_ADMIN . "</td>
-            <td>" . _AM_PUBLISHER_MIME_USER . "</td>
-            <td>" . _AM_PUBLISHER_MINDEX_ACTION . "</td>
+            <td>" . _AM_PUBLISHER_MIME_ID."</td>
+            <td>" . _AM_PUBLISHER_MIME_NAME."</td>
+            <td>" . _AM_PUBLISHER_MIME_EXT."</td>
+            <td>" . _AM_PUBLISHER_MIME_ADMIN."</td>
+            <td>" . _AM_PUBLISHER_MIME_USER."</td>
+            <td>" . _AM_PUBLISHER_MINDEX_ACTION."</td>
             </tr>";
             foreach ($mimetypes as $mime) {
                 echo "<tr class='even'>
-                <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id') . "' />" . $mime->getVar('mime_id') . "</td>
-                <td>" . $mime->getVar('mime_name') . "</td>
-                <td>" . $mime->getVar('mime_ext') . "</td>
+                <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id')."' />".$mime->getVar('mime_id')."</td>
+                <td>" . $mime->getVar('mime_name')."</td>
+                <td>" . $mime->getVar('mime_ext')."</td>
                 <td>
-                <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=updateMimeValue&amp;id=" . $mime->getVar('mime_id') . "&amp;mime_admin=" . $mime->getVar('mime_admin') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>
-                " . ($mime->getVar('mime_admin') ? $imagearray['online'] : $imagearray['offline']) . "</a>
+                <a href='" . PUBLISHER_ADMIN_URL."/mimetypes.php?op=updateMimeValue&amp;id=".$mime->getVar('mime_id')."&amp;mime_admin=".$mime->getVar('mime_admin')."&amp;limit=".$limit."&amp;start=".$start."'>
+                " . ($mime->getVar('mime_admin') ? $imagearray['online'] : $imagearray['offline'])."</a>
                 </td>
                 <td>
-                <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=updateMimeValue&amp;id=" . $mime->getVar('mime_id') . "&amp;mime_user=" . $mime->getVar('mime_user') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>
-                " . ($mime->getVar('mime_user') ? $imagearray['online'] : $imagearray['offline']) . "</a>
+                <a href='" . PUBLISHER_ADMIN_URL."/mimetypes.php?op=updateMimeValue&amp;id=".$mime->getVar('mime_id')."&amp;mime_user=".$mime->getVar('mime_user')."&amp;limit=".$limit."&amp;start=".$start."'>
+                " . ($mime->getVar('mime_user') ? $imagearray['online'] : $imagearray['offline'])."</a>
                 </td>
                 <td>
-                <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=edit&amp;id=" . $mime->getVar('mime_id') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>" . $imagearray['editimg'] . "</a>
-                <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=delete&amp;id=" . $mime->getVar('mime_id') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>" . $imagearray['deleteimg'] . "</a>
+                <a href='" . PUBLISHER_ADMIN_URL."/mimetypes.php?op=edit&amp;id=".$mime->getVar('mime_id')."&amp;limit=".$limit."&amp;start=".$start."'>".$imagearray['editimg']."</a>
+                <a href='" . PUBLISHER_ADMIN_URL."/mimetypes.php?op=delete&amp;id=".$mime->getVar('mime_id')."&amp;limit=".$limit."&amp;start=".$start."'>".$imagearray['deleteimg']."</a>
                 </td>
                 </tr>";
             }
             echo "<tr class='foot'>
             <td colspan='6' valign='top'>
-            <a href='http://www.filext.com' style='float: right' target='_blank'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE . "</a>
+            <a href='http://www.filext.com' style='float: right' target='_blank'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE."</a>
             <input type='checkbox' name='checkAllMimes' value='0' onclick='selectAll(this.form,\"mimes[]\",this.checked);' />
-            <input type='submit' name='deleteMimes' id='deleteMimes' value='" . _AM_PUBLISHER_BUTTON_DELETE . "' />
-            <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_MIME_CREATEF . "' class='formButton' />
+            <input type='submit' name='deleteMimes' id='deleteMimes' value='" . _AM_PUBLISHER_BUTTON_DELETE."' />
+            <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_MIME_CREATEF."' class='formButton' />
             </td>
             </tr>";
         } else {
-            echo "<tr><th>" . _AM_PUBLISHER_TEXT_SEARCH_MIME . "</th></tr>";
+            echo "<tr><th>"._AM_PUBLISHER_TEXT_SEARCH_MIME."</th></tr>";
             echo "<tr class='even'>
-            <td>" . _AM_PUBLISHER_TEXT_NO_RECORDS . "</td>
+            <td>" . _AM_PUBLISHER_TEXT_NO_RECORDS."</td>
             </tr>";
         }
         echo "</table>";
-        echo "<div id='pagenav'>" . $nav->renderNav() . "</div>";
+        echo "<div id='pagenav'>".$nav->renderNav()."</div>";
     }
     PublisherUtils::closeCollapsableBar('mimesearchtable', 'mimesearchicon');
     $xoops->footer();
@@ -728,7 +728,7 @@ 
     }
 
     if (!isset($_REQUEST['id'])) {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID);
+        $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID);
     }
     $mime_id = (int)($_REQUEST['id']);
 
@@ -745,9 +745,9 @@ 
         $mimetype->setVar('mime_user', $mime_user);
     }
     if ($publisher->getMimetypeHandler()->insert($mimetype, true)) {
-        header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
+        header("Location: ".PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start");
     } else {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start", 3);
+        $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start", 3);
     }
 }
 
@@ -771,7 +771,7 @@ 
 function clearAddSession()
 {
     _clearAddSessionVars();
-    header('Location: ' . PublisherUtils::makeURI(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'add'), false));
+    header('Location: '.PublisherUtils::makeURI(PUBLISHER_ADMIN_URL.'/mimetypes.php', array('op' => 'add'), false));
 }
 
 function _clearEditSessionVars($id)
@@ -786,5 +786,5 @@ 
 {
     $mimeid = $_REQUEST['id'];
     _clearEditSessionVars($mimeid);
-    header('Location: ' . PublisherUtils::makeURI(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'edit', 'id' => $mimeid), false));
+    header('Location: '.PublisherUtils::makeURI(PUBLISHER_ADMIN_URL.'/mimetypes.php', array('op' => 'edit', 'id' => $mimeid), false));
 }