Menu
▾
▴
xoops-svn
|
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...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X