Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10265] XoopsCore/branches/2.5.x/2.5.6/htdocs
|
From: <be...@us...> - 2012-11-21 05:10:10
|
Revision: 10265
http://sourceforge.net/p/xoops/svn/10265
Author: beckmi
Date: 2012-11-21 05:10:08 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Updating for compatibility with PHP 5.4, and consistency among modules
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsstory.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_footer.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_header.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/menu.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/language/english/help/help.html
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/xoops_version.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_footer.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_header.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/menu.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/xoops_version.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/module_icon.php
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -80,7 +80,7 @@
* @staticvar object The only instance of database class
* @return object Reference to the only instance of database class
*/
- function &getDatabase()
+ static function getDatabase()
{
static $database;
if (!isset($database)) {
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -233,7 +233,7 @@
* @static
* @staticvar object
*/
- function &getInstance()
+ static function getInstance()
{
static $instance;
if (!isset($instance)) {
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsstory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsstory.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsstory.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -23,7 +23,7 @@
}
$GLOBALS['xoopsLogger']->addDeprecated("'/class/xoopstory.php' is deprecated since XOOPS 2.5.4, please create your own class instead.");
include_once XOOPS_ROOT_PATH."/class/xoopstopic.php";
-include_once XOOPS_ROOT_PATH."/class/xoopsuser.php";
+include_once XOOPS_ROOT_PATH."/kernel/user.php";
class XoopsStory
{
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_footer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_footer.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_footer.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -17,9 +17,11 @@
* @version: $Id $
**/
-global $moduleInfo;
-
-echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("dirmoduleadmin")."/icons/32/xoopsmicrobutton.gif".' '." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
-echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></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();
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_header.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/admin_header.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -18,27 +18,29 @@
*/
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-//include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include("../../../include/cp_header.php");
-//require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/include/functions.php';
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- //return true;
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
- //return false;
- }
+global $xoopsModule;
-$myts =& MyTextSanitizer::getInstance();
-
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathIcon32 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+//if functions.php file exist
+//require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+
if ($xoopsUser) {
$moduleperm_handler =& xoops_gethandler('groupperm');
if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar('mid'), $xoopsUser->getGroups())) {
@@ -55,20 +57,8 @@
$xoopsTpl = new XoopsTpl();
}
+//$xoopsTpl->assign('pathIcon16', $pathIcon16);
-$xoopsTpl->assign('pathIcon16', $pathIcon16);
-
-// Load language files
-if (!@include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/" . $xoopsConfig['language'] . "/admin.php")) {
- include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/english/admin.php");
-}
-if (!@include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/" . $xoopsConfig['language'] . "/modinfo.php")) {
- include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/english/modinfo.php");
-}
-if (!@include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/" . $xoopsConfig['language'] . "/main.php")) {
- include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/english/main.php");
-}
-
if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
include_once XOOPS_ROOT_PATH . '/class/template.php';
$GLOBALS['xoopsTpl'] = new XoopsTpl();
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/menu.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/menu.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/admin/menu.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -17,22 +17,36 @@
* @version $Id$
*/
-$module_handler =& xoops_gethandler('module');
-$xoopsModule =& XoopsModule::getByDirname('pm');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon32 = $moduleInfo->getInfo('icons32');
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
$adminmenu = array();
$i = 1;
$adminmenu[$i]['title'] = _PM_MI_INDEX;
$adminmenu[$i]['link'] = "admin/admin.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/home.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/home.png' ;
$i++;
$adminmenu[$i]['title'] = _PM_MI_PRUNE;
$adminmenu[$i]['link'] = "admin/prune.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/prune.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/prune.png' ;
$i++;
$adminmenu[$i]['title'] = _PM_MI_ABOUT;
$adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/about.png';
\ No newline at end of file
+$adminmenu[$i]['icon'] = $pathIcon32.'/about.png';
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/docs/changelog.txt 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/docs/changelog.txt 2012-11-21 05:10:08 UTC (rev 10265)
@@ -1,3 +1,7 @@
+Version 1.09
+-------------------
+- updated code to make it consistent with other modules (mamba)
+
Version 1.08
-------------------
- Fixed XSS (Cross Site Scripting) vulnerability in pmlite.php (High-Tech Bridge Security Research Lab/trabis)
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/language/english/help/help.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/language/english/help/help.html 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/language/english/help/help.html 2012-11-21 05:10:08 UTC (rev 10265)
@@ -7,10 +7,11 @@
<p>No special measures necessary, follow the standard installation process – extract the /pm folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.</p>
<p>Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i" title="XOOPS Operations Manual">XOOPS Operations Manual</a> </p>
<h4 class="odd">Operating instructions</h4>
- <ul>
+ <p class="even">To set up this module you need to:</p>
+ <ul>
<li>You enter your Inbox directly from the front page, or by clicking on the top link "Go to module" in the PM's Admin area.</li>
<li>Configure your preferences for the module (see ‘Preferences’) and optionally the PM block if you intend to use it (see ‘Blocks’).</li>
- <li>You can do mass deleting of your messages by using the "Prune Messages" tab.</li>
+ <li>ou can do mass deleting of your messages by using the "Prune Messages" tab.</li>
</ul>
<h4 class="odd">Tutorial</h4>
<p class="even">Tutorial coming soon.</p>
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/xoops_version.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/pm/xoops_version.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -26,26 +26,31 @@
$modversion = array();
$modversion['name'] = _PM_MI_NAME;
-$modversion['version'] = 1.08;
+$modversion['version'] = 1.09;
$modversion['description'] = _PM_MI_DESC;
$modversion['author'] = "Jan Pedersen, Taiwen Jiang";
$modversion['credits'] = "The XOOPS Project, Wanikoo";
$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license'] = 'GNU GPL 2.0 or later';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
$modversion['image'] = "images/logo.png";
$modversion['dirname'] = "pm";
-$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
-$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
+$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2011/10/08';
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion['release_date'] = '2012/07/30';
+$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC";
-$modversion['min_php']='5.2';
-$modversion['min_xoops']="2.5.0";
+$modversion["module_status"] = "RC";
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = "2.5.5";
+$modversion['min_admin'] = '1.1';
+$modversion['min_db'] = array(
+ 'mysql' => '5.0.7',
+ 'mysqli' => '5.0.7'
+);
// Admin menu
// Set to 1 if you want to display menu generated by system module
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_footer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_footer.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_footer.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -16,7 +16,11 @@
* @author XOOPS Module Team
* @version $Id $
**/
-echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
-echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></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();
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_header.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/admin_header.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -17,22 +17,27 @@
* @version $Id$
*/
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-require_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-require '../../../include/cp_header.php';
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- //return true;
- }else{
- echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
- //return false;
- }
+global $xoopsModule;
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathIcon32 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+//if functions.php file exist
+//require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
$myts =& MyTextSanitizer::getInstance();
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
@@ -40,41 +45,10 @@
$xoopsTpl = new XoopsTpl();
}
-//xoops_cp_header();
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-//Load languages
-if (file_exists(
- XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/{$xoopsConfig['language']}/admin.php"
-)
-) {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname')
- . "/language/{$xoopsConfig['language']}/admin.php";
-} else {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/english/admin.php";
-}
-if (file_exists(
- XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/{$xoopsConfig['language']}/modinfo.php"
-)
-) {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname')
- . "/language/{$xoopsConfig['language']}/modinfo.php";
-} else {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/english/modinfo.php";
-}
-if (file_exists(
- XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/{$xoopsConfig['language']}/main.php"
-)
-) {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname')
- . "/language/{$xoopsConfig['language']}/main.php";
-} else {
- include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/language/english/main.php";
-}
-
-
xoops_loadLanguage('user');
if ( !isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl']) ) {
include_once $GLOBALS['xoops']->path( "/class/template.php" );
$GLOBALS['xoopsTpl'] = new XoopsTpl();
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/menu.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/menu.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/admin/menu.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -17,39 +17,53 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-
-$module_handler =& xoops_gethandler('module');
-$xoopsModule =& XoopsModule::getByDirname('profile');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon32 = $moduleInfo->getInfo('icons32');
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
$adminmenu = array();
$i = 1;
$adminmenu[$i]['title'] = _PROFILE_MI_HOME;
$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/home.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/home.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_USERS;
$adminmenu[$i]['link'] = "admin/user.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/users.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/users.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_CATEGORIES;
$adminmenu[$i]['link'] = "admin/category.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/category.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/category.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_FIELDS;
$adminmenu[$i]['link'] = "admin/field.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/index.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/index.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_STEPS;
$adminmenu[$i]['link'] = "admin/step.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/stats.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/stats.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_PERMISSIONS;
$adminmenu[$i]['link'] = "admin/permissions.php";
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/permissions.png' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/permissions.png' ;
$i++;
$adminmenu[$i]['title'] = _PROFILE_MI_ABOUT;
$adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/about.png';
\ No newline at end of file
+$adminmenu[$i]['icon'] = $pathIcon32.'/about.png';
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/docs/changelog.txt 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/docs/changelog.txt 2012-11-21 05:10:08 UTC (rev 10265)
@@ -1,3 +1,7 @@
+Version 1.64 RC
+-------------------
+- updated code to make it consistent with other modules (mamba)
+
Version 1.63 RC
-------------------
- added "Required" column in Fields with Toggle functionality (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/xoops_version.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/xoops_version.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -25,26 +25,31 @@
*/
$modversion = array();
$modversion['name'] = _PROFILE_MI_NAME;
-$modversion['version'] = 1.63;
+$modversion['version'] = 1.64;
$modversion['description'] = _PROFILE_MI_DESC;
$modversion['author'] = "Jan Pedersen, Taiwen Jiang, alfred, Wishcraft";
$modversion['credits'] = "Ackbarr, mboyden, marco, mamba, trabis, etc.";
$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license'] = 'GNU GPL 2.0 or later';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
$modversion['image'] = "images/logo.png";
$modversion['dirname'] = "profile";
-$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
-$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
+$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2011/10/08';
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion['release_date'] = '2012/07/30';
+$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC";
-$modversion['min_php']='5.2';
-$modversion['min_xoops']="2.5";
+$modversion["module_status"] = "RC";
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = "2.5.5";
+$modversion['min_admin'] = '1.1';
+$modversion['min_db'] = array(
+ 'mysql' => '5.0.7',
+ 'mysqli' => '5.0.7'
+);
// Admin menu
// Set to 1 if you want to display menu generated by system module
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/jquery.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/jquery.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/jquery.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -39,7 +39,7 @@
$GLOBALS['xoopsLogger']->activated = false;
include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
- include_once XOOPS_ROOT_PATH . '/class/xoopsmodule.php';
+ include_once XOOPS_ROOT_PATH . '/kernel/module.php';
include_once XOOPS_ROOT_PATH . '/modules/system/include/functions.php';
$tables = array();
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/users.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/users.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/users.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -213,7 +213,7 @@
global $xoopsDB;
include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
- include_once(XOOPS_ROOT_PATH."/class/xoopsmodule.php");
+ include_once(XOOPS_ROOT_PATH."/kernel/module.php");
$tables = array();
// Count comments (approved only: com_status == XOOPS_COMMENT_ACTIVE)
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/module_icon.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/module_icon.php 2012-11-21 04:52:11 UTC (rev 10264)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/module_icon.php 2012-11-21 05:10:08 UTC (rev 10265)
@@ -23,16 +23,7 @@
$file_base = 'module_icon' ;
}
-// branches by cores
-if( defined( 'ICMS_TRUST_PATH' ) ) {
- $draw_dirname = false ;
- $file_base .= '_icms' ;
-} else if( defined( 'XOOPS_CUBE_LEGACY' ) ) {
- $draw_dirname = false ;
- $file_base .= '_xcl' ;
-} else {
- $draw_dirname = true ;
-}
+$draw_dirname = true ;
// icon files must be PNG
$file = $file_base . '.png' ;
|
