[xoops-svn] SF.net SVN: xoops-svn:[12227] RMC/rmcommon/trunk/rmcommon

[<bi...@us...>]

Revision: 12227
          http://sourceforge.net/p/xoops/svn/12227
Author:   bitc3r0
Date:     2013-11-12 18:24:19 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
Some minor changes in twop6 theme

Modified Paths:
--------------
    RMC/rmcommon/trunk/rmcommon/class/proxy.php
    RMC/rmcommon/trunk/rmcommon/themes/twop6/class/twop6functions.class.php
    RMC/rmcommon/trunk/rmcommon/themes/twop6/theme.php

Modified: RMC/rmcommon/trunk/rmcommon/class/proxy.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/class/proxy.php	2013-11-10 14:54:25 UTC (rev 12226)
+++ RMC/rmcommon/trunk/rmcommon/class/proxy.php	2013-11-12 18:24:19 UTC (rev 12227)
@@ -31,7 +31,7 @@
 	
 	function get(){
 
-		global $exmConfig;
+		global $xoopsConfig;
 		// Creamos la petición
 		$hdrs = array(
 			'http'=>array(

Modified: RMC/rmcommon/trunk/rmcommon/themes/twop6/class/twop6functions.class.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/themes/twop6/class/twop6functions.class.php	2013-11-10 14:54:25 UTC (rev 12226)
+++ RMC/rmcommon/trunk/rmcommon/themes/twop6/class/twop6functions.class.php	2013-11-12 18:24:19 UTC (rev 12227)
@@ -66,16 +66,16 @@
     public function moduleMenu($m){
         
         global $xoopsModule, $xoopsUser;
-        
+
         if(!is_a($xoopsModule, 'XoopsModule')){
             $mod = RMFunctions::load_module($m);
         } else {
             if($xoopsModule->dirname()==$m)
                 $mod = $xoopsModule;
             else
-                $mod = RMFunctions::load_module($m);
+                $mod = RMFunctions::get()->load_module($m);
         }
-        
+
         if(!is_a($mod, 'XoopsModule')) return false;
         
         // Check user
@@ -119,10 +119,9 @@
     public function moduleSubmenu($submenu, $mod){
 
         if(!is_array($submenu)) return array();
-
         foreach($submenu as $i => $menu){
             if($menu=='divider') continue;
-            $submenu[$i]['link'] = strpos($menu['link'], 'http://')!==FALSE && strpos($menu['link'], 'ftp://')!==FALSE ? $menu['link'] : XOOPS_URL.'/modules/'.$mod->getVar('dirname','n').'/'.$menu['link'];
+            $submenu[$i]['link'] = strpos($menu['link'], 'http://')===TRUE && strpos($menu['link'], 'ftp://')===TRUE ? $menu['link'] : XOOPS_URL.'/modules/'.$mod->getVar('dirname','n').'/'.$menu['link'];
         }
         
         return $submenu;

Modified: RMC/rmcommon/trunk/rmcommon/themes/twop6/theme.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/themes/twop6/theme.php	2013-11-10 14:54:25 UTC (rev 12226)
+++ RMC/rmcommon/trunk/rmcommon/themes/twop6/theme.php	2013-11-12 18:24:19 UTC (rev 12227)
@@ -128,7 +128,7 @@
                         <?php endif; ?>
                         
                         <li class="dropdown">
-                            <a href="#" title="<?php _e('Modules Box','twop6'); ?>" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
                                 <i class="xo-icon xicon-modules"></i>
                                 <?php _e('Modules','twop6'); ?>
 	                            <b class="caret"></b>