Merge pull request #10 from mambax7/master

1.02 RC5
XoopsModules25x · Dec 25, 2015 · 4e5a369 · 4e5a369
2 parents 25ca2e1 + 4e2c996
commit 4e5a369
Show file tree

Hide file tree

Showing 47 changed files with 487 additions and 476 deletions.
diff --git a/publisher/admin/clone.php b/publisher/admin/clone.php
@@ -64,7 +64,6 @@
         $msg .= _AM_PUBLISHER_CLONE_FAIL;
     }
     echo $msg;
-
 } else {
     include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
     $form  = new XoopsThemeForm(sprintf(_AM_PUBLISHER_CLONE_TITLE, $publisher->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
@@ -98,7 +97,6 @@ function file_put_contents($filename, $data, $file_append = false)
  */
 class PublisherClone
 {
-
     // recursive clonning script
     /**
      * @param $path
@@ -152,7 +150,7 @@ public static function createLogo($dirname)
                     return false;
                 }
             }
-//            unset($func);
+            //            unset($func);
         }
 
         if (!file_exists($imageBase = $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/logo.png')) || !file_exists($font = $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/VeraBd.ttf'))) {
@@ -166,7 +164,7 @@ public static function createLogo($dirname)
         imagefilledrectangle($imageModule, 5, 35, 85, 46, $greyColor);
 
         // Write text
-        $textColor      = imagecolorallocate($imageModule, 0, 0, 0);
+        $textColor     = imagecolorallocate($imageModule, 0, 0, 0);
         $spaceToBorder = (80 - strlen($dirname) * 6.5) / 2;
         imagefttext($imageModule, 8.5, 0, $spaceToBorder, 45, $textColor, $font, ucfirst($dirname), array());
 

diff --git a/publisher/admin/file.php b/publisher/admin/file.php
@@ -72,7 +72,6 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
     } else {
         publisherCloseCollapsableBar('addfile', 'addfileicon');
     }
-
 }
 
 $false = false;

diff --git a/publisher/admin/import.php b/publisher/admin/import.php
@@ -59,7 +59,7 @@
         $moduleObj    = $moduleHandler->getByDirname('news');
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
-            if (($from_module_version >= 1.1)) {
+            if ($from_module_version >= 1.1) {
                 $importfile_select_array['news'] = 'News ' . $from_module_version;
                 $news_version                    = $from_module_version;
             }
@@ -70,7 +70,7 @@
         $moduleObj     = $moduleHandler->getByDirname('xnews');
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
-            if (($from_module_version >= 1.1)) {
+            if ($from_module_version >= 1.1) {
                 $importfile_select_array['xnews'] = 'xNews ' . $from_module_version;
                 $xnews_version                    = $from_module_version;
             }
@@ -81,7 +81,7 @@
         $moduleObj   = $moduleHandler->getByDirname('AMS');
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
-            if (($from_module_version >= 1.1)) {
+            if ($from_module_version >= 1.1) {
                 $importfile_select_array['ams'] = 'AMS ' . $from_module_version;
                 $ams_version                    = $from_module_version;
             }
@@ -92,7 +92,7 @@
         $moduleObj            = $moduleHandler->getByDirname('smartsection');
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
-            if (($from_module_version >= 1.1)) {
+            if ($from_module_version >= 1.1) {
                 $importfile_select_array['smartsection'] = 'Smartsection ' . $from_module_version;
                 $smartsection_version                    = $from_module_version;
             }
@@ -103,7 +103,7 @@
         $moduleObj           = $moduleHandler->getByDirname('cjaycontent');
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
-            if (($from_module_version >= 1.1)) {
+            if ($from_module_version >= 1.1) {
                 $importfile_select_array['cjaycontent'] = 'C-Jay Content ' . $from_module_version;
                 $cjaycontent_version                    = $from_module_version;
             }
@@ -114,7 +114,7 @@
         $moduleObj         = $moduleHandler->getByDirname('fmcontent');
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
-            if (($from_module_version >= 1.1)) {
+            if ($from_module_version >= 1.1) {
                 $importfile_select_array['fmcontent'] = 'FmContent ' . $from_module_version;
                 $fmcontent_version                    = $from_module_version;
             }

diff --git a/publisher/admin/import/ams.php b/publisher/admin/import/ams.php
@@ -37,15 +37,15 @@
     publisherOpenCollapsableBar('amsimport', 'amsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
     $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('ams_topics'));
-    list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
+    list($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
         echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('nw_stories'));
-        list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
+        list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
             echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
@@ -80,7 +80,7 @@
                 echo 'Caught exception: couldn not insert Image Category' . $e->getMessage() . 'n';
             }
 
-            $newid                     = $imagecategory->getVar('imgcat_id');
+            $newid                    = $imagecategory->getVar('imgcat_id');
             $imagecategorypermHandler =& xoops_getHandler('groupperm');
             if (!isset($readgroup)) {
                 $readgroup = array();
@@ -123,7 +123,7 @@
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_options = array();
 
-            while ((list ($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
+            while ((list($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
                 $cat_title              = $myts->displayTarea($cat_title);
                 $cat_cbox_options[$cid] = "$cat_title ($art_count)";
             }
@@ -158,7 +158,7 @@
 if ($op === 'go') {
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
-    include_once(dirname(dirname(__DIR__))) . '/include/common.php';
+    include_once (dirname(dirname(__DIR__))) . '/include/common.php';
     publisherOpenCollapsableBar('amsimportgo', 'amsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
 
     $moduleHandler =& xoops_getHandler('module');
@@ -248,7 +248,6 @@
                   */
 
                 //============================
-
             }
         }
 
@@ -424,7 +423,6 @@
         } else {
             echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
-
     }
     //    unset($comment);
 

diff --git a/publisher/admin/import/cjaycontent.php b/publisher/admin/import/cjaycontent.php
@@ -57,7 +57,7 @@
     publisherOpenCollapsableBar('cjaycontentimport', 'cjaycontentimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
     $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('cjaycontent'));
-    list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
+    list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalArticles == 0) {
         echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
@@ -84,7 +84,7 @@
 if ($op === 'go') {
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
-    include_once(dirname(dirname(__DIR__))) . '/include/common.php';
+    include_once (dirname(dirname(__DIR__))) . '/include/common.php';
     publisherOpenCollapsableBar('cjaycontentimportgo', 'cjaycontentimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
 
     $moduleHandler         =& xoops_getHandler('module');
@@ -171,9 +171,8 @@
         } else {
             echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
-
     }
-//    unset($comment);
+    //    unset($comment);
 
     echo '<br/><br/>Done.<br/>';
 

diff --git a/publisher/admin/import/fmcontent.php b/publisher/admin/import/fmcontent.php
@@ -64,7 +64,7 @@
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_options = array();
 
-            while ((list ($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
+            while ((list($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
                 $cat_title              = $myts->displayTarea($cat_title);
                 $cat_cbox_options[$cid] = "{$cat_title} ($art_count)";
             }
@@ -333,7 +333,6 @@
         } else {
             echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />\n";
         }
-
     }
     //    unset($comment);
 

diff --git a/publisher/admin/import/news.php b/publisher/admin/import/news.php
@@ -37,15 +37,15 @@
     publisherOpenCollapsableBar('newsimport', 'newsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
     $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('topics'));
-    list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
+    list($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
         echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('stories'));
-        list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
+        list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
             echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
@@ -60,7 +60,7 @@
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_options = array();
 
-            while ((list ($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
+            while ((list($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
                 $cat_title              = $myts->displayTarea($cat_title);
                 $cat_cbox_options[$cid] = '$cat_title ($art_count)';
             }
@@ -264,7 +264,6 @@
         } else {
             echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
-
     }
     //    unset($comment);
 

diff --git a/publisher/admin/import/smartsection.php b/publisher/admin/import/smartsection.php
@@ -37,15 +37,15 @@
     publisherOpenCollapsableBar('newsimport', 'newsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
     $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('smartsection_categories'));
-    list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
+    list($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
         echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('smartsection_items'));
-        list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
+        list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
             echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
@@ -60,7 +60,7 @@
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_options = array();
 
-            while ((list ($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
+            while ((list($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
                 $cat_title              = $myts->displayTarea($cat_title);
                 $cat_cbox_options[$cid] = "$cat_title ($art_count)";
             }
@@ -241,9 +241,8 @@
         } else {
             echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
-
     }
-//    unset($comment);
+    //    unset($comment);
 
     echo '<br/><br/>Done.<br/>';
     echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';

diff --git a/publisher/admin/import/wfsection.php b/publisher/admin/import/wfsection.php
@@ -37,15 +37,15 @@
     publisherOpenCollapsableBar('wfsectionimport', 'wfsectionimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
     $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('wfs_category'));
-    list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
+    list($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
         echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NOCATSELECTED . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('wfs_article'));
-        list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
+        list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
             echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
@@ -59,7 +59,7 @@
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_values  = array();
             $cat_cbox_options = array();
-            while ((list ($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
+            while ((list($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
                 $cat_title              = $myts->displayTarea($cat_title);
                 $cat_cbox_options[$cid] = "$cat_title ($art_count)";
             }
@@ -258,9 +258,8 @@
         } else {
             echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
-
     }
-//    unset($comment);
+    //    unset($comment);
 
     echo '<br/><br/>Done.<br/>';
     echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';

diff --git a/publisher/admin/import/xfsection.php b/publisher/admin/import/xfsection.php
@@ -37,15 +37,15 @@
     publisherOpenCollapsableBar('xfsectionimport', 'xfsectionimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
     $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('xfs_category'));
-    list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
+    list($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
         echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NOCATSELECTED . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('xfs_article'));
-        list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
+        list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
             echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
@@ -59,7 +59,7 @@
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_values  = array();
             $cat_cbox_options = array();
-            while ((list ($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
+            while ((list($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
                 $cat_title              = $myts->displayTarea($cat_title);
                 $cat_cbox_options[$cid] = "$cat_title ($art_count)";
             }
@@ -256,9 +256,8 @@
         } else {
             echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
-
     }
-//    unset($comment);
+    //    unset($comment);
 
     echo '<br/><br/>Done.<br/>';
     echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
-Original file line number
+Diff line change
@@ Expand Up @@
         } else {
             publisherCloseCollapsableBar('addfile', 'addfileicon');
         }
     }
     $false = false;
@@ Expand Down @@