[xoops-svn] SF.net SVN: xoops-svn:[12139] XoopsModules/wfdownloads/trunk/wfdownloads

[<be...@us...>]

Revision: 12139
          http://sourceforge.net/p/xoops/svn/12139
Author:   beckmi
Date:     2013-10-05 23:10:55 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
Reversing to "root-based relative path" for iconPath16/32

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

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php	2013-10-05 23:01:51 UTC (rev 12138)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php	2013-10-05 23:10:55 UTC (rev 12139)
@@ -31,10 +31,10 @@
 $module_handler =& xoops_gethandler('module');
 $xoopsModule =& $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
 
-//$pathIcon16 = XOOPS_URL .  $xoopsModule->getInfo('icons16');
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-//$pathIcon32 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons32');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathIcon16 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons32');
+$pathModuleAdmin = XOOPS_ROOT_PATH . '/' . $xoopsModule->getInfo('dirmoduleadmin');
+require_once $pathModuleAdmin . '/moduleadmin/moduleadmin.php';
 
 include_once dirname(dirname(__FILE__)) . '/include/common.php';
 
@@ -57,13 +57,12 @@
     'con_no' => "<img src='" . $pathIcon16 . '/off.png'."' alt='" . _AM_WFDOWNLOADS_ICO_CONBROKEN . "' title='" . _AM_WFDOWNLOADS_ICO_CONBROKEN . "' align='middle'>"
     );*/
 
+//if ( file_exists($GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php'))) {
+//    include_once $GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php');
+//} else {
+//    echo xoops_error('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/ is required!!!');
+//}
 
-if ( file_exists($GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php'))){
-    include_once $GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php');
-} else {
-    echo xoops_error('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/ is required!!!');
-}
-
 // Load language files
 xoops_loadLanguage('admin', $xoopsModule->dirname());
 xoops_loadLanguage('modinfo', $xoopsModule->dirname());
@@ -75,6 +74,6 @@
 $gperm_handler = xoops_gethandler('groupperm');
 
 if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
-	include_once(XOOPS_ROOT_PATH . "/class/template.php");
-	$xoopsTpl = new XoopsTpl();
+    include_once(XOOPS_ROOT_PATH . "/class/template.php");
+    $xoopsTpl = new XoopsTpl();
 }

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php	2013-10-05 23:01:51 UTC (rev 12138)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php	2013-10-05 23:10:55 UTC (rev 12139)
@@ -22,7 +22,7 @@
 
 $module_handler = xoops_gethandler('module');
 $module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
-$pathIcon32 = $module->getInfo('icons32');
+$pathIcon32 = '../../' . $module->getInfo('icons32');
 
 xoops_loadLanguage('admin', $module->dirname());
 

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php	2013-10-05 23:01:51 UTC (rev 12138)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php	2013-10-05 23:10:55 UTC (rev 12139)
@@ -60,8 +60,8 @@
     'mysqli' => '5.0.7'
 );
 $modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
-$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
 
 
 //help files
@@ -500,7 +500,7 @@
     'formtype'      => 'line_break',
     'valuetype'     => 'textbox',
     'default'       => 'head');
-    
+
 $modversion['config'][] = array(
     'name'          => 'download_minposts',
     'title'         => '_MI_WFDOWNLOADS_DOWNLOADMINPOSTS',