xoops-svn

[xoops-svn] SF.net SVN: xoops-svn:[10213] XoopsCore/branches/2.6.x/2.6.0/htdocs/class/ moduleadmin.php

[<du...@us...>]

Revision: 10213
          http://sourceforge.net/p/xoops/svn/10213
Author:   dugris
Date:     2012-10-12 00:32:32 +0000 (Fri, 12 Oct 2012)
Log Message:
-----------
View index in function renderIndex

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-10-11 08:41:48 UTC (rev 10212)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-10-12 00:32:32 UTC (rev 10213)
@@ -258,11 +258,11 @@
         $xoops = Xoops::getInstance();
         $this->_obj->loadAdminMenu();
         foreach (array_keys($this->_obj->adminmenu) as $i) {
-            if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php') {
+//            if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php') {
                 //$this->_obj->adminmenu[$i]['icon'] = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/" . $this->_obj->adminmenu[$i]['icon'];
                 $this->_obj->adminmenu[$i]['icon'] = XOOPS_URL . "/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon'];
                 $xoops->tpl->append('xo_admin_index_menu', $this->_obj->adminmenu[$i]);
-            }
+//            }
         }
         if ($this->_obj->getInfo('help')) {
             $help = array();

[xoops-svn] SF.net SVN: xoops-svn:[10252] XoopsCore/branches/2.6.x/2.6.0/htdocs/class/ moduleadmin.php

[<du...@us...>]

Revision: 10252
          http://sourceforge.net/p/xoops/svn/10252
Author:   dugris
Date:     2012-11-09 13:27:35 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
fix : renderNavigation

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-11-09 13:19:32 UTC (rev 10251)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-11-09 13:27:35 UTC (rev 10252)
@@ -346,11 +346,14 @@
     {
         $xoops = Xoops::getInstance();
 
-        $path = XOOPS_URL . "/media/xoops/images/icons/32/";
         $this->_obj->loadAdminMenu();
         foreach (array_keys($this->_obj->adminmenu) as $i) {
             if ($this->_obj->adminmenu[$i]['link'] == "admin/" . $menu) {
-                $this->_obj->adminmenu[$i]['icon'] = $path . $this->_obj->adminmenu[$i]['icon'];
+                if ( file_exists($xoops->path("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']) ) ) {
+                    $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+                } else {
+                    $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/modules/" . $xoops->module->dirname() . "/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+                }
                 $xoops->tpl->assign('xo_sys_navigation', $this->_obj->adminmenu[$i]);
                 if ($xoops->tpl_name == '') {
                     $xoops->tpl->display($this->getTplPath('nav'));

[xoops-svn] SF.net SVN: xoops-svn:[10300] XoopsCore/branches/2.6.x/2.6.0/htdocs/class/ moduleadmin.php

[<ma...@us...>]

Revision: 10300
          http://sourceforge.net/p/xoops/svn/10300
Author:   mageg
Date:     2012-12-02 16:23:25 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
little error in moduleadmin

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-12-02 16:21:02 UTC (rev 10299)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-12-02 16:23:25 UTC (rev 10300)
@@ -139,7 +139,7 @@
                     $text = $value;
                     $type = 'error';
                 }
-                if ($xoops->isActiveModule($value) == false) {
+                if ($xoops->isActiveModule($text) == false) {
                     $this->_itemConfigBoxLine[] = array('type' => $type, 'text' => sprintf(_AM_MODULEADMIN_CONFIG_EXTENSIONKO, $text));
                 } else {
                     $this->_itemConfigBoxLine[] = array('type' => 'accept', 'text' => sprintf(_AM_MODULEADMIN_CONFIG_EXTENSIONOK, $text));
@@ -155,7 +155,7 @@
                     $text = $value;
                     $type = 'error';
                 }
-                if ($xoops->isActiveModule($value) == false) {
+                if ($xoops->isActiveModule($text) == false) {
                     $this->_itemConfigBoxLine[] = array('type' => $type, 'text' => sprintf(_AM_MODULEADMIN_CONFIG_MODULEKO, $text));
                 } else {
                     $this->_itemConfigBoxLine[] = array('type' => 'accept', 'text' => sprintf(_AM_MODULEADMIN_CONFIG_MODULEOK, $text));