Merge pull request #4 from mambax7/master

2.39 Beta 1

Author: mambax7

.travis.yml

@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright    The XOOPS Project (http://www.xoops.org)
+ * @copyright    XOOPS Project (http://xoops.org)
  * @license      GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
  * @package      extCal
  * @since        2.5.0
@@ -24,7 +24,7 @@
 xoops_cp_header();
 
 $aboutAdmin = new ModuleAdmin();
-echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->addNavigation(basename(__FILE__));
 echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
 
 include_once __DIR__ . '/admin_footer.php';

htdocs/modules/extcal/admin/about.php

@@ -9,20 +9,15 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright::  The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license::    http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package::    extCal
+ * @copyright ::  XOOPS Project (http://xoops.org)
+ * @license   ::    http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package   ::    extCal
  * @subpackage:: admin
- * @since:       2.5.0
- * @author 	Mamba (www.xoops.org)
- * @version::     $Id $
+ * @since     :       2.5.0
+ * @author    Mamba (www.xoops.org)
+ * @version   ::     $Id $
  **/
 
-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://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();

htdocs/modules/extcal/admin/admin_footer.php

@@ -3,7 +3,7 @@
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
+//                       <http://xoops.org/>                             //
 //  ------------------------------------------------------------------------ //
 //  This program is free software; you can redistribute it and/or modify     //
 //  it under the terms of the GNU General Public License as published by     //
@@ -32,12 +32,12 @@
 
 global $xoopsModule;
 
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+$moduleDirName = $GLOBALS['xoopsModule']->getVar('dirname');
 
 // Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
+xoops_loadLanguage('admin', $moduleDirName);
+xoops_loadLanguage('modinfo', $moduleDirName);
+xoops_loadLanguage('main', $moduleDirName);
 
 $pathIcon16      = '../' . $xoopsModule->getInfo('icons16');
 $pathIcon32      = '../' . $xoopsModule->getInfo('icons32');
@@ -46,5 +46,5 @@
 if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) {
     include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
 } else {
-    redirect_header("../../../admin.php", 5, _AM_EXTCAL_MODULEADMIN_MISSING, false);
+    redirect_header('../../../admin.php', 5, _AM_EXTCAL_MODULEADMIN_MISSING, false);
 }