Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12487] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/marquee
|
From: <be...@us...> - 2014-04-25 12:22:25
|
Revision: 12487
http://sourceforge.net/p/xoops/svn/12487
Author: beckmi
Date: 2014-04-25 12:22:08 +0000 (Fri, 25 Apr 2014)
Log Message:
-----------
XOOPS 2.5.7 Module Pack update (work in progress): Marquee
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/about.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/admin_footer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/marquee.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/blocks/marquee_bloc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/class/PersistableObjectHandler.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/class/marquee.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/class/marquee_utils.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/include/update.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/english/blocks.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/english/extension.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/article.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/catads.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/comments.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/mydownloads.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/mylinks.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/newbb.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/smartclient.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/smartfaq.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/smartmedia.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/smartpartner.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/smartsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/tplleaguestats.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/wfdownloads.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/wfsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/xfaq.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/xfsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/xoopsfaq.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/xoopspartners.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/plugins/xoopspoll.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/css/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/bg.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/left_both.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/marquee_slogo.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/right_both.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/selectedEnd.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/selectedStart.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/unselectedEnd.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/unselected_right.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/js/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/js/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/js/xbMarquee.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/templates/blocks/marquee_block01.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/templates/blocks/marquee_block02.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/templates/blocks/marquee_block03.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/templates/blocks/marquee_block04.tpl
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/js/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/arabic/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/french/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/german/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/hrvatski/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/persian/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/portuguesebr/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/spanish/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/language/tchinese/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/templates/blocks/marquee_block01.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/templates/blocks/marquee_block02.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/templates/blocks/marquee_block03.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/templates/blocks/marquee_block04.html
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/about.php 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/about.php 2014-04-25 12:22:08 UTC (rev 12487)
@@ -1,29 +1,29 @@
-<?php
-/**
- * Marquee module
- *
- * 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://www.xoops.org)
- * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
- * @package Marquee
- * @since 2.5.0
- * @author Mage, Mamba
- * @version $Id $
- **/
-
-include_once dirname(__FILE__) . '/admin_header.php';
-
-xoops_cp_header();
-
-$aboutAdmin = new ModuleAdmin();
-
-echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-
-include 'admin_footer.php';
\ No newline at end of file
+<?php
+/**
+ * Marquee module
+ *
+ * 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://www.xoops.org)
+ * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package Marquee
+ * @since 2.5.0
+ * @author Mage, Mamba
+ * @version $Id $
+ **/
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/admin_footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/admin_footer.php 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/admin_footer.php 2014-04-25 12:22:08 UTC (rev 12487)
@@ -24,4 +24,4 @@
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/admin_header.php 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/admin_header.php 2014-04-25 12:22:08 UTC (rev 12487)
@@ -38,4 +38,4 @@
$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
\ No newline at end of file
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/functions.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/functions.php 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/functions.php 2014-04-25 12:22:08 UTC (rev 12487)
@@ -1,111 +1,108 @@
-<?php
-/**
- * ****************************************************************************
- * marquee - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * 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 Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package marquee
- * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-if (!defined('XOOPS_ROOT_PATH')) {
- die('XOOPS root path not defined');
-}
-
-function marquee_adminmenu($currentoption = 0, $breadcrumb = '')
-{
-///* include_once XOOPS_ROOT_PATH.'/modules/marquee/include/functions.php';
-//
-// /* Nice buttons styles */
-// echo "
-// <style type='text/css'>
-// #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0; }
-// #buttonbar { float:left; width:100%; background: #e7e7e7 url('" . XOOPS_URL . "/modules/marquee/images/bg.png') repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px; }
-// #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }
-// #buttonbar li { display:inline; margin:0; padding:0; }
-// #buttonbar a { float:left; background:url('" . XOOPS_URL . "/modules/marquee/images/left_both.png') no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
-// #buttonbar a span { float:left; display:block; background:url('" . XOOPS_URL . "/modules/marquee/images/right_both.png') no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
-// /* Commented Backslash Hack hides rule from IE5-Mac \*/
-// #buttonbar a span {float:none;}
-// /* End IE5-Mac hack */
-// #buttonbar a:hover span { color:#333; }
-// #buttonbar #current a { background-position:0 -150px; border-width:0; }
-// #buttonbar #current a span { background-position:100% -150px; padding-bottom:5px; color:#333; }
-// #buttonbar a:hover { background-position:0% -150px; }
-// #buttonbar a:hover span { background-position:100% -150px; }
-// </style>
-// ";
-// global $xoopsModule, $xoopsConfig;
-//
-// $tblColors = array('','','','','');
-// if($currentoption >= 0) {
-// $tblColors[$currentoption] = 'current';
-// }
-//
-// if (file_exists(XOOPS_ROOT_PATH . '/modules/marquee/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
-// include_once XOOPS_ROOT_PATH. '/modules/marquee/language/' . $xoopsConfig['language'] . '/modinfo.php';
-// } else {
-// include_once XOOPS_ROOT_PATH . '/modules/marquee/language/english/modinfo.php';
-// }
-//
-// echo "<div id='buttontop'>";
-// echo "<table style=\"width: 100%; padding: 0; \" cellspacing=\"0\"><tr>";
-// echo "<td style=\"width: 60%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;\"><a class=\"nobutton\" href=\"../../system/admin.php?fct=preferences&op=showmod&mod=".$xoopsModule->getVar('mid')."\">" . _AM_MARQUEE_GENERALSET . "</a></td>";
-// echo "<td style=\"width: 40%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;\"><b>" . $xoopsModule->name() . " " . _AM_MARQUEE_MODULEADMIN . "</b> " . $breadcrumb . "</td>";
-// echo "</tr></table>";
-// echo "</div>";
-//
-// echo "<div id='buttonbar'>";
-// echo "<ul>";
-// echo "<li id='" . $tblColors[0] . "'><a href=\"index.php\"\"><span>"._MI_MARQUEE_MENU_01 ."</span></a></li>\n";
-// echo "</ul></div>";
-// echo "<br /><br /><pre> </pre><pre> </pre><br />";*/
-}
-
-
-/**
- * Returns the files in a folder according to a pattern
- *
- * Some hosts have disabled the Php glob() function, that's why this function exists
- *
- * @package Marquee
- * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- * @copyright (c) Herv\xE9 Thouzard
- *
- * @param string $folder Folder where you want to grab files from (terminated with a slash)
- * @param string $pattern Pattern used to filter files
- * @return array Files that match the pattern in the selected folder
- */
-function myglob($folder = '', $pattern = 'php')
-{
- $result = array();
- if ($dir = @opendir($folder)) {
- while (($file = readdir($dir)) !== false) {
- if(!is_dir($file)) {
- $ext = basename($file);
- $ext = explode('.', $ext);
- $extension = strtolower($ext[count($ext)-1]);
- if($extension == $pattern) {
- $result[] = $file;
- }
- }
- }
- closedir($dir);
- } else {
- echo "Error, impossible to open the folder ".$folder;
- }
- return $result;
-}
-?>
\ No newline at end of file
+<?php
+/**
+ * ****************************************************************************
+ * marquee - MODULE FOR XOOPS
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ *
+ * 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 Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package marquee
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+
+function marquee_adminmenu($currentoption = 0, $breadcrumb = '')
+{
+///* include_once XOOPS_ROOT_PATH.'/modules/marquee/include/functions.php';
+//
+// /* Nice buttons styles */
+// echo "
+// <style type='text/css'>
+// #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0; }
+// #buttonbar { float:left; width:100%; background: #e7e7e7 url('" . XOOPS_URL . "/modules/marquee/assets/images/bg.png') repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px; }
+// #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }
+// #buttonbar li { display:inline; margin:0; padding:0; }
+// #buttonbar a { float:left; background:url('" . XOOPS_URL . "/modules/marquee/assets/images/left_both.png') no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
+// #buttonbar a span { float:left; display:block; background:url('" . XOOPS_URL . "/modules/marquee/assets/images/right_both.png') no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
+// /* Commented Backslash Hack hides rule from IE5-Mac \*/
+// #buttonbar a span {float:none;}
+// /* End IE5-Mac hack */
+// #buttonbar a:hover span { color:#333; }
+// #buttonbar #current a { background-position:0 -150px; border-width:0; }
+// #buttonbar #current a span { background-position:100% -150px; padding-bottom:5px; color:#333; }
+// #buttonbar a:hover { background-position:0% -150px; }
+// #buttonbar a:hover span { background-position:100% -150px; }
+// </style>
+// ";
+// global $xoopsModule, $xoopsConfig;
+//
+// $tblColors = array('','','','','');
+// if ($currentoption >= 0) {
+// $tblColors[$currentoption] = 'current';
+// }
+//
+// if (file_exists(XOOPS_ROOT_PATH . '/modules/marquee/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
+// include_once XOOPS_ROOT_PATH. '/modules/marquee/language/' . $xoopsConfig['language'] . '/modinfo.php';
+// } else {
+// include_once XOOPS_ROOT_PATH . '/modules/marquee/language/english/modinfo.php';
+// }
+//
+// echo "<div id='buttontop'>";
+// echo "<table style=\"width: 100%; padding: 0; \" cellspacing=\"0\"><tr>";
+// echo "<td style=\"width: 60%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;\"><a class=\"nobutton\" href=\"../../system/admin.php?fct=preferences&op=showmod&mod=".$xoopsModule->getVar('mid')."\">" . _AM_MARQUEE_GENERALSET . "</a></td>";
+// echo "<td style=\"width: 40%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;\"><b>" . $xoopsModule->name() . " " . _AM_MARQUEE_MODULEADMIN . "</b> " . $breadcrumb . "</td>";
+// echo "</tr></table>";
+// echo "</div>";
+//
+// echo "<div id='buttonbar'>";
+// echo "<ul>";
+// echo "<li id='" . $tblColors[0] . "'><a href=\"index.php\"\"><span>"._MI_MARQUEE_MENU_01 ."</span></a></li>\n";
+// echo "</ul></div>";
+// echo "<br /><br /><pre> </pre><pre> </pre><br />";*/
+}
+
+/**
+ * Returns the files in a folder according to a pattern
+ *
+ * Some hosts have disabled the Php glob() function, that's why this function exists
+ *
+ * @package Marquee
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ * @copyright (c) Herv\xE9 Thouzard
+ *
+ * @param string $folder Folder where you want to grab files from (terminated with a slash)
+ * @param string $pattern Pattern used to filter files
+ * @return array Files that match the pattern in the selected folder
+ */
+function myglob($folder = '', $pattern = 'php')
+{
+ $result = array();
+ if ($dir = @opendir($folder)) {
+ while (($file = readdir($dir)) !== false) {
+ if (!is_dir($file)) {
+ $ext = basename($file);
+ $ext = explode('.', $ext);
+ $extension = strtolower($ext[count($ext)-1]);
+ if ($extension == $pattern) {
+ $result[] = $file;
+ }
+ }
+ }
+ closedir($dir);
+ } else {
+ echo "Error, impossible to open the folder ".$folder;
+ }
+
+ return $result;
+}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/index.php 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/index.php 2014-04-25 12:22:08 UTC (rev 12487)
@@ -1,34 +1,33 @@
-<?php
-/**
- * ****************************************************************************
- * marquee - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * 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 Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package marquee
- * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-include_once dirname(__FILE__) . '/admin_header.php';
-
-xoops_cp_header();
-
- $indexAdmin = new ModuleAdmin();
-
- echo $indexAdmin->addNavigation('index.php');
- echo $indexAdmin->renderIndex();
-
-include "admin_footer.php";
\ No newline at end of file
+<?php
+/**
+ * ****************************************************************************
+ * marquee - MODULE FOR XOOPS
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ *
+ * 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 Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package marquee
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+ $indexAdmin = new ModuleAdmin();
+
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+
+include 'admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/marquee.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/marquee.php 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/marquee.php 2014-04-25 12:22:08 UTC (rev 12487)
@@ -19,7 +19,6 @@
* @version $Id $
* ****************************************************************************
*/
-
require_once '../../../include/cp_header.php';
require_once XOOPS_ROOT_PATH.'/modules/marquee/admin/functions.php';
require_once XOOPS_ROOT_PATH.'/modules/marquee/include/functions.php';
@@ -32,37 +31,37 @@
if (isset($_POST['op'])) {
$op = $_POST['op'];
} elseif ( isset($_GET['op'])) {
- $op = $_GET['op'];
+ $op = $_GET['op'];
}
// Verify that a field exists inside a mysql table
function marquee_FieldExists($fieldname,$table)
{
- global $xoopsDB;
- $result=$xoopsDB->queryF("SHOW COLUMNS FROM $table LIKE '$fieldname'");
- return($xoopsDB->getRowsNum($result) > 0);
+ global $xoopsDB;
+ $result=$xoopsDB->queryF("SHOW COLUMNS FROM $table LIKE '$fieldname'");
+
+ return($xoopsDB->getRowsNum($result) > 0);
}
-
// Verify if the table is up to date
if (!marquee_FieldExists('marquee_marqueeid',$xoopsDB->prefix('marquee'))) {
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `marqueeid` `marquee_marqueeid` INT( 8 ) NOT NULL AUTO_INCREMENT");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `uid` `marquee_uid` MEDIUMINT( 8 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `direction` `marquee_direction` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `scrollamount` `marquee_scrollamount` INT( 11 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `behaviour` `marquee_behaviour` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `bgcolor` `marquee_bgcolor` VARCHAR( 7 ) NOT NULL");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `align` `marquee_align` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `height` `marquee_height` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `width` `marquee_width` VARCHAR( 4 ) NOT NULL");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `hspace` `marquee_hspace` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `scrolldelay` `marquee_scrolldelay` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `stoponmouseover` `marquee_stoponmouseover` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `loop` `marquee_loop` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `vspace` `marquee_vspace` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `content` `marquee_content` TEXT NOT NULL");
- $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `source` `marquee_source` VARCHAR( 255 ) NOT NULL DEFAULT 'fixed'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `marqueeid` `marquee_marqueeid` INT( 8 ) NOT NULL AUTO_INCREMENT");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `uid` `marquee_uid` MEDIUMINT( 8 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `direction` `marquee_direction` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `scrollamount` `marquee_scrollamount` INT( 11 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `behaviour` `marquee_behaviour` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `bgcolor` `marquee_bgcolor` VARCHAR( 7 ) NOT NULL");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `align` `marquee_align` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `height` `marquee_height` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `width` `marquee_width` VARCHAR( 4 ) NOT NULL");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `hspace` `marquee_hspace` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `scrolldelay` `marquee_scrolldelay` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `stoponmouseover` `marquee_stoponmouseover` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `loop` `marquee_loop` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `vspace` `marquee_vspace` SMALLINT( 6 ) NOT NULL DEFAULT '0'");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `content` `marquee_content` TEXT NOT NULL");
+ $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('marquee')." CHANGE `source` `marquee_source` VARCHAR( 255 ) NOT NULL DEFAULT 'fixed'");
}
$marquee_handler =& xoops_getmodulehandler('marquee', 'marquee');
@@ -70,207 +69,202 @@
// Function used to add and modify an element
function AddEditMarqueeForm($marqueeid, $Action, $FormTitle, $contentvalue, $bgcolorvalue,$widthvalue,$heightvalue,$scrollamountvalue,$hspacevalue, $vspacevalue,$scrolldelayvalue,$directionvalue,$behaviourvalue,$alignvalue,$loopvalue,$stopvalue , $LabelSubmitButton, $sourcevalue='fixed')
{
- require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
- global $xoopsModule, $xoopsModuleConfig;
+ require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+ global $xoopsModule, $xoopsModuleConfig;
- $sform = new XoopsThemeForm($FormTitle, 'marqueeform', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/admin/marquee.php');
+ $sform = new XoopsThemeForm($FormTitle, 'marqueeform', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/admin/marquee.php');
- $source = new XoopsFormSelect(_AM_MARQUEE_SOURCE, 'source', $sourcevalue);
- $source->addOption('fixed', _AM_MARQUEE_SOURCE_FIXED);
- $fileslst = myglob(XOOPS_ROOT_PATH.'/modules/marquee/plugins/','php');
- foreach($fileslst as $onefile) {
- $onefile = basename($onefile,'.php');
- $source->addOption($onefile, $onefile);
- }
- $sform->addElement($source);
+ $source = new XoopsFormSelect(_AM_MARQUEE_SOURCE, 'source', $sourcevalue);
+ $source->addOption('fixed', _AM_MARQUEE_SOURCE_FIXED);
+ $fileslst = myglob(XOOPS_ROOT_PATH.'/modules/marquee/plugins/','php');
+ foreach ($fileslst as $onefile) {
+ $onefile = basename($onefile,'.php');
+ $source->addOption($onefile, $onefile);
+ }
+ $sform->addElement($source);
- $editor = marquee_utils::getWysiwygForm(_AM_MARQUEE_CONTENT, 'content', $contentvalue, 15, 60, 'content_text_hidden');
- if($editor) {
- $sform->addElement($editor, false);
- }
+ $editor = marquee_utils::getWysiwygForm(_AM_MARQUEE_CONTENT, 'content', $contentvalue, 15, 60, 'content_text_hidden');
+ if ($editor) {
+ $sform->addElement($editor, false);
+ }
-
- if(marquee_getmoduleoption('methodtouse') != 'DHTML') {
- // $sform->addElement(new XoopsFormText(_AM_MARQUEE_BGCOLOR, 'bgcolor', 7, 7, $bgcolorvalue), false);
+ if (marquee_getmoduleoption('methodtouse') != 'DHTML') {
+ // $sform->addElement(new XoopsFormText(_AM_MARQUEE_BGCOLOR, 'bgcolor', 7, 7, $bgcolorvalue), false);
$sform->addElement(new XoopsFormColorPicker(_AM_MARQUEE_BGCOLOR,'bgcolor',$bgcolorvalue), false);
- }
- $sform->addElement(new XoopsFormText(_AM_MARQUEE_WIDTH, 'width', 4, 4, $widthvalue), false);
- $sform->addElement(new XoopsFormText(_AM_MARQUEE_HEIGHT, 'height',4, 4, $heightvalue), false);
- $sform->addElement(new XoopsFormText(_AM_MARQUEE_SCRAMOUNT, 'scrollamount',4, 4, $scrollamountvalue), false);
- if(marquee_getmoduleoption('methodtouse') != 'DHTML') {
- $sform->addElement(new XoopsFormText(_AM_MARQUEE_HSPACE, 'hspace',4, 4, $hspacevalue), false);
- $sform->addElement(new XoopsFormText(_AM_MARQUEE_VSPACE, 'vspace',4, 4, $vspacevalue), false);
- }
+ }
+ $sform->addElement(new XoopsFormText(_AM_MARQUEE_WIDTH, 'width', 4, 4, $widthvalue), false);
+ $sform->addElement(new XoopsFormText(_AM_MARQUEE_HEIGHT, 'height',4, 4, $heightvalue), false);
+ $sform->addElement(new XoopsFormText(_AM_MARQUEE_SCRAMOUNT, 'scrollamount',4, 4, $scrollamountvalue), false);
+ if (marquee_getmoduleoption('methodtouse') != 'DHTML') {
+ $sform->addElement(new XoopsFormText(_AM_MARQUEE_HSPACE, 'hspace',4, 4, $hspacevalue), false);
+ $sform->addElement(new XoopsFormText(_AM_MARQUEE_VSPACE, 'vspace',4, 4, $vspacevalue), false);
+ }
- $sform->addElement(new XoopsFormText(_AM_MARQUEE_SCRDELAY, 'scrolldelay',6, 6, $scrolldelayvalue), false);
- $direction = new XoopsFormSelect(_AM_MARQUEE_DIRECTION, 'direction', $directionvalue);
- $direction->addOption('0', _AM_MARQUEE_DIRECTION1);
- $direction->addOption('1', _AM_MARQUEE_DIRECTION2);
- $direction->addOption('2', _AM_MARQUEE_DIRECTION3);
- $direction->addOption('3', _AM_MARQUEE_DIRECTION4);
- $sform->addElement($direction,true);
+ $sform->addElement(new XoopsFormText(_AM_MARQUEE_SCRDELAY, 'scrolldelay',6, 6, $scrolldelayvalue), false);
+ $direction = new XoopsFormSelect(_AM_MARQUEE_DIRECTION, 'direction', $directionvalue);
+ $direction->addOption('0', _AM_MARQUEE_DIRECTION1);
+ $direction->addOption('1', _AM_MARQUEE_DIRECTION2);
+ $direction->addOption('2', _AM_MARQUEE_DIRECTION3);
+ $direction->addOption('3', _AM_MARQUEE_DIRECTION4);
+ $sform->addElement($direction,true);
- $behaviour = new XoopsFormSelect(_AM_MARQUEE_BEHAVIOUR, 'behaviour', $behaviourvalue);
- $behaviour->addOption('0', _AM_MARQUEE_BEHAVIOUR1);
- if(marquee_getmoduleoption('methodtouse') != 'DHTML') {
- $behaviour->addOption('1', _AM_MARQUEE_BEHAVIOUR2);
- }
- $behaviour->addOption('2', _AM_MARQUEE_BEHAVIOUR3);
- $sform->addElement($behaviour,true);
+ $behaviour = new XoopsFormSelect(_AM_MARQUEE_BEHAVIOUR, 'behaviour', $behaviourvalue);
+ $behaviour->addOption('0', _AM_MARQUEE_BEHAVIOUR1);
+ if (marquee_getmoduleoption('methodtouse') != 'DHTML') {
+ $behaviour->addOption('1', _AM_MARQUEE_BEHAVIOUR2);
+ }
+ $behaviour->addOption('2', _AM_MARQUEE_BEHAVIOUR3);
+ $sform->addElement($behaviour,true);
- if(marquee_getmoduleoption('methodtouse') != 'DHTML') {
- $align = new XoopsFormSelect(_AM_MARQUEE_ALIGN, 'align', $alignvalue);
- $align->addOption('0', _AM_MARQUEE_ALIGN1);
- $align->addOption('1', _AM_MARQUEE_ALIGN2);
- $align->addOption('2', _AM_MARQUEE_ALIGN3);
- $sform->addElement($align,true);
- }
+ if (marquee_getmoduleoption('methodtouse') != 'DHTML') {
+ $align = new XoopsFormSelect(_AM_MARQUEE_ALIGN, 'align', $alignvalue);
+ $align->addOption('0', _AM_MARQUEE_ALIGN1);
+ $align->addOption('1', _AM_MARQUEE_ALIGN2);
+ $align->addOption('2', _AM_MARQUEE_ALIGN3);
+ $sform->addElement($align,true);
+ }
- $loop = new XoopsFormSelect(_AM_MARQUEE_LOOP, 'loop', $loopvalue);
- $loop->addOption('0', _AM_MARQUEE_INFINITELOOP);
- for($i=1;$i<=100;$i++) {
- $loop->addOption($i, $i);
- }
- if(marquee_getmoduleoption('methodtouse') != 'DHTML') {
- $sform->addElement($loop,true);
- $sform->addElement(new XoopsFormRadioYN(_AM_MARQUEE_STOP, 'stoponmouseover', $stopvalue, _YES, _NO));
- }
+ $loop = new XoopsFormSelect(_AM_MARQUEE_LOOP, 'loop', $loopvalue);
+ $loop->addOption('0', _AM_MARQUEE_INFINITELOOP);
+ for ($i=1;$i<=100;++$i) {
+ $loop->addOption($i, $i);
+ }
+ if (marquee_getmoduleoption('methodtouse') != 'DHTML') {
+ $sform->addElement($loop,true);
+ $sform->addElement(new XoopsFormRadioYN(_AM_MARQUEE_STOP, 'stoponmouseover', $stopvalue, _YES, _NO));
+ }
- $sform->addElement(new XoopsFormHidden('op', $Action), false);
- if(!empty($marqueeid)) {
- $sform->addElement(new XoopsFormHidden('marqueeid', $marqueeid), false);
- }
- $button_tray = new XoopsFormElementTray('' ,'');
- $submit_btn = new XoopsFormButton('', 'submit', $LabelSubmitButton, 'submit');
- $button_tray->addElement($submit_btn);
- $cancel_btn = new XoopsFormButton('', 'reset', _AM_MARQUEE_RESETBUTTON, 'reset');
- $button_tray->addElement($cancel_btn);
- $sform->addElement($button_tray);
- $sform->display();
+ $sform->addElement(new XoopsFormHidden('op', $Action), false);
+ if (!empty($marqueeid)) {
+ $sform->addElement(new XoopsFormHidden('marqueeid', $marqueeid), false);
+ }
+ $button_tray = new XoopsFormElementTray('' ,'');
+ $submit_btn = new XoopsFormButton('', 'submit', $LabelSubmitButton, 'submit');
+ $button_tray->addElement($submit_btn);
+ $cancel_btn = new XoopsFormButton('', 'reset', _AM_MARQUEE_RESETBUTTON, 'reset');
+ $button_tray->addElement($cancel_btn);
+ $sform->addElement($button_tray);
+ $sform->display();
}
// ******************************************************************************************************************************************
// **** Main ********************************************************************************************************************************
// ******************************************************************************************************************************************
-switch ($op)
-{
- // Verify before to edit an element
- case 'verifybeforeedit':
- if (isset($_POST['submit']) && $_POST['submit'] != '' ) {
- $marquee = $marquee_handler->get(intval($_POST['marqueeid']));
- if(is_object($marquee)) {
- $marquee->setVar('marquee_uid', $xoopsUser->getVar('uid'));
- $marquee->setVar('marquee_direction', $_POST['direction']);
- $marquee->setVar('marquee_scrollamount', $_POST['scrollamount']);
- $marquee->setVar('marquee_behaviour', $_POST['behaviour']);
- $marquee->setVar('marquee_bgcolor', isset($_POST['bgcolor']) ? $_POST['bgcolor'] : '');
- $marquee->setVar('marquee_align', isset($_POST['align']) ? $_POST['align'] : 0);
- $marquee->setVar('marquee_height', $_POST['height']);
- $marquee->setVar('marquee_width', $_POST['width']);
- $marquee->setVar('marquee_hspace', isset($_POST['hspace']) ? $_POST['hspace'] : 0);
- $marquee->setVar('marquee_scrolldelay', $_POST['scrolldelay']);
- $marquee->setVar('marquee_stoponmouseover', isset($_POST['stoponmouseover']) ? $_POST['stoponmouseover'] : 0);
- $marquee->setVar('marquee_loop', isset($_POST['loop']) ? $_POST['loop'] : 0);
- $marquee->setVar('marquee_vspace', isset($_POST['vspace']) ? $_POST['vspace'] : 0);
- $marquee->setVar('marquee_content', $_POST['content']);
- $marquee->setVar('marquee_source', $_POST['source']);
- if(!$marquee_handler->insert($marquee)) {
- redirect_header('marquee.php', 1,_AM_MARQUEE_ERROR_MODIFY_DB);
- exit();
- }
- redirect_header('marquee.php', 1, _AM_MARQUEE_DBUPDATED);
- } else {
- redirect_header('marquee.php', 3, _ERRORS);
- }
- }
+switch ($op) {
+ // Verify before to edit an element
+ case 'verifybeforeedit':
+ if (isset($_POST['submit']) && $_POST['submit'] != '' ) {
+ $marquee = $marquee_handler->get(intval($_POST['marqueeid']));
+ if (is_object($marquee)) {
+ $marquee->setVar('marquee_uid', $xoopsUser->getVar('uid'));
+ $marquee->setVar('marquee_direction', $_POST['direction']);
+ $marquee->setVar('marquee_scrollamount', $_POST['scrollamount']);
+ $marquee->setVar('marquee_behaviour', $_POST['behaviour']);
+ $marquee->setVar('marquee_bgcolor', isset($_POST['bgcolor']) ? $_POST['bgcolor'] : '');
+ $marquee->setVar('marquee_align', isset($_POST['align']) ? $_POST['align'] : 0);
+ $marquee->setVar('marquee_height', $_POST['height']);
+ $marquee->setVar('marquee_width', $_POST['width']);
+ $marquee->setVar('marquee_hspace', isset($_POST['hspace']) ? $_POST['hspace'] : 0);
+ $marquee->setVar('marquee_scrolldelay', $_POST['scrolldelay']);
+ $marquee->setVar('marquee_stoponmouseover', isset($_POST['stoponmouseover']) ? $_POST['stoponmouseover'] : 0);
+ $marquee->setVar('marquee_loop', isset($_POST['loop']) ? $_POST['loop'] : 0);
+ $marquee->setVar('marquee_vspace', isset($_POST['vspace']) ? $_POST['vspace'] : 0);
+ $marquee->setVar('marquee_content', $_POST['content']);
+ $marquee->setVar('marquee_source', $_POST['source']);
+ if (!$marquee_handler->insert($marquee)) {
+ redirect_header('marquee.php', 1,_AM_MARQUEE_ERROR_MODIFY_DB);
+ exit();
+ }
+ redirect_header('marquee.php', 1, _AM_MARQUEE_DBUPDATED);
+ } else {
+ redirect_header('marquee.php', 3, _ERRORS);
+ }
+ }
break;
-
- // Edit an element
+ // Edit an element
case 'edit':
xoops_cp_header();
- echo $indexAdmin->addNavigation('marquee.php');
-
+ echo $indexAdmin->addNavigation('marquee.php');
+
echo '<br />';
- if(isset($_GET['marqueeid'])) {
- $marqueeid = intval($_GET['marqueeid']);
- $marquee = $marquee_handler->get($marqueeid);
- AddEditMarqueeForm($marqueeid,'verifybeforeedit', _AM_MARQUEE_CONFIG, $marquee->getVar('marquee_content','e'), $marquee->getVar('marquee_bgcolor','e'), $marquee->getVar('marquee_width','e'), $marquee->getVar('marquee_height','e'), $marquee->getVar('marquee_scrollamount','e'), $marquee->getVar('marquee_hspace','e'), $marquee->getVar('marquee_vspace','e'), $marquee->getVar('marquee_scrolldelay','e'), $marquee->getVar('marquee_direction','e'), $marquee->getVar('marquee_behaviour','e'), $marquee->getVar('marquee_align','e'), $marquee->getVar('marquee_loop','e'), $marquee->getVar('marquee_stoponmouseover','e'),_AM_MARQUEE_UPDATE, $marquee->getVar('marquee_source','e'));
+ if (isset($_GET['marqueeid'])) {
+ $marqueeid = intval($_GET['marqueeid']);
+ $marquee = $marquee_handler->get($marqueeid);
+ AddEditMarqueeForm($marqueeid,'verifybeforeedit', _AM_MARQUEE_CONFIG, $marquee->getVar('marquee_content','e'), $marquee->getVar('marquee_bgcolor','e'), $marquee->getVar('marquee_width','e'), $marquee->getVar('marquee_height','e'), $marquee->getVar('marquee_scrollamount','e'), $marquee->getVar('marquee_hspace','e'), $marquee->getVar('marquee_vspace','e'), $marquee->getVar('marquee_scrolldelay','e'), $marquee->getVar('marquee_direction','e'), $marquee->getVar('marquee_behaviour','e'), $marquee->getVar('marquee_align','e'), $marquee->getVar('marquee_loop','e'), $marquee->getVar('marquee_stoponmouseover','e'),_AM_MARQUEE_UPDATE, $marquee->getVar('marquee_source','e'));
}
break;
-
// Delete an element
case 'delete':
if (!isset($_POST['ok'])) {
xoops_cp_header();
- echo $indexAdmin->addNavigation('marquee.php');
+ echo $indexAdmin->addNavigation('marquee.php');
// echo '<h4>' . _AM_MARQUEE_CONFIG . '</h4>';
- xoops_confirm( array( 'op' => 'delete', 'marqueeid' => $_GET['marqueeid'], 'ok' => 1 ), 'marquee.php', _AM_MARQUEE_RUSUREDEL );
+ xoops_confirm( array( 'op' => 'delete', 'marqueeid' => $_GET['marqueeid'], 'ok' => 1 ), 'marquee.php', _AM_MARQUEE_RUSUREDEL );
} else {
if ( empty($_POST['marqueeid'])) {
redirect_header( 'marquee.php', 2, _AM_MARQUEE_ERROR_ADD_MARQUEE);
exit();
- }
- $marqueeid = intval($_POST['marqueeid']);
+ }
+ $marqueeid = intval($_POST['marqueeid']);
$marquee = $marquee_handler->deleteAll(new Criteria('marquee_marqueeid', $marqueeid ,'='));
redirect_header( 'marquee.php', 1, _AM_MARQUEE_DBUPDATED );
exit();
}
break;
- // Verify before to add an element
+ // Verify before to add an element
case 'verifytoadd':
- if ( isset($_POST['submit']) && $_POST['submit'] != '' ) {
- $vres = $marquee_handler->quickInsert(array(
- 'marquee_uid' => $xoopsUser->getVar('uid'),
- 'marquee_direction' => $_POST['direction'],
- 'marquee_scrollamount' => $_POST['scrollamount'],
- 'marquee_behaviour' => $_POST['behaviour'],
- 'marquee_bgcolor' => isset($_POST['bgcolor']) ? $_POST['bgcolor'] : '',
- 'marquee_align' => isset($_POST['align']) ? $_POST['align'] : 0,
- 'marquee_height' => $_POST['height'],
- 'marquee_width' => $_POST['width'],
- 'marquee_hspace' => isset($_POST['hspace']) ? $_POST['hspace'] : 0,
- 'marquee_scrolldelay' => $_POST['scrolldelay'],
- 'marquee_stoponmouseover' => isset($_POST['stoponmouseover']) ? $_POST['stoponmouseover'] : 0,
- 'marquee_loop' => isset($_POST['loop']) ? $_POST['loop'] : 0,
- 'marquee_vspace' => isset($_POST['vspace']) ? $_POST['vspace'] : 0,
- 'marquee_content' => $_POST['content'],
- 'marquee_source' => $_POST['source']));
- if(!$vres) {
- redirect_header('marquee.php', 1,_AM_MARQUEE_ERROR_ADD_MARQUEE);
- exit();
- }
- redirect_header('marquee.php', 1, _AM_MARQUEE_ADDED_OK);
- }
+ if ( isset($_POST['submit']) && $_POST['submit'] != '' ) {
+ $vres = $marquee_handler->quickInsert(array(
+ 'marquee_uid' => $xoopsUser->getVar('uid'),
+ 'marquee_direction' => $_POST['direction'],
+ 'marquee_scrollamount' => $_POST['scrollamount'],
+ 'marquee_behaviour' => $_POST['behaviour'],
+ 'marquee_bgcolor' => isset($_POST['bgcolor']) ? $_POST['bgcolor'] : '',
+ 'marquee_align' => isset($_POST['align']) ? $_POST['align'] : 0,
+ 'marquee_height' => $_POST['height'],
+ 'marquee_width' => $_POST['width'],
+ 'marquee_hspace' => isset($_POST['hspace']) ? $_POST['hspace'] : 0,
+ 'marquee_scrolldelay' => $_POST['scrolldelay'],
+ 'marquee_stoponmouseover' => isset($_POST['stoponmouseover']) ? $_POST['stoponmouseover'] : 0,
+ 'marquee_loop' => isset($_POST['loop']) ? $_POST['loop'] : 0,
+ 'marquee_vspace' => isset($_POST['vspace']) ? $_POST['vspace'] : 0,
+ 'marquee_content' => $_POST['content'],
+ 'marquee_source' => $_POST['source']));
+ if (!$vres) {
+ redirect_header('marquee.php', 1,_AM_MARQUEE_ERROR_ADD_MARQUEE);
+ exit();
+ }
+ redirect_header('marquee.php', 1, _AM_MARQUEE_ADDED_OK);
+ }
break;
+ // Display the form to add an element
+ case 'addmarquee':
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('marquee.php');
- // Display the form to add an element
- case 'addmarquee':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('marquee.php');
-
- echo '<br />';
- AddEditMarqueeForm(0, 'verifytoadd', _AM_MARQUEE_CONFIG, '', '','','','',0, 0,'',0,0,0,0,0, _AM_MARQUEE_ADDBUTTON,'fixed');
+ echo '<br />';
+ AddEditMarqueeForm(0, 'verifytoadd', _AM_MARQUEE_CONFIG, '', '','','','',0, 0,'',0,0,0,0,0, _AM_MARQUEE_ADDBUTTON,'fixed');
break;
- // Default action, list all elements
+ // Default action, list all elements
case 'default':
xoops_cp_header();
- echo $indexAdmin->addNavigation('marquee.php');
+ echo $indexAdmin->addNavigation('marquee.php');
// echo '<h4>' . _AM_MARQUEE_CONFIG . "</h4><br />\n";
echo"<table width='100%' border='0' cellspacing='1' class='outer'>\n";
echo "<tr><th align='center'>". _AM_MARQUEE_ID . "</th><th align='center'>" . _AM_MARQUEE_CONTENT . "</th><th align='center'>" . _AM_MARQUEE_BGCOLOR_SHORT ."</th><th align='center'>" . _AM_MARQUEE_BEHAVIOUR . "</th><th align='center'>". _AM_MARQUEE_SOURCE . "</th><th align='center'>" . _AM_MARQUEE_STOP . "</th><th align='center'>" . _AM_MARQUEE_DIRECTION . "</th><th align='center'>" . _AM_MARQUEE_ACTION . "</th></tr>\n";
- $marqueearray= $marquee_handler->getObjects();
- $class = 'even';
- $baseurl = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/admin/marquee.php';
- $tbldirection = array(_AM_MARQUEE_DIRECTION1,_AM_MARQUEE_DIRECTION2,_AM_MARQUEE_DIRECTION3,_AM_MARQUEE_DIRECTION4);
- $tblbehaviour = array(_AM_MARQUEE_BEHAVIOUR1,_AM_MARQUEE_BEHAVIOUR2,_AM_MARQUEE_BEHAVIOUR3);
- if ( count($marqueearray) > 0 ) {
- foreach($marqueearray as $marquee) {
+ $marqueearray= $marquee_handler->getObjects();
+ $class = 'even';
+ $baseurl = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/admin/marquee.php';
+ $tbldirection = array(_AM_MARQUEE_DIRECTION1,_AM_MARQUEE_DIRECTION2,_AM_MARQUEE_DIRECTION3,_AM_MARQUEE_DIRECTION4);
+ $tblbehaviour = array(_AM_MARQUEE_BEHAVIOUR1,_AM_MARQUEE_BEHAVIOUR2,_AM_MARQUEE_BEHAVIOUR3);
+ if ( count($marqueearray) > 0 ) {
+ foreach ($marqueearray as $marquee) {
// $action_edit="<a href='".$baseurl."?op=edit&marqueeid=".$marquee->getVar('marquee_marqueeid')."'>"._AM_MARQUEE_EDIT."</a>";
// $action_delete="<a href='".$baseurl."?op=delete&marqueeid=".$marquee->getVar('marquee_marqueeid')."'>"._AM_MARQUEE_DELETE."</a>";
@@ -279,24 +273,23 @@
$bgcolorvalue=$marquee->getVar('marquee_bgcolor');
$direction=$tbldirection[$marquee->getVar('marquee_direction')];
- $behaviour=$tblbehaviour[$marquee->getVar('marquee_behaviour')];
- $stop = _YES;
- if($marquee->getVar('marquee_stoponmouseover')==0) {
- $stop= _NO;
+ $behaviour=$tblbehaviour[$marquee->getVar('marquee_behaviour')];
+ $stop = _YES;
+ if ($marquee->getVar('marquee_stoponmouseover')==0) {
+ $stop= _NO;
}
$source = $marquee->getVar('marquee_source');
- if($marquee->getVar('marquee_source') == 'fixed') {
- $source = _AM_MARQUEE_SOURCE_FIXED;
- }
- echo "<tr class='".$class."'><td align='center'>" . $marquee->getVar('marquee_marqueeid') . "</td><td align='center'>" . xoops_substr(strip_tags($marquee->getVar('marquee_content')),0,60)
+ if ($marquee->getVar('marquee_source') == 'fixed') {
+ $source = _AM_MARQUEE_SOURCE_FIXED;
+ }
+ echo "<tr class='".$class."'><td align='center'>" . $marquee->getVar('marquee_marqueeid') . "</td><td align='center'>" . xoops_substr(strip_tags($marquee->getVar('marquee_content')),0,60)
."</td><td align='center'>"
."<div style='height:12px; width:12px; background-color:".$bgcolorvalue."; border:1px solid black;float:left; margin-right:5px;'></div>"
. $bgcolorvalue
-
."</td><td align='center'>" . $behaviour . "</td><td align='center'>" . $source . "</td><td align='center'>". $stop . "</td><td align='center'>" . $direction . "</td><td align='center'>" . $action_edit . " " . $action_delete . "</td></tr>\n";
- $class = ($class == 'even') ? 'odd' : 'even';
- }
+ $class = ($class == 'even') ? 'odd' : 'even';
+ }
}
// echo "<tr class='".$class."'><td colspan='7' align='center'><form name='faddmarquee' method='post' action='marquee.php'><input type='hidden' name='op' value='addmarquee' /><input type='submit' name='submit' value='"._AM_MARQUEE_ADDMARQUEE."' /></td></tr>";
@@ -306,5 +299,5 @@
break;
}
-include "admin_footer.php";
-//xoops_cp_footer();
\ No newline at end of file
+include 'admin_footer.php';
+//xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/menu.php 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/admin/menu.php 2014-04-25 12:22:08 UTC (rev 12487)
@@ -12,7 +12,6 @@
$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
$pathLanguage = $path . $pathModuleAdmin;
-
if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
$fileinc = $pathLanguage . '/language/english/main.php';
}
@@ -26,12 +25,12 @@
$adminmenu[$i]["link"] = 'admin/index.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_MARQUEE_MENU_01;
$adminmenu[$i]["link"] = 'admin/marquee.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/marquee.png';
-$i++;
+++$i;
$adminmenu[$i]["title"] = _AM_MODULEADMIN_ABOUT;
$adminmenu[$i]["link"] = 'admin/about.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/css/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/css/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/css/index.html 2014-04-25 12:22:08 UTC (rev 12487)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/bg.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/bg.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/bg.png 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/bg.png 2014-04-25 12:22:08 UTC (rev 12487)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/bg.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/index.html 2014-04-25 12:22:08 UTC (rev 12487)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/left_both.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/left_both.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/left_both.png 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/left_both.png 2014-04-25 12:22:08 UTC (rev 12487)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/left_both.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/marquee_slogo.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/marquee_slogo.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/marquee_slogo.png 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/marquee_slogo.png 2014-04-25 12:22:08 UTC (rev 12487)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/marquee_slogo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/right_both.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/right_both.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/right_both.png 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/right_both.png 2014-04-25 12:22:08 UTC (rev 12487)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/right_both.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/selectedEnd.gif
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/selectedEnd.gif
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/selectedEnd.gif 2014-04-25 12:18:53 UTC (rev 12486)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/marquee/assets/images/selectedEnd.gif 2014-04-25 12:22:08 UTC (rev 12487)
Property chan...
[truncated message content] |
