[xoops-svn] SF.net SVN: xoops:[8702] XoopsModules/smallworld/trunk

[<dj...@us...>]

Revision: 8702
          http://xoops.svn.sourceforge.net/xoops/?rev=8702&view=rev
Author:   djculex
Date:     2012-01-12 05:51:28 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Updated admin to use modulesAdmin

Modified Paths:
--------------
    XoopsModules/smallworld/trunk/admin/admin_header.php
    XoopsModules/smallworld/trunk/admin/index.php
    XoopsModules/smallworld/trunk/admin/menu.php
    XoopsModules/smallworld/trunk/xoops_version.php

Modified: XoopsModules/smallworld/trunk/admin/admin_header.php
===================================================================
--- XoopsModules/smallworld/trunk/admin/admin_header.php	2012-01-12 00:55:07 UTC (rev 8701)
+++ XoopsModules/smallworld/trunk/admin/admin_header.php	2012-01-12 05:51:28 UTC (rev 8702)
@@ -18,9 +18,24 @@
 	include '../../../mainfile.php';
 	include_once XOOPS_ROOT_PATH.'/class/xoopsmodule.php';
 	include XOOPS_ROOT_PATH.'/include/cp_functions.php';
+	require_once XOOPS_ROOT_PATH.'/include/cp_header.php';
+		global $xoopsModule;
+
+		$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+		if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+				include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+				
+			}else{
+				redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false); 
+				
+			}
+
+		$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+		$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+		$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+	
 	if ( $xoopsUser ) {
 	$xoopsModule = XoopsModule::getByDirname("smallworld");
-
 		if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) { 
 		redirect_header(XOOPS_URL."/",2,_NOPERM);
 		exit();
@@ -31,10 +46,4 @@
 	exit();
 	}
 
-	if ( file_exists("../language/".$xoopsConfig['language']."/admin.php") ) {
-	include("../language/".$xoopsConfig['language']."/admin.php");
-	}
-	else {
-	include("../language/english/admin.php");
-	}
 ?>
\ No newline at end of file

Modified: XoopsModules/smallworld/trunk/admin/index.php
===================================================================
--- XoopsModules/smallworld/trunk/admin/index.php	2012-01-12 00:55:07 UTC (rev 8701)
+++ XoopsModules/smallworld/trunk/admin/index.php	2012-01-12 05:51:28 UTC (rev 8702)
@@ -19,14 +19,16 @@
 require_once '../../../include/cp_header.php';
 include_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
 include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
+require_once XOOPS_ROOT_PATH . '/class/template.php';
 
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+
 if (!isset($xoopsTpl)) {$xoopsTpl = new XoopsTpl();}
 $xoopsTpl->xoops_setCaching(0);
 
 xoops_cp_header();
 
 $admin = new SmallworldAdmin();
+$index_admin = new ModuleAdmin();
 $tpl = new XoopsTpl();
 
 $ai = array();
@@ -155,7 +157,7 @@
 	
 $adminscript= <<<SCRIPT
 		var smallworld_url="XOOPS_URL/modules/smallworld/";
-		var $ = jQuery();
+		//var $ = jQuery();
 SCRIPT;
 	$xoTheme->addStyleSheet('modules/smallworld/css/SmallworldAdmin.css');
 	$xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');

Modified: XoopsModules/smallworld/trunk/admin/menu.php
===================================================================
--- XoopsModules/smallworld/trunk/admin/menu.php	2012-01-12 00:55:07 UTC (rev 8701)
+++ XoopsModules/smallworld/trunk/admin/menu.php	2012-01-12 05:51:28 UTC (rev 8702)
@@ -21,26 +21,21 @@
 
 $i = 1;
 $adminmenu[$i]['title'] = _MI_SMALLWORLD_ADMENU;
-$adminmenu[$i]['link'] = 'admin/index.php#smallworldadmin_tab1';
+$adminmenu[$i]['link'] = 'admin/moduleinfo.php';
 $adminmenu[$i]['icon'] = $pathIcon32."/home.png";
 
 $i++;
-$adminmenu[$i]['title'] = _MI_SMALLWORLDMENU_HELP;
-$adminmenu[$i]['link'] = "admin/index.php#smallworldadmin_tab5";
-$adminmenu[$i]['icon'] = $pathIcon32."/help.png";
-
-$i++;
 $adminmenu[$i]['title'] = _MI_SMALLWORLDMENU_USERADMIN;
-$adminmenu[$i]['link'] = "admin/index.php#smallworldadmin_tab3";
+$adminmenu[$i]['link'] = "admin/useradmin.php";
 $adminmenu[$i]['icon'] = $pathIcon32."/administration.png";
 
 $i++;
 $adminmenu[$i]['title'] = _MI_SMALLWORLDMENU_STATS;
-$adminmenu[$i]['link'] = "admin/index.php#smallworldadmin_tab2";
+$adminmenu[$i]['link'] = "admin/statistics.php";
 $adminmenu[$i]['icon'] = $pathIcon32."/stats.png";
 
 $i++;
-$adminmenu[$i]['title'] = _MI_SMALLWORLDMENU_ABOUT;
-$adminmenu[$i]['link'] = "admin/about.php";
-$adminmenu[$i]['icon'] = $pathIcon32."/about.png";
+$adminmenu[$i]['title'] = _MI_SMALLWORLDMENU_HELP;
+$adminmenu[$i]['link'] = "admin/help.php";
+$adminmenu[$i]['icon'] = $pathIcon32."/help.png";
 ?>
\ No newline at end of file

Modified: XoopsModules/smallworld/trunk/xoops_version.php
===================================================================
--- XoopsModules/smallworld/trunk/xoops_version.php	2012-01-12 00:55:07 UTC (rev 8701)
+++ XoopsModules/smallworld/trunk/xoops_version.php	2012-01-12 05:51:28 UTC (rev 8702)
@@ -27,7 +27,7 @@
 $modversion['license_url'] = 'www.gnu.org/licenses/gpl-2.0.html/';
 $modversion['status_version'] = 'RC';
 $modversion['release_date'] = '2011/12/24';
-$modversion['help'] = 'index.php#smallworldadmin_tab5';
+$modversion['help'] = '';
 $modversion['min_php'] = '5.3';
 $modversion['min_xoops'] = '2.5';
 $modversion['min_admin'] = '1.1';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.