From: <be...@us...> - 2012-03-18 09:15:36
|
Revision: 9152 http://xoops.svn.sourceforge.net/xoops/?rev=9152&view=rev Author: beckmi Date: 2012-03-18 09:15:30 +0000 (Sun, 18 Mar 2012) Log Message: ----------- Bug #3494895: When changing the # of visible entries, it goes to Admin Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/center.php XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/advisory.php XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/center.php XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/mymenu.php XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/advisory.php XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/prefix_manager.php Modified: XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt 2012-03-18 06:09:54 UTC (rev 9151) +++ XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt 2012-03-18 09:15:30 UTC (rev 9152) @@ -5,6 +5,7 @@ =============================== Bugfixes: - adding missing check for local timezone (XavierS) + - ID: 3494895: When changing the # of visible entries, it goes to Admin Improved: - replacing "msnbot" with "bingbot" in Protector (mamba) Added: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/advisory.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/advisory.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/advisory.php 2012-03-18 09:15:30 UTC (rev 9152) @@ -0,0 +1,12 @@ +<?php + +require '../../../mainfile.php' ; +if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; + +$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; +$mydirpath = dirname( dirname( __FILE__ ) ) ; +require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname + +require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/advisory.php' ; + +?> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/center.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/center.php 2012-03-18 06:09:54 UTC (rev 9151) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/center.php 2012-03-18 09:15:30 UTC (rev 9152) @@ -7,6 +7,7 @@ $mydirpath = dirname( dirname( __FILE__ ) ) ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname -require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin.php' ; +//require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin.php' ; +require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/center.php' ; ?> \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/prefix_manager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/prefix_manager.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/protector/admin/prefix_manager.php 2012-03-18 09:15:30 UTC (rev 9152) @@ -0,0 +1,12 @@ +<?php + +require '../../../mainfile.php' ; +if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; + +$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; +$mydirpath = dirname( dirname( __FILE__ ) ) ; +require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname + +require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/prefix_manager.php' ; + +?> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/advisory.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/advisory.php 2012-03-18 06:09:54 UTC (rev 9151) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/advisory.php 2012-03-18 09:15:30 UTC (rev 9152) @@ -1,5 +1,6 @@ <?php - +include '../../../include/cp_header.php'; +include 'admin_header.php'; $db =& XoopsDatabaseFactory::getDatabaseConnection(); // beggining of Output Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/center.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/center.php 2012-03-18 06:09:54 UTC (rev 9151) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/center.php 2012-03-18 09:15:30 UTC (rev 9152) @@ -1,9 +1,9 @@ <?php +//require_once XOOPS_ROOT_PATH.'/include/cp_header.php' ; +include_once 'admin_header.php'; //mb problem: it shows always the same "Center" tab require_once XOOPS_ROOT_PATH.'/class/pagenav.php' ; require_once dirname(dirname(__FILE__)).'/class/gtickets.php' ; -//include_once 'admin_header.php'; //mb problem: it shows always the - //dirty trick to get navigation working with system menus if(isset($_GET['num'])) { $_SERVER['REQUEST_URI'] = 'admin/center.php?page=center'; Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/mymenu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/mymenu.php 2012-03-18 06:09:54 UTC (rev 9151) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/mymenu.php 2012-03-18 09:15:30 UTC (rev 9152) @@ -1,9 +1,10 @@ <?php - // Skip for ORETEKI XOOPS if( defined( 'XOOPS_ORETEKI' ) ) return ; -global $xoopsModule ; +global $xoopsModule; +$mydirpath = dirname( dirname( __FILE__ ) ) ; + if( ! is_object( $xoopsModule ) ) die( '$xoopsModule is not set' ) ; // language files (modinfo.php) @@ -17,6 +18,8 @@ } else { // fallback english include_once "$mytrustdirpath/language/english/modinfo.php" ; + + } include dirname(dirname(__FILE__)).'/admin_menu.php' ; Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php 2012-03-18 06:09:54 UTC (rev 9151) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php 2012-03-18 09:15:30 UTC (rev 9152) @@ -1,5 +1,6 @@ <?php - +include '../../../include/cp_header.php'; +include 'admin_header.php'; require_once dirname(dirname(__FILE__)).'/class/gtickets.php' ; $db =& XoopsDatabaseFactory::getDatabaseConnection(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |