Merge pull request #4 from mambax7/master

1.04 RC2
XoopsModules25x · Jun 2, 2016 · b33bae8 · b33bae8
2 parents ececdd6 + 64ba14d
commit b33bae8
Show file tree

Hide file tree

Showing 31 changed files with 356 additions and 349 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 
 About Us module for [XOOPS CMS](http://xoops.org) for adding a multi-page About Us section to your Website
 
-[![Tutorial Available](http://xoops.org/images/tutorial-available-blue.svg)](https://www.gitbook.com/book/xoops/xoops-about/) Tutorial: see [here](https://www.gitbook.com/book/xoops/xoops-about/).
+[![Tutorial Available](http://xoops.org/images/tutorial-available-blue.svg)](https://www.gitbook.com/book/xoops/xoops-about/) Tutorial: see [GitBook](https://www.gitbook.com/book/xoops/xoops-about/).
 To contribute to the Tutorial, [fork it on GitHub](https://github.com/XoopsDocs/about-tutorial)
 
 [![Translations on Transifex](http://xoops.org/images/translations-transifex-blue.svg)](https://www.transifex.com/xoops)

diff --git a/admin/about.php b/admin/about.php
@@ -10,12 +10,11 @@
  */
 
 /**
- * @copyright    The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @copyright    XOOPS Project (http://xoops.org)
  * @license      GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @package
  * @since
  * @author       XOOPS Development Team
- * @version      $Id $
  */
 
 include_once __DIR__ . '/admin_header.php';

diff --git a/admin/admin.page.php b/admin/admin.page.php
@@ -15,7 +15,6 @@
  * @since          1.0.0
  * @author         Mengjue Shao <magic.shao@gmail.com>
  * @author         Susheng Yang <ezskyyoung@gmail.com>
- * @version        $Id: admin.page.php 1 2010-2-9 ezsky$
  */
 
 include __DIR__ . '/admin_header.php';
@@ -72,7 +71,8 @@
             'page_status',
             'page_order',
             'page_index',
-            'page_tpl');
+            'page_tpl'
+        );
 
         $criteria = new CriteriaCompo();
         $criteria->setSort('page_order');

diff --git a/admin/admin_footer.php b/admin/admin_footer.php
@@ -10,17 +10,23 @@
  */
 
 /**
- * @copyright    The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @copyright    XOOPS Project (http://xoops.org)
  * @license      GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @package
  * @since
  * @author       XOOPS Development Team
- * @version      $Id $
  */
 
 global $xoopsModule;
 //$pathIcon32      = '../' . $xoopsModule->getInfo('icons32');
 
-echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
+echo "<div class='adminfooter'>\n" .
+     "  <div style='text-align: center;'>\n" .
+     "    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" .
+     "  </div>\n" .
+     '  ' .
+     _AM_MODULEADMIN_ADMIN_FOOTER .
+     "\n" .
+     '</div>';
 
 xoops_cp_footer();
diff --git a/admin/admin_header.php b/admin/admin_header.php
@@ -10,12 +10,11 @@
  */
 
 /**
- * @copyright    The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @copyright    XOOPS Project (http://xoops.org)
  * @license      GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @package
  * @since
  * @author       XOOPS Development Team
- * @version      $Id $
  */
 
 $moduleDirName = basename(dirname(__DIR__));

diff --git a/admin/header.php b/admin/header.php
@@ -16,7 +16,6 @@
  * @since          1.0.0
  * @author         Mengjue Shao <magic.shao@gmail.com>
  * @author         Susheng Yang <ezskyyoung@gmail.com>
- * @version        $Id: header.php 1 2010-2-9 ezsky$
  */
 
 include dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';

diff --git a/admin/index.php b/admin/index.php
@@ -10,12 +10,11 @@
  */
 
 /**
- * @copyright    The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @copyright    XOOPS Project (http://xoops.org)
  * @license      GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @package
  * @since
  * @author       XOOPS Development Team
- * @version      $Id $
  */
 
 include_once __DIR__ . '/admin_header.php';

diff --git a/admin/menu.php b/admin/menu.php
@@ -16,14 +16,13 @@
  * @since          1.0.0
  * @author         Mengjue Shao <magic.shao@gmail.com>
  * @author         Susheng Yang <ezskyyoung@gmail.com>
- * @version        $Id: menu.php 1 2010-2-9 ezsky$
  */
 
 $moduleDirName = basename(dirname(__DIR__));
 
-$moduleHandler = xoops_gethandler('module');
-$module         = $moduleHandler->getByDirname($moduleDirName);
-$pathIcon32     = '../../' . $module->getInfo('sysicons32');
+$moduleHandler = xoops_getHandler('module');
+$module        = $moduleHandler->getByDirname($moduleDirName);
+$pathIcon32    = '../../' . $module->getInfo('sysicons32');
 $pathModIcon32 = './' . $module->getInfo('modicons32');
 xoops_loadLanguage('modinfo', $module->dirname());
 
@@ -36,14 +35,17 @@
 $adminmenu[] = array(
     'title' => _AM_MODULEADMIN_HOME,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png');
+    'icon'  => $pathIcon32 . '/home.png'
+);
 
 $adminmenu[] = array(
     'title' => _MI_ABOUT_PAGE,
     'link'  => 'admin/admin.page.php',
-    'icon'  => $pathIcon32 . '/manage.png');
+    'icon'  => $pathIcon32 . '/manage.png'
+);
 
 $adminmenu[] = array(
     'title' => _AM_MODULEADMIN_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png');
+    'icon'  => $pathIcon32 . '/about.png'
+);