[xoops-svn] SF.net SVN: xoops-svn:[12302] XoopsModules/mymenus/trunk/mymenus

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

Revision: 12302
          http://sourceforge.net/p/xoops/svn/12302
Author:   beckmi
Date:     2014-02-10 12:35:06 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
fixed some minor issues with block options (mamba)

Modified Paths:
--------------
    XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
    XoopsModules/mymenus/trunk/mymenus/admin/menu.php
    XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
    XoopsModules/mymenus/trunk/mymenus/class/builder.php
    XoopsModules/mymenus/trunk/mymenus/class/links.php
    XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
    XoopsModules/mymenus/trunk/mymenus/xoops_version.php

Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php	2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php	2014-02-10 12:35:06 UTC (rev 12302)
@@ -108,7 +108,7 @@
 		foreach ($test['mod'] as $order=>$value) {
 
 			 $obj = $this_handler->get($order);
-		     $obj->setVar('weight', $i++);
+		     $obj->setVar('weight', ++$i);
 
 			 /*set submenu*/
 			 if(isset($value)){
@@ -201,11 +201,11 @@
 	$criteria = new CriteriaCompo();
 	$criteria->add(new Criteria('id', $id));
 	$criteria->add(new Criteria('pid', $id),'OR');
-	
+
 	//first delete links level 2
 	global $xoopsDB;
-	$query = "DELETE FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = ( 
-	SELECT id FROM ( 
+	$query = "DELETE FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = (
+	SELECT id FROM (
 	SELECT * FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = ".$id.") AS sec
 	);";
 	$result = $xoopsDB->queryF($query);

Modified: XoopsModules/mymenus/trunk/mymenus/admin/menu.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/menu.php	2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/admin/menu.php	2014-02-10 12:35:06 UTC (rev 12302)
@@ -28,19 +28,19 @@
 xoops_loadLanguage('admin', $dirname);
 
 $i = 0;
-$i++;
+++$i;
 $adminmenu[$i]["title"] = _MI_MYMENUS_ADMMENU0;
 $adminmenu[$i]["link"] = 'admin/index.php';
 $adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
+++$i;
 $adminmenu[$i]['title'] = _MI_MYMENUS_MENUSMANAGER;
 $adminmenu[$i]['link'] = "admin/admin_menus.php";
 $adminmenu[$i]["icon"] = $pathIcon32.'/manage.png';
-$i++;
+++$i;
 $adminmenu[$i]['title'] = _MI_MYMENUS_MENUMANAGER;
 $adminmenu[$i]['link'] = "admin/admin_links.php";
 $adminmenu[$i]["icon"] = $pathIcon32.'/insert_table_row.png';
-$i++;
+++$i;
 $adminmenu[$i]['title'] = _MI_MYMENUS_ABOUT;
 $adminmenu[$i]['link'] = "admin/about.php";
 $adminmenu[$i]["icon"] = $pathIcon32.'/about.png';

Modified: XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php	2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php	2014-02-10 12:35:06 UTC (rev 12302)
@@ -135,7 +135,7 @@
     $menuObj = $menus_handler->getAll($menucriteria, null, false, false);
     $itemsCount = count($menuObj);
     if ($menuObj) {
-        for ($i = 0; $i < $itemsCount; $i++) {
+        for ($i = 0; $i < $itemsCount; ++$i) {
 	       	$menucss = isset($menuObj[$i]['css']) ? $menuObj[$i]['css']: '';
         }
     }
@@ -160,7 +160,7 @@
 {
     //Unique ID
     if (!$options[3] || (isset($_GET['op']) && $_GET['op'] == 'clone')) $options[3] = time();
-
+$i = 0;
     $menus_handler =& xoops_getModuleHandler('menus', 'mymenus');
     xoops_loadLanguage('admin', 'mymenus');
 
@@ -177,16 +177,17 @@
 
     xoops_load('XoopsFormLoader');
 
-    //Menu
-    $form = "<b>" . _MB_MYMENUS_SELECT_MENU . "</b>&nbsp;";
-    $element = new XoopsFormSelect('', 'options[0]', $options[0], 1);
+    //Menu 0
+    $form    = "<b>" . _MB_MYMENUS_SELECT_MENU . "</b>&nbsp;";
+    $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
     $element->addOptionArray($menus);
     $form .= $element->render();
     $form .= "</select>\n&nbsp;&nbsp;<i>" . _MB_MYMENUS_SELECT_MENU_DSC . "</i><br /><br />";
 
-    //Skin
+    //Skin  1
+    ++$i;
     xoops_load('XoopsLists');
-    $temp_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/modules/mymenus/skins/", "");
+    $temp_skins    = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/modules/mymenus/skins/", "");
     $skins_options = array();
     foreach ($temp_skins as $key => $skin) {
         if (file_exists($GLOBALS['xoops']->path('modules/mymenus/skins/' . $skin . '/skin_version.php'))) {
@@ -194,48 +195,58 @@
         }
     }
     $form .= "<b>" . _MB_MYMENUS_SELECT_SKIN . "</b>&nbsp;";
-    $element = new XoopsFormSelect('', 'options[1]', $options[1], 1);
+    $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
     $element->addOptionArray($skins_options);
     $form .= $element->render();
     $form .= "</select>\n&nbsp;&nbsp;<i>" . _MB_MYMENUS_SELECT_SKIN_DSC . "</i><br /><br />";
 
-    //Use skin from,theme
+    //Use skin from,theme 2
+    ++$i;
     $form .= "<b>" . _MB_MYMENUS_USE_THEME_SKIN . "</b>&nbsp;";
-    $element = new XoopsFormRadioYN('', 'options[2]', $options[2]);
+    $element = new XoopsFormRadioYN('', 'options['.$i.'0]', $options[$i]);
     $form .= $element->render();
     $form .= "</select>\n&nbsp;&nbsp;<i>" . _MB_MYMENUS_USE_THEME_SKIN_DSC . "</i><br /><br />";
 
-	//Skin from theme - @luciorota
-    xoops_load('XoopsLists');
-    $temp_theme_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/themes/" . $GLOBALS['xoopsConfig']['theme_set'] . "/modules/mymenus/skins/", "");
-    $theme_skins_options = array();
-    foreach ($temp_theme_skins as $key => $theme_skin) {
-        if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '/skin_version.php')) {
-            $theme_skins_options[$theme_skin] = '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '';
-        }
-    }
+    //Skin from theme 3 - @luciorota
 
-    $form .= "<b>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME . "</b>&nbsp;";
-    $element = new XoopsFormSelect('', 'options[3]', $options[3], 1);
-    $element->addOption('', '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/menu');
-    $element->addOptionArray($theme_skins_options);
-    $form .= $element->render();
-    $form .= "</select>\n&nbsp;&nbsp;<i>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME_DSC . "</i><br /><br />";
 
-    //Display method
+    if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/')) {
+        ++$i;
+        xoops_load('XoopsLists');
+        $temp_theme_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/themes/" . $GLOBALS['xoopsConfig']['theme_set'] . "/modules/mymenus/skins/","");
+        if (isset($temp_theme_skins)) {
+            $theme_skins_options = array();
+            foreach ($temp_theme_skins as $key => $theme_skin) {
+                if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '/skin_version.php')) {
+                    $theme_skins_options[$theme_skin] = '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '';
+                }
+            }
+
+            $form .= "<b>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME . "</b>&nbsp;";
+            $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
+            $element->addOption('', '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/menu');
+            $element->addOptionArray($theme_skins_options);
+            $form .= $element->render();
+            $form .= "</select>\n&nbsp;&nbsp;<i>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME_DSC . "</i><br /><br />";
+}
+}
+
+    //Display method 4
+    ++$i;
     $display_options = array(
         'block'    => _MB_MYMENUS_DISPLAY_METHOD_BLOCK,
         'template' => _MB_MYMENUS_DISPLAY_METHOD_TEMPLATE
     );
     $form .= "<b>" . _MB_MYMENUS_DISPLAY_METHOD . "</b>&nbsp;";
-    $element = new XoopsFormSelect('', 'options[4]', $options[4], 1);
+    $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
     $element->addOptionArray($display_options);
     $form .= $element->render();
     $form .= "</select>\n&nbsp;&nbsp;<i>" . _MB_MYMENUS_DISPLAY_METHOD_DSC . "</i><br /><br />";
 
-    //Unique ID
+    //Unique ID 5
+    ++$i;
     $form .= "<b>" . _MB_MYMENUS_UNIQUEID . "</b>&nbsp;";
-    $element = new XoopsFormText('', 'options[5]', 10, 50, $options[5]);
+    $element = new XoopsFormText('', 'options['.$i.'0]', 10, 50, $options[$i]);
     $form .= $element->render();
     $form .= "\n&nbsp;&nbsp;<i>" . _MB_MYMENUS_UNIQUEID_DSC . "</i><br /><br />";
 

Modified: XoopsModules/mymenus/trunk/mymenus/class/builder.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/builder.php	2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/class/builder.php	2014-02-10 12:35:06 UTC (rev 12302)
@@ -114,7 +114,7 @@
         $query_string = $_SERVER['QUERY_STRING'] ? '?' . $_SERVER['QUERY_STRING'] : '';
         $self = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . $query_string;
 
-        //set a default page in case we don�t get matches
+        //set a default page in case we don't get matches
         $default = XOOPS_URL . "/index.php";
 
         //get all matching links

Modified: XoopsModules/mymenus/trunk/mymenus/class/links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/links.php	2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/class/links.php	2014-02-10 12:35:06 UTC (rev 12302)
@@ -106,7 +106,7 @@
             . " WHERE id = {$id}"
             ;
             $this->db->queryF($sql);
-            $i++;
+            ++$i;
         }
     }
 }

Modified: XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt	2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt	2014-02-10 12:35:06 UTC (rev 12302)
@@ -1,6 +1,7 @@
 <b><u>Version 1.5 Beta 1  (2014-02-08)</u></b>
 
 - merged @luciorota code: possibility to have more then one skin provided in the theme (bleekk)
+- fixed some minor issues with block options (mamba)
 
 <b><u>Version 1.454 Beta 1  (2014-01-29)</u></b>
 

Modified: XoopsModules/mymenus/trunk/mymenus/xoops_version.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/xoops_version.php	2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/xoops_version.php	2014-02-10 12:35:06 UTC (rev 12302)
@@ -30,7 +30,7 @@
 $modversion['license_url']    = "www.gnu.org/licenses/gpl-2.0.html";
 $modversion['official']       = 0;
 $modversion['image']          = "images/mymenus.png";
-$modversion['dirname'] 		  = basename(dirname(__FILE__));
+$modversion['dirname']        = basename(dirname(__FILE__));
 $modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
 $modversion['icons16']        = '../../Frameworks/moduleclasses/icons/16';
 $modversion['icons32']        = '../../Frameworks/moduleclasses/icons/32';
@@ -68,14 +68,14 @@
 // Sql
 $modversion['sqlfile']['mysql'] = "sql/mysql.sql";
 $i                              = 0;
-$i++;
+++$i;
 $modversion['tables'][$i] = "mymenus_links";
-$i++;
+++$i;
 $modversion['tables'][$i] = "mymenus_menus";
 
 // Config
 $i = 0;
-$i++;
+++$i;
 $modversion['config'][$i]['name']        = 'assign_method';
 $modversion['config'][$i]['title']       = '_MI_MENUS_CONF_ASSIGN_METHOD';
 $modversion['config'][$i]['description'] = '_MI_MENUS_CONF_ASSIGN_METHOD_DSC';
@@ -88,7 +88,7 @@
 
 // Blocks
 $i = 0;
-$i++;
+++$i;
 $modversion['blocks'][$i]['file']        = "mymenus_block.php";
 $modversion['blocks'][$i]['name']        = _MI_MYMENUS_BLK;
 $modversion['blocks'][$i]['description'] = _MI_MYMENUS_BLK_DSC;