Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12300] XoopsModules/mymenus/trunk/mymenus
|
From: <be...@us...> - 2014-02-10 10:21:48
|
Revision: 12300
http://sourceforge.net/p/xoops/svn/12300
Author: beckmi
Date: 2014-02-10 10:21:40 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Updating to 1.50 Beta 1 (Bleekk)
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/admin/about.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php
XoopsModules/mymenus/trunk/mymenus/admin/index.php
XoopsModules/mymenus/trunk/mymenus/admin/menu.php
XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
XoopsModules/mymenus/trunk/mymenus/class/about.php
XoopsModules/mymenus/trunk/mymenus/class/builder.php
XoopsModules/mymenus/trunk/mymenus/class/menus.php
XoopsModules/mymenus/trunk/mymenus/class/plugin.php
XoopsModules/mymenus/trunk/mymenus/class/registry.php
XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
XoopsModules/mymenus/trunk/mymenus/docs/skins.txt
XoopsModules/mymenus/trunk/mymenus/include/functions.php
XoopsModules/mymenus/trunk/mymenus/language/english/about.php
XoopsModules/mymenus/trunk/mymenus/language/english/admin.php
XoopsModules/mymenus/trunk/mymenus/language/english/blocks.php
XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php
XoopsModules/mymenus/trunk/mymenus/plugins/constant/constant.php
XoopsModules/mymenus/trunk/mymenus/plugins/dynamic/dynamic.php
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php
XoopsModules/mymenus/trunk/mymenus/plugins/smarty/smarty.php
XoopsModules/mymenus/trunk/mymenus/skins/breadcrumb/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/breadcrumb/style.css
XoopsModules/mymenus/trunk/mymenus/skins/default/pro_dropdown_3.css
XoopsModules/mymenus/trunk/mymenus/skins/default/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/default/stuHover.js
XoopsModules/mymenus/trunk/mymenus/skins/default/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/mainmenu/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/mainmenu/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/stuHover.js
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/superfish/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/superfish/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/superfish_navbar/css/superfish-navbar.css
XoopsModules/mymenus/trunk/mymenus/skins/superfish_navbar/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/superfish_navbar/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/tw_blue.css
XoopsModules/mymenus/trunk/mymenus/sql/mysql.sql
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_about.html
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_adminmenu.html
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_menus.html
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Added Paths:
-----------
XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
XoopsModules/mymenus/trunk/mymenus/class/links.php
XoopsModules/mymenus/trunk/mymenus/css/admin.css
XoopsModules/mymenus/trunk/mymenus/images/actions/move_vertical-16.png
XoopsModules/mymenus/trunk/mymenus/images/edit.png
XoopsModules/mymenus/trunk/mymenus/images/loading.gif
XoopsModules/mymenus/trunk/mymenus/include/update.php
XoopsModules/mymenus/trunk/mymenus/include/xoops.php
XoopsModules/mymenus/trunk/mymenus/js/nestedSortable.js
XoopsModules/mymenus/trunk/mymenus/js/order.js
XoopsModules/mymenus/trunk/mymenus/skins/clean/
XoopsModules/mymenus/trunk/mymenus/skins/clean/index.html
XoopsModules/mymenus/trunk/mymenus/skins/clean/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/clean/template.html
XoopsModules/mymenus/trunk/mymenus/skins/default/index.html
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/index.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/images/index.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/index.html
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_links.html
Removed Paths:
-------------
XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php
XoopsModules/mymenus/trunk/mymenus/class/menu.php
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/language/arabic/
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/language/french/
XoopsModules/mymenus/trunk/mymenus/skins/tw_red/
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_menu.html
Modified: XoopsModules/mymenus/trunk/mymenus/admin/about.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/about.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/about.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -27,4 +27,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -23,5 +23,3 @@
$aboutObj = new MymenusAbout();
$aboutObj->render();
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -25,4 +25,4 @@
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -20,30 +20,30 @@
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+if ( !@include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php') ) {
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+ exit();
+}
+
+//global $xoopsModule;
+$moduleInfo = $module_handler->get($xoopsModule->getVar('mid'));
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+
+$indexAdmin = new ModuleAdmin();
+
include_once $GLOBALS['xoops']->path('class/template.php');
include_once $GLOBALS['xoops']->path('modules/mymenus/include/functions.php');
include_once $GLOBALS['xoops']->path('modules/mymenus/class/registry.php');
include_once $GLOBALS['xoops']->path('modules/mymenus/class/plugin.php');
-xoops_load('XoopsFormLoader');
-xoops_loadLanguage('modinfo', 'mymenus');
-
$mymenusTpl = new XoopsTpl();
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+$xoopsTpl->assign('pathIcon16', $pathIcon16);
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- //return true;
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
- //return false;
- }
-global $xoopsModule;
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
-
-if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH."/class/template.php");
- $xoopsTpl = new XoopsTpl();
-}
-$xoopsTpl->assign('pathIcon16', $pathIcon16);
\ No newline at end of file
+xoops_load('XoopsFormLoader');
+xoops_loadLanguage('modinfo', 'mymenus');
Added: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -0,0 +1,438 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package Mymenus
+ * @since 1.0
+ * @author trabis <lus...@gm...>, bleekk <bl...@ou...>
+ * @version $Id$
+ */
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+$menus_handler =& xoops_getModuleHandler('menus', 'mymenus');
+$criteria = new CriteriaCompo();
+$criteria->setSort('id');
+$criteria->setOrder('ASC');
+$menus_list = $menus_handler->getList($criteria);
+
+$indexAdmin = new ModuleAdmin();
+
+
+if (empty($menus_list)) {
+ redirect_header('admin_menus.php', 1, _AM_MYMENUS_MSG_NOMENUS);
+ exit;
+}
+
+if (isset($_REQUEST['menu_id']) && in_array($_REQUEST['menu_id'], array_keys($menus_list))) {
+ $menu_id = $_REQUEST['menu_id'];
+ $menu_title = $menus_list[$menu_id];
+} else {
+ $keys = array_keys($menus_list);
+ $menu_id = $keys[0];
+ $menu_title = $menus_list[$menu_id];
+}
+
+$mymenusTpl->assign('menu_id', $menu_id);
+$mymenusTpl->assign('menu_title', $menu_title);
+$mymenusTpl->assign('menus_list', $menus_list);
+
+$op = isset($_GET['op']) ? trim($_GET['op']) : (isset($_POST['op']) ? trim($_POST['op']) : 'list');
+
+$id = isset($_GET['id']) ? intval($_GET['id']) : (isset($_POST['id']) ? intval($_POST['id']) : null);
+$pid = isset($_GET['pid']) ? intval($_GET['pid']) : (isset($_POST['pid']) ? intval($_POST['pid']) : null);
+
+$limit = isset($_GET['limit']) ? intval($_GET['limit']) : (isset($_POST['limit']) ? intval($_POST['limit']) : 15);
+$start = isset($_GET['start']) ? intval($_GET['start']) : (isset($_POST['start']) ? intval($_POST['start']) : 0);
+$redir = isset($_GET['redir']) ? $_GET['redir'] : (isset($_POST['redir']) ? $_POST['redir'] : null);
+
+$weight = isset($_GET['weight']) ? intval($_GET['weight']) : (isset($_POST['weight']) ? intval($_POST['weight']) : 0);
+$visible = isset($_GET['visible']) ? intval($_GET['visible']) : (isset($_POST['visible']) ? intval($_POST['visible']) : 0);
+
+$mymenus_adminpage = 'admin_links.php';
+
+switch ($op) {
+ case 'add':
+ mymenus_admin_add();
+ break;
+ case 'form':
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_links.php');
+ echo mymenus_admin_form(null, $pid);
+ include 'admin_footer.php';
+ break;
+ case 'edit':
+ echo mymenus_admin_form($id);
+ break;
+ case 'editok':
+ mymenus_admin_edit($id);
+ break;
+ case 'del':
+ mymenus_admin_confirmdel($id, $redir);
+ break;
+ case 'delok':
+ mymenus_admin_del($id, $redir);
+ break;
+ case 'delall':
+ mymenus_admin_confirmdel(null, $redir, 'delallok');
+ break;
+ case 'delallok':
+ mymenus_admin_delall($redir);
+ break;
+ case 'move':
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_links.php');
+ mymenus_admin_move($id, $weight);
+ echo mymenus_admin_list($start);
+ include 'admin_footer.php';
+ break;
+ case 'toggle':
+ mymenus_admin_toggle($id, $visible);
+ break;
+ case 'order':
+ $order = $_POST['mod'];
+ parse_str($order,$test);
+
+ $i = 1;
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+ foreach ($test['mod'] as $order=>$value) {
+
+ $obj = $this_handler->get($order);
+ $obj->setVar('weight', $i++);
+
+ /*set submenu*/
+ if(isset($value)){
+ $obj->setVar('pid', $value);
+ }else{
+ $obj->setVar('pid', 0);
+ }
+ $this_handler->insert($obj);
+ $this_handler->update_weights($obj);
+
+ }
+ break;
+ case 'list':
+ default:
+ xoops_cp_header();
+ // Add module stylesheet
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/mymenus/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/Frameworks/moduleclasses/moduleadmin/css/admin.css');
+ // Define scripts
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/mymenus/js/nestedSortable.js');
+ //$xoTheme->addScript(XOOPS_URL . '/modules/mymenus/js/switchButton.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/mymenus/js/order.js');
+
+ echo $indexAdmin->addNavigation('admin_links.php');
+ echo mymenus_admin_list($start);
+
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH . '/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = true;
+ error_reporting(-1);
+
+
+ include 'admin_footer.php';
+ break;
+
+
+}
+
+function mymenus_admin_list($start = 0)
+{
+ global $mymenusTpl, $menu_id;
+
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+
+ $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
+
+ $count = $this_handler->getCount($criteria);
+ $mymenusTpl->assign('count', $count);
+ $criteria->setSort('weight');
+ $criteria->setOrder('ASC');
+
+ $menus = array();
+ $menusArray = array();
+ if ($count > 0) {
+ $menus = $this_handler->getObjects($criteria);
+ foreach ($menus as $menu) {
+ $array[] = $menu->getValues();
+ }
+ include_once $GLOBALS['xoops']->path('modules/mymenus/class/builder.php');
+ $builder = new MymenusBuilder($array);
+ $menusArray = $builder->render();
+ $mymenusTpl->assign('menus', $menusArray);
+ }
+
+ $mymenusTpl->assign('addform', mymenus_admin_form());
+
+ return $mymenusTpl->fetch($GLOBALS['xoops']->path('modules/mymenus/templates/static/mymenus_admin_links.html'));
+}
+
+function mymenus_admin_del($id, $redir = null)
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ if ($id <= 0) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1);
+ }
+
+ $this_handler =& xoops_getModuleHandler('links' , 'mymenus');
+ $obj = $this_handler->get($id);
+ if (!is_object($obj)) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1);
+ }
+
+ //get sub item
+ $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 (
+ SELECT * FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = ".$id.") AS sec
+ );";
+ $result = $xoopsDB->queryF($query);
+ //delete links level 0 and 1
+ if (!$this_handler->deleteAll($criteria)) {
+ xoops_cp_header();
+ xoops_error(_AM_MYMENUS_MSG_ERROR, $obj->getVar('id'));
+ xoops_cp_footer();
+ exit();
+ }
+
+ redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
+}
+
+function mymenus_admin_delall($redir = null)
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ $this_handler =& xoops_getModuleHandler('links' , 'mymenus');
+
+ if (!$this_handler->deleteAll()) {
+ redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_ERROR);
+ }
+
+ redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
+}
+
+function mymenus_admin_confirmdel($id = null, $redir = null, $op = 'delok')
+{
+
+ $arr = array();
+ $arr['op'] = $op;
+ $arr['id'] = $id;
+ if (!is_null($redir)) {
+ $arr['redir'] = $redir;
+ }
+
+ xoops_cp_header();
+ xoops_confirm($arr, $GLOBALS['mymenus_adminpage'], _AM_MYMENUS_MSG_AYSL);
+ xoops_cp_footer();
+}
+
+function mymenus_admin_add()
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ $this_handler =& xoops_getModuleHandler('links','mymenus');
+ $criteria = new CriteriaCompo(new Criteria('mid', $_POST['mid']));
+ $criteria->setSort('weight');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $menus = $this_handler->getObjects($criteria);
+ $weight = 1;
+ if (isset($menus[0]) && is_object($menus[0])) {
+ $weight = $menus[0]->getVar('weight') + 1;
+ }
+
+ $obj = $this_handler->create();
+ if (!isset($_POST['hooks'])) {
+ $_POST['hooks'] = array();
+ }
+ $obj->setVars($_POST);
+ $obj->setVar('weight', $weight);
+
+ if (!$this_handler->insert($obj)) {
+ $msg = _AM_MYMENUS_MSG_ERROR;
+ } else {
+ $this_handler->update_weights($obj);
+ $msg = _AM_MYMENUS_MSG_SUCCESS;
+ }
+
+ redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $obj->getVar('mid'), 2, $msg);
+}
+
+function mymenus_admin_edit($id)
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = false;
+ error_reporting(0);
+
+
+ $this_handler =& xoops_getModuleHandler('links','mymenus');
+ $obj = $this_handler->get($id);
+ $obj->setVars($_POST);
+
+ if (!$this_handler->insert($obj)) {
+ $msg = _AM_MYMENUS_MSG_ERROR;
+ } else {
+ $msg = _AM_MYMENUS_MSG_SUCCESS;
+ }
+
+ redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list', 2, $msg);
+}
+
+function mymenus_admin_form($id = null, $pid = null)
+{
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = false;
+ error_reporting(0);
+
+ global $menu_id;
+
+ $registry =& MymenusRegistry::getInstance();
+ $plugin =& MymenusPlugin::getInstance();
+
+ $this_handler =& xoops_getModuleHandler('links','mymenus');
+ $objArray = array();
+
+ if (isset($id)) {
+ $ftitle = _EDIT;
+ $obj = $this_handler->get($id);
+ $objArray = $obj->getValues();
+
+ } else {
+ $ftitle = _ADD;
+ $obj = $this_handler->create();
+ $objArray = $obj->getValues();
+ if (isset($pid)) {
+ $objArray['pid'] = $pid;
+ }
+ }
+
+ $form = new XoopsThemeForm($ftitle, 'admin_form', $GLOBALS['mymenus_adminpage'], "post", true);
+ $formtitle = new XoopsFormText(_AM_MYMENUS_MENU_TITLE, 'title', 50, 255, $objArray['title']);
+ $formalttitle = new XoopsFormText(_AM_MYMENUS_MENU_ALTTITLE, 'alt_title', 50, 255, $objArray['alt_title']);
+
+ $formlink = new XoopsFormText(_AM_MYMENUS_MENU_LINK, 'link', 50, 255, $objArray['link']);
+ $formimage = new XoopsFormText(_AM_MYMENUS_MENU_IMAGE, 'image', 50, 255, $objArray['image']);
+
+ $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
+ $criteria->add(new Criteria('id', $id, '<>'));
+ $criteria->setSort('weight');
+ $criteria->setOrder('ASC');
+
+ global $xoopsModule;
+ $pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+
+ $statontxt
+ = " <img src=". $pathIcon16 .'/1.png'.' '. "alt='" ._YES . "' /> " . _YES
+ . " ";
+ $statofftxt
+ = " <img src=". $pathIcon16 .'/0.png' .' '."alt='" . _NO . "' /> "
+ . _NO . " ";
+ $formvis = new XoopsFormRadioYN(_AM_MYMENUS_MENU_VISIBLE, 'visible', $objArray['visible'], $statontxt, $statofftxt);
+//---------------mamba
+
+ $formtarget = new XoopsFormSelect(_AM_MYMENUS_MENU_TARGET, "target", $objArray['target']);
+ $formtarget->addOption("_self", _AM_MYMENUS_MENU_TARG_SELF);
+ $formtarget->addOption("_blank", _AM_MYMENUS_MENU_TARG_BLANK);
+ $formtarget->addOption("_parent", _AM_MYMENUS_MENU_TARG_PARENT);
+ $formtarget->addOption("_top", _AM_MYMENUS_MENU_TARG_TOP);
+
+ $formgroups = new XoopsFormSelectGroup(_AM_MYMENUS_MENU_GROUPS, "groups", true, $objArray['groups'], 5, true);
+ $formgroups->setDescription(_AM_MYMENUS_MENU_GROUPS_HELP);
+
+ $formcss = new XoopsFormText(_AM_MYMENUS_MENU_CSS, 'css', 50, 255, $objArray['css']);
+
+ $form->addElement($formtitle, true);
+ $form->addElement($formalttitle);
+ $form->addElement($formlink);
+ $form->addElement($formimage);
+ $form->addElement($formparent);
+ $form->addElement($formvis);
+ $form->addElement($formtarget);
+ $form->addElement($formgroups);
+ $form->addElement($formhooks);
+ $form->addElement($formcss);
+
+ $tray = new XoopsFormElementTray('' ,'');
+ $tray->addElement(new XoopsFormButton('', 'submit_button', _SUBMIT, 'submit'));
+
+ $btn = new XoopsFormButton('', 'reset', _CANCEL, 'button');
+
+ if (isset($id)) {
+ $btn->setExtra('onclick="document.location.href=\'' . $GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $menu_id . ' \'"');
+ } else {
+ $btn->setExtra('onclick="document.getElementById(\'addform\').style.display = \'none\'; return false;"');
+ }
+
+ $tray->addElement($btn);
+ $form->addElement($tray);
+
+ if (isset($id)) {
+ $form->addElement(new XoopsFormHidden('op', 'editok'));
+ $form->addElement(new XoopsFormHidden('id', $id));
+ } else {
+ $form->addElement(new XoopsFormHidden('op', 'add'));
+ }
+
+ $form->addElement(new XoopsFormHidden('mid', $menu_id));
+
+ return $form->render();
+}
+
+function mymenus_admin_move($id, $weight)
+{
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+ $obj = $this_handler->get($id);
+ $obj->setVar('weight', $weight);
+ $this_handler->insert($obj);
+ $this_handler->update_weights($obj);
+}
+
+function mymenus_admin_toggle($id, $visible)
+{
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = true;
+ error_reporting(0);
+
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+ $obj = $this_handler->get($id);
+ $visible = ($obj->getVar('visible') == 1) ? 0 : 1;
+ $obj->setVar('visible', $visible);
+ $this_handler->insert($obj);
+ echo $obj->getVar('visible');
+}
Property changes on: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -1,402 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package Mymenus
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @version $Id: admin_menu.php 0 2010-07-21 18:47:04Z trabis $
- */
-
-include_once dirname(__FILE__) . '/admin_header.php';
-
-$menus_handler =& xoops_getModuleHandler('menus', 'mymenus');
-$criteria = new CriteriaCompo();
-$criteria->setSort('title');
-$criteria->setOrder('ASC');
-$menus_list = $menus_handler->getList($criteria);
-
-$indexAdmin = new ModuleAdmin();
-
-if (empty($menus_list)) {
- redirect_header('admin_menus.php', 1, _AM_MYMENUS_MSG_NOMENUS);
- exit;
-}
-
-if (isset($_REQUEST['menu_id']) && in_array($_REQUEST['menu_id'], array_keys($menus_list))){
- $menu_id = $_REQUEST['menu_id'];
- $menu_title = $menus_list[$menu_id];
-} else {
- $keys = array_keys($menus_list);
- $menu_id = $keys[0];
- $menu_title = $menus_list[$menu_id];
-}
-
-$mymenusTpl->assign('menu_id', $menu_id);
-$mymenusTpl->assign('menu_title', $menu_title);
-$mymenusTpl->assign('menus_list', $menus_list);
-
-
-$op = isset($_GET['op']) ? trim($_GET['op']) : (isset($_POST['op']) ? trim($_POST['op']) : 'list');
-
-$id = isset($_GET['id']) ? intval($_GET['id']) : (isset($_POST['id']) ? intval($_POST['id']) : null);
-$pid = isset($_GET['pid']) ? intval($_GET['pid']) : (isset($_POST['pid']) ? intval($_POST['pid']) : null);
-
-$limit = isset($_GET['limit']) ? intval($_GET['limit']) : (isset($_POST['limit']) ? intval($_POST['limit']) : 15);
-$start = isset($_GET['start']) ? intval($_GET['start']) : (isset($_POST['start']) ? intval($_POST['start']) : 0);
-$redir = isset($_GET['redir']) ? $_GET['redir'] : (isset($_POST['redir']) ? $_POST['redir'] : null);
-
-$weight = isset($_GET['weight']) ? intval($_GET['weight']) : (isset($_POST['weight']) ? intval($_POST['weight']) : 0);
-$visible = isset($_GET['visible']) ? intval($_GET['visible']) : (isset($_POST['visible']) ? intval($_POST['visible']) : 0);
-
-$mymenus_adminpage = 'admin_menu.php';
-
-switch ($op) {
- case 'add':
- mymenus_admin_add();
- break;
- case 'form':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- echo mymenus_admin_form(null, $pid);
- include 'admin_footer.php';
- break;
- case 'edit':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- echo mymenus_admin_form($id);
- include 'admin_footer.php';
- break;
- case 'editok':
- mymenus_admin_edit($id);
- break;
- case 'del':
- mymenus_admin_confirmdel($id, $redir);
- break;
- case 'delok':
- mymenus_admin_del($id, $redir);
- break;
- case 'delall':
- mymenus_admin_confirmdel(null, $redir, 'delallok');
- break;
- case 'delallok':
- mymenus_admin_delall($redir);
- break;
- case 'move':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- mymenus_admin_move($id, $weight);
- echo mymenus_admin_list($start);
- include 'admin_footer.php';
- break;
- case 'toggle':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- mymenus_admin_toggle($id, $visible);
- echo mymenus_admin_list($start);
- include 'admin_footer.php';
- break;
- case 'list':
- default:
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- echo mymenus_admin_list($start);
- include 'admin_footer.php';
- break;
-}
-
-function mymenus_admin_list($start = 0)
-{
- global $mymenusTpl, $menu_id;
-
- $this_handler =& xoops_getModuleHandler('menu', 'mymenus');
-
- $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
- //$criteria->add(new Criteria('pid', 0));
-
- $count = $this_handler->getCount($criteria);
- $mymenusTpl->assign('count', $count);
- $criteria->setSort('weight');
- $criteria->setOrder('ASC');
-
- $menus = array();
- $menusArray = array();
- if ($count > 0) {
- $menus = $this_handler->getObjects($criteria);
- foreach ($menus as $menu) {
- $array[] = $menu->getValues();
- }
- include_once $GLOBALS['xoops']->path('modules/mymenus/class/builder.php');
- $builder = new MymenusBuilder($array);
- $menusArray = $builder->render();
- $mymenusTpl->assign('menus', $menusArray);
- }
-
- $mymenusTpl->assign('addform', mymenus_admin_form());
-
- return $mymenusTpl->fetch($GLOBALS['xoops']->path('modules/mymenus/templates/static/mymenus_admin_menu.html'));
-}
-
-function mymenus_admin_del($id, $redir = null)
-{
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($GLOBALS['mymenus_adminpage'], 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- }
-
- if ($id <= 0) {
- redirect_header($GLOBALS['mymenus_adminpage'], 1);
- }
-
- $this_handler =& xoops_getModuleHandler('menu' , 'mymenus');
- $obj = $this_handler->get($id);
- if (!is_object($obj)) {
- redirect_header($GLOBALS['mymenus_adminpage'], 1);
- }
-
- if (!$this_handler->delete($obj)) {
- xoops_cp_header();
- xoops_error(_AM_MYMENUS_MSG_ERROR, $obj->getVar('id'));
- xoops_cp_footer();
- exit();
- }
-
- redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
-}
-
-function mymenus_admin_delall($redir = null)
-{
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($GLOBALS['mymenus_adminpage'], 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- }
-
- $this_handler =& xoops_getModuleHandler('menu' , 'mymenus');
-
- if (!$this_handler->deleteAll()) {
- redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_ERROR);
- }
-
- redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_SUCCESS);
-}
-
-function mymenus_admin_confirmdel($id = null, $redir = null, $op = 'delok')
-{
-
- $arr = array();
- $arr['op'] = $op;
- $arr['id'] = $id;
- if (!is_null($redir)){
- $arr['redir'] = $redir;
- }
-
- xoops_cp_header();
- xoops_confirm($arr, $GLOBALS['mymenus_adminpage'], _AM_MYMENUS_MSG_AYS);
- xoops_cp_footer();
-}
-
-
-function mymenus_admin_add()
-{
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- }
-
- $this_handler =& xoops_getModuleHandler('menu','mymenus');
- $criteria = new CriteriaCompo(new Criteria('mid', $_POST['mid']));
- $criteria->setSort('weight');
- $criteria->setOrder('DESC');
- $criteria->setLimit(1);
- $menus = $this_handler->getObjects($criteria);
- $weight = 1;
- if (isset($menus[0]) && is_object($menus[0])) {
- $weight = $menus[0]->getVar('weight') + 1;
- }
-
- $obj = $this_handler->create();
- if (!isset($_POST['hooks'])) {
- $_POST['hooks'] = array();
- }
- $obj->setVars($_POST);
- $obj->setVar('weight', $weight);
-
- if (!$this_handler->insert($obj)){
- $msg = _AM_MYMENUS_MSG_ERROR;
- } else {
- $this_handler->update_weights($obj);
- $msg = _AM_MYMENUS_MSG_SUCCESS;
- }
-
- redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $obj->getVar('mid'), 2, $msg);
-}
-
-function mymenus_admin_edit($id)
-{
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- }
-
- $this_handler =& xoops_getModuleHandler('menu','mymenus');
- $obj = $this_handler->get($id);
- if (!isset($_POST['hooks'])) {
- $_POST['hooks'] = array();
- }
- $obj->setVars($_POST);
-
- if (!$this_handler->insert($obj)){
- $msg = _AM_MYMENUS_MSG_ERROR;
- }else{
- $msg = _AM_MYMENUS_MSG_SUCCESS;
- }
-
- redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list', 2, $msg);
-}
-
-function mymenus_admin_form($id = null, $pid = null)
-{
- global $menu_id;
-
- $registry =& MymenusRegistry::getInstance();
- $plugin =& MymenusPlugin::getInstance();
-
- $this_handler =& xoops_getModuleHandler('menu','mymenus');
- $objArray = array();
-
- if (isset($id)) {
- $ftitle = _EDIT;
- $obj = $this_handler->get($id);
- $objArray = $obj->getValues();
-
- } else {
- $ftitle = _ADD;
- $obj = $this_handler->create();
- $objArray = $obj->getValues();
- if (isset($pid)) {
- $objArray['pid'] = $pid;
- }
- }
-
- $form = new XoopsThemeForm($ftitle, 'admin_form', $GLOBALS['mymenus_adminpage'], "post", true);
- $formtitle = new XoopsFormText(_AM_MYMENUS_MENU_TITLE, 'title', 50, 255, $objArray['title']);
- $formalttitle = new XoopsFormText(_AM_MYMENUS_MENU_ALTTITLE, 'alt_title', 50, 255, $objArray['alt_title']);
-
- $formlink = new XoopsFormText(_AM_MYMENUS_MENU_LINK, 'link', 50, 255, $objArray['link']);
- /*$plugin->triggerEvent('FormLinkDescription');
- $formlink->setDescription($registry->getEntry('form_link_description')); */
- $formimage = new XoopsFormText(_AM_MYMENUS_MENU_IMAGE, 'image', 50, 255, $objArray['image']);
-
- $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
- $criteria->add(new Criteria('id', $id, '<>'));
- // $criteria->add(new Criteria('pid', 0));
- $criteria->setSort('weight');
- $criteria->setOrder('ASC');
-
- $results = $this_handler->getAll($criteria, array('title', 'id', 'pid')/*, false, false*/);
- include_once $GLOBALS['xoops']->path('class/tree.php');
- $parent_tree = new XoopsObjectTree($results, 'id', 'pid');
- $parent_select = $parent_tree->makeSelBox('pid', 'title', '-- ', $objArray['pid'], true);
- $formparent = new XoopsFormLabel(_AM_MYMENUS_MENU_PARENT, $parent_select);
-//---------------mamba
-// $formvis = new XoopsFormSelect(_AM_MYMENUS_MENU_VISIBLE, "visible", $objArray['visible']);
-// $formvis->addOption("0", _NO);
-// $formvis->addOption("1", _YES);
-
- global $xoopsModule;
- $pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-
- $statontxt
- = " <img src=". $pathIcon16 .'/1.png'.' '. "alt='" ._YES . "' /> " . _YES
- . " ";
- $statofftxt
- = " <img src=". $pathIcon16 .'/0.png' .' '."alt='" . _NO . "' /> "
- . _NO . " ";
- $formvis = new XoopsFormRadioYN(_AM_MYMENUS_MENU_VISIBLE, 'visible', $objArray['visible'], $statontxt, $statofftxt);
-//---------------mamba
-
- $formtarget = new XoopsFormSelect(_AM_MYMENUS_MENU_TARGET, "target", $objArray['target']);
- $formtarget->addOption("_self", _AM_MYMENUS_MENU_TARG_SELF);
- $formtarget->addOption("_blank", _AM_MYMENUS_MENU_TARG_BLANK);
- $formtarget->addOption("_parent", _AM_MYMENUS_MENU_TARG_PARENT);
- $formtarget->addOption("_top", _AM_MYMENUS_MENU_TARG_TOP);
-
- $formgroups = new XoopsFormSelectGroup(_AM_MYMENUS_MENU_GROUPS, "groups", true, $objArray['groups'], 5, true);
- $formgroups->setDescription(_AM_MYMENUS_MENU_GROUPS_HELP);
-
- //$formhooks = new XoopsFormTextArea(_AM_MYMENUS_MENU_HOOKS, "hooks", $objArray['hooks'], 7, 60);
-
- $formhooks = new XoopsFormSelect(_AM_MYMENUS_MENU_ACCESS_FILTER, "hooks", $objArray['hooks'], 5, true);
- $plugin->triggerEvent('AccessFilter');
- $results = $registry->getEntry('access_filter');
- if ($results) {
- foreach ($results as $result) {
- $formhooks->addOption($result['method'], $result['name']);
- }
- }
-
- $formcss = new XoopsFormText(_AM_MYMENUS_MENU_CSS, 'css', 50, 255, $objArray['css']);
-
- $form->addElement($formtitle, true);
- $form->addElement($formalttitle);
- $form->addElement($formlink);
- $form->addElement($formimage);
- $form->addElement($formparent);
- $form->addElement($formvis);
- $form->addElement($formtarget);
- $form->addElement($formgroups);
- $form->addElement($formhooks);
- $form->addElement($formcss);
- //$form->addElement($formhooks2);
-
- $tray = new XoopsFormElementTray('' ,'');
- $tray->addElement(new XoopsFormButton('', 'submit_button', _SUBMIT, 'submit'));
-
- $btn = new XoopsFormButton('', 'reset', _CANCEL, 'button');
-
- if (isset($id)){
- $btn->setExtra('onclick="document.location.href=\'' . $GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $menu_id . ' \'"');
- }else{
- $btn->setExtra('onclick="document.getElementById(\'addform\').style.display = \'none\'; return false;"');
- }
-
- $tray->addElement($btn);
- $form->addElement($tray);
-
- if (isset($id)){
- $form->addElement(new XoopsFormHidden('op', 'editok'));
- $form->addElement(new XoopsFormHidden('id', $id));
- }else{
- $form->addElement(new XoopsFormHidden('op', 'add'));
- }
-
- $form->addElement(new XoopsFormHidden('mid', $menu_id));
-
- return $form->render();
-}
-
-function mymenus_admin_move($id, $weight)
-{
- $this_handler =& xoops_getModuleHandler('menu', 'mymenus');
- $obj = $this_handler->get($id);
- $obj->setVar('weight', $weight);
- $this_handler->insert($obj);
- $this_handler->update_weights($obj);
-}
-
-function mymenus_admin_toggle($id, $visible)
-{
- $visible = ($visible == 1) ? 0 : 1;
- $this_handler =& xoops_getModuleHandler('menu', 'mymenus');
- $obj = $this_handler->get($id);
- $obj->setVar('visible', $visible);
- $this_handler->insert($obj);
-}
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -30,8 +30,6 @@
$mymenus_adminpage = 'admin_menus.php';
-$indexAdmin = new ModuleAdmin();
-
switch ($op) {
case 'add':
mymenus_admin_add();
@@ -60,9 +58,8 @@
break;
case 'list':
default:
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menus.php');
- //mymenus_adminMenu(0, _MI_MYMENUS_MENUSMANAGER);
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_menus.php');
echo mymenus_admin_list($start);
include 'admin_footer.php';
break;
@@ -140,7 +137,7 @@
exit();
}
- $this_handler =& xoops_getModuleHandler('menu' , 'mymenus');
+ $this_handler =& xoops_getModuleHandler('links' , 'mymenus');
$criteria = new Criteria('mid', $id);
$this_handler->deleteAll($criteria);
unset($criteria);
@@ -172,11 +169,10 @@
$arr['redir'] = $redir;
}
xoops_cp_header();
- xoops_confirm($arr, $GLOBALS['mymenus_adminpage'], _AM_MYMENUS_MSG_AYS);
+ xoops_confirm($arr, $GLOBALS['mymenus_adminpage'], _AM_MYMENUS_MSG_AYSC);
xoops_cp_footer();
}
-
function mymenus_admin_add()
{
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -187,7 +183,7 @@
$obj = $this_handler->create();
$obj->setVars($_POST);
- if (!$this_handler->insert($obj)){
+ if (!$this_handler->insert($obj)) {
$msg = _AM_MYMENUS_MSG_ERROR;
} else {
$msg = _AM_MYMENUS_MSG_SUCCESS;
@@ -205,7 +201,7 @@
$obj = $this_handler->get($id);
$obj->setVars($_POST);
- if (!$this_handler->insert($obj)){
+ if (!$this_handler->insert($obj)) {
$msg = _AM_MYMENUS_MSG_ERROR;
} else {
$msg = _AM_MYMENUS_MSG_SUCCESS;
@@ -232,15 +228,18 @@
$form = new XoopsThemeForm($ftitle, 'admin_form', $GLOBALS['mymenus_adminpage'], "post", true);
$form->addElement(new XoopsFormText(_AM_MYMENUS_MENU_TITLE, 'title', 50, 255, $objArray['title']), true);
+ //
+ $form->addElement(new XoopsFormText(_AM_MYMENUS_MENU_CSS, 'css', 50, 255, $objArray['css']),false);
+ //
$tray = new XoopsFormElementTray('' ,'');
$tray->addElement(new XoopsFormButton('', 'submit_button', _SUBMIT, 'submit'));
$btn = new XoopsFormButton('', 'reset', _CANCEL, 'button');
- if (isset($id)){
+ if (isset($id)) {
$btn->setExtra('onclick="document.location.href=\'' . $GLOBALS['mymenus_adminpage'] . '?op=list\'"');
- }else{
+ } else {
$btn->setExtra('onclick="document.getElementById(\'addform\').style.display = \'none\'; return false;"');
}
@@ -256,5 +255,3 @@
return $form->render();
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/admin/index.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/index.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/index.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -18,15 +18,12 @@
* @version $Id: index.php 0 2010-07-21 18:47:04Z trabis $
*/
-
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+//require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
include_once dirname(__FILE__) . '/admin_header.php';
-xoops_cp_header();
+ xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
-
- echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
-include "admin_footer.php";
\ No newline at end of file
+ include 'admin_footer.php';
Modified: XoopsModules/mymenus/trunk/mymenus/admin/menu.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/menu.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/menu.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -20,14 +20,14 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-$dirname = basename(dirname(dirname(__FILE__)));
+$dirname = basename(dirname(dirname(__FILE__)));
$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
+$module = $module_handler->getByDirname($dirname);
$pathIcon32 = $module->getInfo('icons32');
-xoops_loadLanguage('admin', $dirname);
-
-$i = -1;
+xoops_loadLanguage('admin', $dirname);
+
+$i = 0;
$i++;
$adminmenu[$i]["title"] = _MI_MYMENUS_ADMMENU0;
$adminmenu[$i]["link"] = 'admin/index.php';
@@ -38,7 +38,7 @@
$adminmenu[$i]["icon"] = $pathIcon32.'/manage.png';
$i++;
$adminmenu[$i]['title'] = _MI_MYMENUS_MENUMANAGER;
-$adminmenu[$i]['link'] = "admin/admin_menu.php";
+$adminmenu[$i]['link'] = "admin/admin_links.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/insert_table_row.png';
$i++;
$adminmenu[$i]['title'] = _MI_MYMENUS_ABOUT;
@@ -46,4 +46,4 @@
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
//$mymenus_adminmenu = $adminmenu;
-
+unset($i);
Modified: XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -38,8 +38,7 @@
$menu_id = $options[0];
- $this_handler =& xoops_getModuleHandler('menu', 'mymenus');
-
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
$criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
$criteria->setSort('weight');
$criteria->setOrder('ASC');
@@ -47,8 +46,8 @@
$menus = $this_handler->getAll($criteria, null, false, false);
unset($criteria);
- foreach ($menus as $key => $menu) {
- $registry->setEntry('menu', $menu);
+ foreach ($menus as $key => $links) {
+ $registry->setEntry('menu', $links);
$registry->setEntry('has_access', 'yes');
$plugin->triggerEvent('HasAccess');
if ($registry->getEntry('has_access') == 'no') {
@@ -59,8 +58,8 @@
$count = count($menus);
if ($count == 0) return $block;
- foreach ($menus as $key => $menu) {
- $registry->setEntry('link_array', $menu);
+ foreach ($menus as $key => $links) {
+ $registry->setEntry('link_array', $links);
$plugin->triggerEvent('TitleDecoration');
$plugin->triggerEvent('AlttitleDecoration');
$plugin->triggerEvent('LinkDecoration');
@@ -82,7 +81,7 @@
//get extra files from skins
$skin = $options[1];
- $skin_info = mymenus_getSkinInfo($skin, $options[2]);
+ $skin_info = mymenus_getSkinInfo($skin, $options[2], $options[3]);
if (isset($skin_info['css'])) {
$css = array_merge($css, $skin_info['css']);
@@ -129,10 +128,24 @@
$blockTpl->assign('skinurl', $skin_info['url']);
$blockTpl->assign('skinpath', $skin_info['path']);
+ /*assign ul class*/
+ $menucss='';
+ $menus_handler = xoops_getModuleHandler('menus', 'mymenus');
+ $menucriteria = new CriteriaCompo(new Criteria('id', $menu_id));
+ $menuObj = $menus_handler->getAll($menucriteria, null, false, false);
+ $itemsCount = count($menuObj);
+ if ($menuObj) {
+ for ($i = 0; $i < $itemsCount; $i++) {
+ $menucss = isset($menuObj[$i]['css']) ? $menuObj[$i]['css']: '';
+ }
+ }
+ if(!$menucss){$menucss = "";}
+ $blockTpl->assign('menucss', $menucss);
+
$block['content'] = $blockTpl->fetch($skin_info['template']);
- if ($options[3] == 'template') {
- $xoopsTpl->assign('xoops_menu_' . $options[4] , $block['content']);
+ if ($options[4] == 'template') {
+ $xoopsTpl->assign('xoops_links_' . $options[5] , $block['content']);
$block = array();
}
@@ -192,25 +205,40 @@
$form .= $element->render();
$form .= "</select>\n <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 . '';
+ }
+ }
+
+ $form .= "<b>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME . "</b> ";
+ $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 <i>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME_DSC . "</i><br /><br />";
+
//Display method
$display_options = array(
'block' => _MB_MYMENUS_DISPLAY_METHOD_BLOCK,
'template' => _MB_MYMENUS_DISPLAY_METHOD_TEMPLATE
);
$form .= "<b>" . _MB_MYMENUS_DISPLAY_METHOD . "</b> ";
- $element = new XoopsFormSelect('', 'options[3]', $options[3], 1);
+ $element = new XoopsFormSelect('', 'options[4]', $options[4], 1);
$element->addOptionArray($display_options);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_DISPLAY_METHOD_DSC . "</i><br /><br />";
//Unique ID
$form .= "<b>" . _MB_MYMENUS_UNIQUEID . "</b> ";
- $element = new XoopsFormText('', 'options[4]', 10, 50, $options[4]);
+ $element = new XoopsFormText('', 'options[5]', 10, 50, $options[5]);
$form .= $element->render();
$form .= "\n <i>" . _MB_MYMENUS_UNIQUEID_DSC . "</i><br /><br />";
return $form;
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/class/about.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/about.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/class/about.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -20,7 +20,6 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
/**
* Class About is a simple class that lets you build an about page
* @author The SmartFactory <www.smartfactory.ca>
@@ -79,6 +78,7 @@
function sanitize($value)
{
$myts =& MyTextSanitizer::getInstance();
+
return $myts->displayTarea($value, 1);
}
@@ -169,5 +169,3 @@
xoops_cp_footer();
}
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/class/builder.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/builder.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/class/builder.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -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\xB4t get matches
+ //set a default page in case we don�t get matches
$default = XOOPS_URL . "/index.php";
//get all matching links
@@ -173,5 +173,3 @@
}
}
-
-?>
\ No newline at end of file
Added: XoopsModules/mymenus/trunk/mymenus/class/links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/links.php (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/class/links.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -0,0 +1,112 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package Mymenus
+ * @since 1.0
+ * @author trabis <lus...@gm...>
+ * @version $Id$
+ */
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+class MymenusLinks extends XoopsObject
+{
+ /**
+ * constructor
+ */
+ function __construct()
+ {
+ $this->initVar('id', XOBJ_DTYPE_INT);
+ $this->initVar('pid', XOBJ_DTYPE_INT);
+ $this->initVar('mid', XOBJ_DTYPE_INT);
+ $this->initVar('title', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('alt_title', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('visible', XOBJ_DTYPE_INT, 1);
+ $this->initVar('link', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('weight', XOBJ_DTYPE_INT, 255);
+ $this->initVar('target', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('groups', XOBJ_DTYPE_ARRAY, serialize(array(XOOPS_GROUP_ANONYMOUS, XOOPS_GROUP_USERS)));
+ $this->initVar('hooks', XOBJ_DTYPE_ARRAY, serialize(array()));
+ $this->initVar('image', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('css', XOBJ_DTYPE_TXTBOX);
+ }
+
+ function checkAccess()
+ {
+ $hooks = $this->getHooks();
+ $hooks['mymenus'][] = 'checkAccess';
+ foreach ($hooks as $hookname => $hook) {
+ if (!mymenus_hook($hookname, 'checkAccess', array('links' => $this))) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ function getHooks()
+ {
+ $ret = array();
+ $data = $this->getVar('hooks', 'n');
+ if (!$data) return $ret;
+ $lines = explode("\n", $data);
+ foreach ($lines as $line) {
+ $line = trim($line);
+ $line = explode('|', $line);
+ $hook = trim($line[0]);
+ $method = isset($line[1]) ? trim($line[1]) : '';
+ //$info = split(',', trim($line[0]));
+ $ret[$hook][] = $method;
+ }
+ return $ret;
+ }
+
+}
+
+class MymenusLinksHandler extends XoopsPersistableObjectHandler
+{
+
+ function __construct(&$db)
+ {
+ parent::__construct($db, 'mymenus_links', 'MymenusLinks', 'id', 'title');
+ }
+
+ function update_weights(&$obj)
+ {
+ $sql = "UPDATE " . $this->table
+ . " SET weight = weight+1"
+ . " WHERE weight >= " . $obj->getVar('weight')
+ . " AND id <> " . $obj->getVar('id')
+ /*. " AND pid = " . $obj->getVar('pid')*/
+ . " AND mid = " . $obj->getVar('mid')
+ ;
+ $this->db->queryF($sql);
+
+ $sql = "SELECT id FROM " . $this->table
+ . " WHERE mid = " . $obj->getVar('mid')
+ /*. " AND pid = " . $obj->getVar('pid')*/
+ . " ORDER BY weight ASC"
+ ;
+ $result = $this->db->query($sql);
+ $i = 1; //lets start at 1 please!
+ while (list($id) = $this->db->fetchrow($result)) {
+ $sql = "UPDATE " . $this->table
+ . " SET weight = {$i}"
+ . " WHERE id = {$id}"
+ ;
+ $this->db->queryF($sql);
+ $i++;
+ }
+ }
+}
Property changes on: XoopsModules/mymenus/trunk/mymenus/class/links.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: XoopsModules/mymenus/trunk/mymenus/class/menu.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/menu.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/class/menu.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -1,114 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package Mymenus
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @version $Id: menu.php 0 2010-07-21 18:47:04Z trabis $
- */
-
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
-class MymenusMenu extends XoopsObject
-{
- /**
- * constructor
- */
- function __construct()
- {
- $this->initVar('id', XOBJ_DTYPE_INT);
- $this->initVar('pid', XOBJ_DTYPE_INT);
- $this->initVar('mid', XOBJ_DTYPE_INT);
- $this->initVar('title', XOBJ_DTYPE_TXTBOX);
- $this->initVar('alt_title', XOBJ_DTYPE_TXTBOX);
- $this->initVar('visible', XOBJ_DTYPE_INT, 1);
- $this->initVar('link', XOBJ_DTYPE_TXTBOX);
- $this->initVar('weight', XOBJ_DTYPE_INT, 255);
- $this->initVar('target', XOBJ_DTYPE_TXTBOX);
- $this->initVar('groups', XOBJ_DTYPE_ARRAY, serialize(array(XOOPS_GROUP_ANONYMOUS, XOOPS_GROUP_USERS)));
- $this->initVar('hooks', XOBJ_DTYPE_ARRAY, serialize(array()));
- $this->initVar('image', XOBJ_DTYPE_TXTBOX);
- $this->initVar('css', XOBJ_DTYPE_TXTBOX);
- }
-
- function checkAccess()
- {
- $hooks = $this->getHooks();
- $hooks['mymenus'][] = 'checkAccess';
- foreach ($hooks as $hookname => $hook) {
- if (!mymenus_hook($hookname, 'checkAccess', array('menu' => $this))) {
- return false;
- }
- }
-
- return true;
- }
-
- function getHooks()
- {
- $ret = array();
- $data = $this->getVar('hooks', 'n');
- if (!$data) return $ret;
- $lines = explode("\n", $data);
- foreach ($lines as $line) {
- $line = trim($line);
- $line = explode('|', $line);
- $hook = trim($line[0]);
- $method = isset($line[1]) ? trim($line[1]) : '';
- //$info = split(',', trim($line[0]));
- $ret[$hook][] = $method;
- }
- return $ret;
- }
-
-}
-
-class MymenusMenuHandler extends XoopsPersistableObjectHandler
-{
-
- function __construct(&$db)
- {
- parent::__construct($db, 'mymenus_menu', 'MymenusMenu', 'id', 'title');
- }
-
- function update_weights(&$obj)
- {
- $sql = "UPDATE " . $this->table
- . " SET weight = weight+1"
- . " WHERE weight >= " . $obj->getVar('weight')
- . " AND id <> " . $obj->getVar('id')
- /*. " AND pid = " . $obj->getVar('pid')*/
- . " AND mid = " . $obj->getVar('mid')
- ;
- $this->db->queryF($sql);
-
- $sql = "SELECT id FROM " . $this->table
- . " WHERE mid = " . $obj->getVar('mid')
- /*. " AND pid = " . $obj->getVar('pid')*/
- . " ORDER BY weight ASC"
- ;
- $result = $this->db->query($sql);
- $i = 1; //lets start at 1 please!
- while (list($id) = $this->db->fetchrow($result)) {
- $sql = "UPDATE " . $this->table
- . " SET weight = {$i}"
- . " WHERE id = {$id}"
- ;
- $this->db->queryF($sql);
- $i++;
- }
- }
-}
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/class/menus.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/menus.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/class/menus.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -29,6 +29,9 @@
{
$this->initVar("id", XOBJ_DTYPE_INT);
$this->initVar('title', XOBJ_DTYPE_TXTBOX);
+ //
+ $this->initVar('css', XOBJ_DTYPE_TXTBOX);
+ //
}
}
@@ -36,8 +39,6 @@
{
function __construct(&$db)
{
- parent::__construct($db, 'mymenus_menus', 'MymenusMenus', 'id', 'title');
+ parent::__construct($db, 'mymenus_menus', 'MymenusMenus', 'id', 'title', 'css');
}
}
-
-?>
Modified: XoopsModules/mymenus/trunk/mymenus/class/plugin.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/plugin.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/class/plugin.php 2014-02-10 10:21:40 UTC (rev 1...
[truncated message content] |
