xoops-svn

[xoops-svn] SF.net SVN: xoops-svn:[12482] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/xoopspoll

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

Revision: 12482
          http://sourceforge.net/p/xoops/svn/12482
Author:   beckmi
Date:     2014-04-25 12:08:17 +0000 (Fri, 25 Apr 2014)
Log Message:
-----------
XOOPS 2.5.7 Module Pack update (work in progress): XoopsPoll

Modified Paths:
--------------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/about.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_footer.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_header.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/index.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/menu.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/xoopspoll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/xoopspolllog.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/xoopspolloption.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/xoopspollrenderer.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/comment_delete.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/comment_edit.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/comment_new.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/comment_post.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/comment_reply.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/docs/changelog.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/docs/credits.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/docs/install.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/docs/readme.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/index.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/english/admin.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/english/blocks.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/english/help/help.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/english/mail_template/mail_results.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/english/main.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/english/modinfo.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/pollresults.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/sql/mysql.sql
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/test/XOOPS Poll Create
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/test/XOOPS Poll Delete
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/test/XOOPS Poll Edit
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/test/XOOPS Poll Vote
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/test/readme.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/xoops_version.php

Added Paths:
-----------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/main.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/utility.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/css/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/css/datetimepicker.css
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/css/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/aqua.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/black.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/blank.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/blue.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/brown.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/darkgreen.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/gold.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/green.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/grey.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/orange.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/pink.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/purple.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/red.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/colorbars/yellow.gif
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/icons/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/icons/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/icons/logo_large.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/icons/logo_small.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/icons/obscured.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/images/xoopspoll_slogo.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/js/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/js/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/js/jquery-ui-sliderAccess.js
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/assets/js/jquery-ui-timepicker-addon.js
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/blocks/multipoll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/blocks/singlepoll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/constants.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/formdatetimepicker.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/log.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/option.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/plugin/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/plugin/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/plugin/userlog.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/poll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/pollutility.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/renderer.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/request.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/marquee/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/marquee/plugins/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/marquee/plugins/xoopspoll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/marquee/readme.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/class/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/class/post.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/class/userlanguage.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/language/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/language/english/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/language/english/main.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/polls.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/readme.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/css/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/css/language/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/css/language/english/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/css/language/english/style.css
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/css/language/persian/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/css/language/persian/style.css
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/newbb_poll_results.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/newbb_poll_view.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/newbb_viewtopic.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/topicmanager.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/viewtopic.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/votepolls.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/readme.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/class/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/class/post.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/language/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/language/main.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/polls.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/templates/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/templates/newbb_poll_results.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/templates/newbb_poll_view.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/topicmanager.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/viewtopic.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/votepolls.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/smartclone/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/smartclone/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/smartclone/plugins/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/smartclone/plugins/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/smartclone/plugins/readme.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/smartclone/plugins/xoopspoll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/smartclone/readme.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/include/oninstall.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/include/onuninstall.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/include/onupdate.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/include/search.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/english/mail_template/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/english/mail_template/mail_voter.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/preloads/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/preloads/core.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/preloads/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/admin/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/admin/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/admin/xoopspoll_index.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/admin/xoopspoll_list.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/admin/xoopspoll_utility.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/blocks/xoopspoll_block_poll.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/blocks/xoopspoll_block_singlepoll.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_index.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_results.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_results_renderer.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_view.tpl

Removed Paths:
-------------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/xoopspoll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/blocks/xoopspoll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/css/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/images/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/include/constants.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/include/onupdate.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/french_iso/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/french_utf8/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/nederlands/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/spanish/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/swedish/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/blocks/xoopspoll_block_poll.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_admin_about.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_admin_help.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_results.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_view.html

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/about.php	2014-04-25 12:03:01 UTC (rev 12481)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/about.php	2014-04-25 12:08:17 UTC (rev 12482)
@@ -1,24 +1,29 @@
 <?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.
+*/
 /**
  * XOOPS Poll module
+ * Display module 'About' page in administration interface
  *
- * 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::  {@link http://sourceforge.net/projects/xoops/ The XOOPS Project}
+ * @license::    {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
+ * @package::    xoopspoll
+ * @subpackage:: admin
+ * @since::      1.40
+ * @author::     Mage, Mamba
+ * @version::    $Id$
  *
- * @copyright    The XOOPS Project (http://www.xoops.org)
- * @license      GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
- * @package    xoopsPoll
- * @since        2.5.0
- * @author     Mage, Mamba
- * @version    $Id $
- **/
-
-include_once dirname(__FILE__) . '/admin_header.php';
-
+ * @uses ModuleAdmin
+ * @uses ModuleAdmin::addNavigation to set the display page
+ * @uses ModuleAdmin::renderAbout to display the page passing PAYPAL key to method
+ */
+require_once 'admin_header.php';
 xoops_cp_header();
 
 $aboutAdmin = new ModuleAdmin();
@@ -26,4 +31,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/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_footer.php	2014-04-25 12:03:01 UTC (rev 12481)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_footer.php	2014-04-25 12:08:17 UTC (rev 12482)
@@ -1,26 +1,46 @@
 <?php
-/**
- * XoopsPoll 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.
+ */
+ /**
+ * XOOPS Poll 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::  {@link http://sourceforge.net/projects/xoops/ The XOOPS Project}
+ * @license::    {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
+ * @package::    xoopspoll
+ * @subpackage:: admin
+ * @since::      1.32
+ * @author::     XOOPS Module Team
+ * @version::    $Id$
  *
- * @copyright	The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license             http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package	xoopspoll
- * @since		2.5.0
- * @author 	XOOPS Module Team
- * @version	$Id $
-**/
+ * @uses $GLOBALS['xoopsModule'] used to get information about the module
+ * @uses xoops_gethandler() used to load information about the module
+ * @uses XoopsModule::getByDirname() to load information if module info not currently present
+ */
+
+if (!isset($GLOBALS['xoopsModule']) || !($GLOBALS['xoopsModule'] instanceof XoopsModule)) {
+    $GLOBALS['xoopsModule'] =& XoopsModule::getByDirname('xoopspoll');
+}
+
+$moduleHandler =& xoops_gethandler('module');
+$moduleInfo =& $moduleHandler->get($GLOBALS['xoopsModule']->getVar('mid'));
+
+$pathImageAdmin = '..' . DIRECTORY_SEPARATOR . $moduleInfo->getInfo('icons32');
+
 echo "<div class='adminfooter'>\n"
-    ."  <div style='text-align: center;'>\n"
-    ."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
-    ."  </div>\n"
-    ."  " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
-    ."</div>";
-
-xoops_cp_footer();
\ No newline at end of file
+   . "  <div class='center'>\n"
+   . "    <a href='" . $moduleInfo->getInfo('author_website_url') . "' target='_blank'><img src='{$pathImageAdmin}" . DIRECTORY_SEPARATOR . "xoopsmicrobutton.gif' alt='" . $xoopsModule->getInfo('author_website_name') . "' title='" . $moduleInfo->getInfo('author_website_name') . "' /></a>\n"
+   . "  </div>\n"
+   . "  <div class='center smallsmall italic pad5'>\n"
+   . "    " . _AM_XOOPSPOLL_MAINTAINED_BY
+   . " <a class='tooltip' rel='external' href='http://" . $GLOBALS['xoopsModule']->getInfo('module_website_url') . "' "
+   . "title='" . _AM_XOOPSPOLL_MAINTAINTED_TITLE . "'>" . _AM_XOOPSPOLL_MAINTAINTED_TEXT . "</a>\n"
+   . "  </div>\n"
+   . "</div>";
+xoops_cp_footer();

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_header.php	2014-04-25 12:03:01 UTC (rev 12481)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_header.php	2014-04-25 12:08:17 UTC (rev 12482)
@@ -1,42 +1,62 @@
 <?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.
+*/
 /**
- * XoopsPoll module
+ * XOOPS Poll 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::  {@link http://sourceforge.net/projects/xoops/ The XOOPS Project}
+ * @license::    {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
+ * @package::    xoopspoll
+ * @subpackage:: admin
+ * @since::		 1.32
+ * @author::     XOOPS Module Team
+ * @version::    $Id $
  *
- * @copyright           The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license             http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package             xoopspoll
- * @since               2.5.0
- * @author              XOOPS Module Team
- * @version             $Id $
- **/
+ * @uses $GLOBALS['xoops']::path read folder information about XOOPS
+ * @uses $GLOBALS['xoopsModule'] reads module specific information
+ * @uses xoops_load() method to dynamically load class for use
+ * @uses xoops_gethandler() function to load the module handler
+ * @uses xoops_loadLanguage() loads the module language defines
+ * @uses MyTextSanitizer
+ */
 
+/** {@internal the following 2 file includes aren't
+ * required as they are done by cp_header.php}
+ */
+
 $path = dirname(dirname(dirname(dirname(__FILE__))));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
+require_once $path . DIRECTORY_SEPARATOR . 'include'
+                   . DIRECTORY_SEPARATOR . 'cp_header.php';
 
-global $xoopsModule;
+/** Load language files
+ * {@internal the following load is not needed, it's done in ./include/cp_header.php */
+//xoops_loadLanguage('admin', 'xoopspoll');
+xoops_loadLanguage('modinfo', 'xoopspoll');
+xoops_loadLanguage('main', 'xoopspoll');
+xoops_load('constants', 'xoopspoll');
 
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+$pathIcon16      = '..' . DIRECTORY_SEPARATOR . $GLOBALS['xoopsModule']->getInfo('icons16');
+$pathIcon32      = '..' . DIRECTORY_SEPARATOR . $GLOBALS['xoopsModule']->getInfo('icons32');
+$pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
 
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
+// technically this isn't needed if only supporting XOOPS >= 2.5.5+
+if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . DIRECTORY_SEPARATOR . "moduleadmin.php"))) {
+    include_once $GLOBALS['xoops']->path($pathModuleAdmin . DIRECTORY_SEPARATOR . "moduleadmin.php");
+} else {
+    redirect_header($GLOBALS['xoops']->path('admin.php'), XoopspollConstants::REDIRECT_DELAY_LONG, _AM_XOOPSPOLL_ADMIN_MISSING, false);
+}
 
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+$myts =& MyTextSanitizer::getInstance();
 
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
-        include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-    }else{
-        redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
-    }
\ No newline at end of file
+/*
+if (!isset($GLOBALS['xoopsTpl']) || !$GLOBALS['xoopsTpl'] instanceof XoopsTpl) {
+    include_once $GLOBALS['xoops']->path("class" . DIRECTORY_SEPARATOR . "template.php");
+    $GLOBALS['xoopsTpl'] = new XoopsTpl();
+}
+*/

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/index.php	2014-04-25 12:03:01 UTC (rev 12481)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/index.php	2014-04-25 12:08:17 UTC (rev 12482)
@@ -1,51 +1,70 @@
 <?php
-// $Id$
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  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.  See the            //
-//  GNU General Public License for more details.               ...
 
[truncated message content]

[Xoops-svn] SF.net SVN: xoops-svn:[12996] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/xoopspoll

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

Revision: 12996
          http://sourceforge.net/p/xoops/svn/12996
Author:   beckmi
Date:     2015-02-18 18:20:22 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
1.40 RC1

Modified Paths:
--------------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/about.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_footer.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_header.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/index.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/main.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/menu.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/utility.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/constants.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/formdatetimepicker.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/log.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/option.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/plugin/userlog.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/poll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/pollutility.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/renderer.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/xoopspoll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/comment_delete.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/comment_edit.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/comment_new.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/comment_post.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/comment_reply.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/docs/changelog.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/docs/readme.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/marquee/plugins/xoopspoll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/class/post.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/class/userlanguage.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/language/english/main.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/polls.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/css/language/english/style.css
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/css/language/persian/style.css
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/templates/newbb_viewtopic.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/topicmanager.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/viewtopic.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/irmtfan/votepolls.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/class/post.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/language/main.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/polls.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/topicmanager.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/viewtopic.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/newbb_4x/trunk_4_00/votepolls.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/extras/smartclone/plugins/xoopspoll.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/include/oninstall.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/include/onuninstall.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/include/onupdate.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/include/search.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/index.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/language/english/modinfo.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/pollresults.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/preloads/core.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/sql/mysql.sql
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/blocks/xoopspoll_block_singlepoll.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_results.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/templates/xoopspoll_view.tpl
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/xoops_version.php

Removed Paths:
-------------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/request.php

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/about.php	2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/about.php	2015-02-18 18:20:22 UTC (rev 12996)
@@ -23,7 +23,7 @@
  * @uses ModuleAdmin::addNavigation to set the display page
  * @uses ModuleAdmin::renderAbout to display the page passing PAYPAL key to method
  */
-require_once 'admin_header.php';
+require_once __DIR__ . '/admin_header.php';
 xoops_cp_header();
 
 $aboutAdmin = new ModuleAdmin();
@@ -31,4 +31,4 @@
 echo $aboutAdmin->addNavigation('about.php');
 echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
 
-include 'admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_footer.php	2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_footer.php	2015-02-18 18:20:22 UTC (rev 12996)
@@ -31,11 +31,11 @@
 $moduleHandler =& xoops_gethandler('module');
 $moduleInfo =& $moduleHandler->get($GLOBALS['xoopsModule']->getVar('mid'));
 
-$pathImageAdmin = '..' . DIRECTORY_SEPARATOR . $moduleInfo->getInfo('icons32');
+$pathImageAdmin = '../' . $moduleInfo->getInfo('icons32');
 
 echo "<div class='adminfooter'>\n"
    . "  <div class='center'>\n"
-   . "    <a href='" . $moduleInfo->getInfo('author_website_url') . "' target='_blank'><img src='{$pathImageAdmin}" . DIRECTORY_SEPARATOR . "xoopsmicrobutton.gif' alt='" . $xoopsModule->getInfo('author_website_name') . "' title='" . $moduleInfo->getInfo('author_website_name') . "' /></a>\n"
+   . "    <a href='" . $moduleInfo->getInfo('author_website_url') . "' target='_blank'><img src='{$pathImageAdmin}" . "/xoopsmicrobutton.gif' alt='" . $xoopsModule->getInfo('author_website_name') . "' title='" . $moduleInfo->getInfo('author_website_name') . "' /></a>\n"
    . "  </div>\n"
    . "  <div class='center smallsmall italic pad5'>\n"
    . "    " . _AM_XOOPSPOLL_MAINTAINED_BY

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_header.php	2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/admin_header.php	2015-02-18 18:20:22 UTC (rev 12996)
@@ -30,27 +30,26 @@
  * required as they are done by cp_header.php}
  */
 
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-require_once $path . DIRECTORY_SEPARATOR . 'include'
-                   . DIRECTORY_SEPARATOR . 'cp_header.php';
+$path = dirname(dirname(dirname(__DIR__)));
+require_once $path . '/include/cp_header.php';
 
 /** Load language files
- * {@internal the following load is not needed, it's done in ./include/cp_header.php */
+ * {@internal the following load is not needed, it's done in ./include/cp_header.php} */
 //xoops_loadLanguage('admin', 'xoopspoll');
 xoops_loadLanguage('modinfo', 'xoopspoll');
 xoops_loadLanguage('main', 'xoopspoll');
 xoops_load('constants', 'xoopspoll');
 
-$pathIcon16      = '..' . DIRECTORY_SEPARATOR . $GLOBALS['xoopsModule']->getInfo('icons16');
-$pathIcon32      = '..' . DIRECTORY_SEPARATOR . $GLOBALS['xoopsModule']->getInfo('icons32');
+$pathIcon16      = '../' . $GLOBALS['xoopsModule']->getInfo('icons16');
+$pathIcon32      = '../' . $GLOBALS['xoopsModule']->getInfo('icons32');
 $pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
 
 // technically this isn't needed if only supporting XOOPS >= 2.5.5+
-if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . DIRECTORY_SEPARATOR . "moduleadmin.php"))) {
-    include_once $GLOBALS['xoops']->path($pathModuleAdmin . DIRECTORY_SEPARATOR . "moduleadmin.php");
-} else {
-    redirect_header($GLOBALS['xoops']->path('admin.php'), XoopspollConstants::REDIRECT_DELAY_LONG, _AM_XOOPSPOLL_ADMIN_MISSING, false);
-}
+//if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . DIRECTORY_SEPARATOR . "moduleadmin.php"))) {
+include_once $GLOBALS['xoops']->path($pathModuleAdmin . DIRECTORY_SEPARATOR . "moduleadmin.php");
+//} else {
+//    redirect_header($GLOBALS['xoops']->path('admin.php'), XoopspollConstants::REDIRECT_DELAY_LONG, _AM_XOOPSPOLL_ADMIN_MISSING, false);
+//}
 
 $myts =& MyTextSanitizer::getInstance();
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/index.php	2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/index.php	2015-02-18 18:20:22 UTC (rev 12996)
@@ -35,18 +35,18 @@
  * @version::    $Id$
 **/
 
-require_once 'admin_header.php';
+require_once __DIR__ . '/admin_header.php';
 xoops_cp_header();
 
 $admin_class = new ModuleAdmin();
 
 $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
-$totalPolls = $pollHandler->getCount();
-$criteria = new CriteriaCompo();
+$totalPolls  = $pollHandler->getCount();
+$criteria    = new CriteriaCompo();
 $criteria->add(new Criteria('start_time', time(), '<='));
 $criteria->add(new Criteria('end_time', time(), '>'));
 $totalActivePolls = $pollHandler->getCount($criteria);
-$criteria = new CriteriaCompo();
+$criteria         = new CriteriaCompo();
 $criteria->add(new Criteria('start_time', time(), '>'));
 $totalWaitingPolls = $pollHandler->getCount($criteria);
 $totalExpiredPolls = $totalPolls - $totalActivePolls - $totalWaitingPolls;
@@ -60,11 +60,6 @@
 /* use templates just in case we want to easily modify display in the future */
 $GLOBALS['xoopsTpl']->assign('navigation', $admin_class->addNavigation('index.php'));
 $GLOBALS['xoopsTpl']->assign('renderindex', $admin_class->renderIndex());
-$GLOBALS['xoopsTpl']->display($GLOBALS['xoops']->path('modules' . DIRECTORY_SEPARATOR
-                                                  . 'xoopspoll' . DIRECTORY_SEPARATOR
-                                                  . 'templates' . DIRECTORY_SEPARATOR
-                                                      . 'admin' . DIRECTORY_SEPARATOR
-                                                                . 'xoopspoll_index.tpl')
-);
+$GLOBALS['xoopsTpl']->display($GLOBALS['xoops']->path('modules/xoopspoll/templates/admin/xoopspoll_index.tpl'));
 
-require 'admin_footer.php';
+require_once __DIR__ . '/admin_footer.php';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/main.php	2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/main.php	2015-02-18 18:20:22 UTC (rev 12996)
@@ -49,22 +49,22 @@
  * @uses redirect_header() function to send user to page after completing task(s)
  */
 
-require_once 'admin_header.php';
-include_once $GLOBALS['xoops']->path("class" . DIRECTORY_SEPARATOR . "xoopsblock.php");
+require_once __DIR__ . '/admin_header.php';
+include_once $GLOBALS['xoops']->path("class/xoopsblock.php");
 
 xoops_load('xoopsformloader');
 xoops_load('xoopslists');
 xoops_load('renderer', 'xoopspoll');
 xoops_load('pollUtility', 'xoopspoll');
-xoops_load('request', 'xoopspoll');
+xoops_load('XoopsRequest');
 
-$op = XoopspollRequest::getString('op', 'list');
+$op = XoopsRequest::getString('op', 'list');
 switch ($op) {
 
 case 'list':
 default:
-    $limit = XoopspollRequest::getInt('limit', XoopspollConstants::DEFAULT_POLL_PAGE_LIMIT);
-    $start = XoopspollRequest::getInt('start', 0);
+    $limit = XoopsRequest::getInt('limit', XoopspollConstants::DEFAULT_POLL_PAGE_LIMIT);
+    $start = XoopsRequest::getInt('start', 0);
 
     $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
     $criteria = new CriteriaCompo();
@@ -104,7 +104,7 @@
             }
             if (!empty($pollsWithTopics)) {
                 $admin_class->addInfoBox(_AM_XOOPSPOLL_NEWBB_SUPPORT);
-                $admin_class->addInfoBoxLine(_AM_XOOPSPOLL_NEWBB_SUPPORT, "<img src='" . $pathIcon16 . DIRECTORY_SEPARATOR . "forum.png' alt='" . _AM_XOOPSPOLL_NEWBB_SUPPORT . "' /> " . _AM_XOOPSPOLL_NEWBB_INTRO, null, null, "information");
+                $admin_class->addInfoBoxLine(_AM_XOOPSPOLL_NEWBB_SUPPORT, "<img src='" . $pathIcon16 . "/forum.png' alt='" . _AM_XOOPSPOLL_NEWBB_SUPPORT . "' /> " . _AM_XOOPSPOLL_NEWBB_INTRO, null, null, "information");
                 $newbbIntro = $admin_class->renderInfoBox();
             } else {
                 $newbbIntro = "";
@@ -158,26 +158,26 @@
                     'buttons'              => array(
                                                'edit' => array(
                                                    'href' => $_SERVER['PHP_SELF'] . "?op=edit&amp;poll_id={$id}",
-                                                   'file' => $pathIcon16 . DIRECTORY_SEPARATOR . "edit.png",
+                                                   'file' => $pathIcon16 . "/edit.png",
                                                     'alt' => _AM_XOOPSPOLL_EDITPOLL),
                                                'clone' => array(
                                                    'href' => $_SERVER['PHP_SELF'] . "?op=clone&amp;poll_id={$id}",
-                                                   'file' => $pathIcon16 . DIRECTORY_SEPARATOR . "editcopy.png",
+                                                   'file' => $pathIcon16 . "/editcopy.png",
                                                     'alt' => _AM_XOOPSPOLL_CLONE),
                                                'delete' => array(
                                                    'href' => $_SERVER['PHP_SELF'] . "?op=delete&amp;poll_id={$id}",
-                                                   'file' => $pathIcon16 . DIRECTORY_SEPARATOR . "delete.png",
+                                                   'file' => $pathIcon16 . "/delete.png",
                                                     'alt' => _DELETE),
                                                'log' => array(
                                                    'href' => $_SERVER['PHP_SELF'] . "?op=log&amp;poll_id={$id}",
-                                                   'file' => $pathIcon16 . DIRECTORY_SEPARATOR . "search.png",
+                                                   'file' => $pathIcon16 . "/search.png",
                                                     'alt' => _AM_XOOPSPOLL_VIEWLOG)
                                              )
             );
             if ($topic_id > 0) {
                 $pollItems[$id]['buttons']['forum'] = array(
                                                         'href'  => $GLOBALS['xoops']->url("modules/newbb/viewtopic.php") . "?topic_id={$topic_id}",
-                                                        'file'  => $pathIcon16 . DIRECTORY_SEPARATOR . "forum.png",
+                                                        'file'  => $pathIcon16 . "/forum.png",
                                                         'alt'   => _AM_XOOPSPOLL_NEWBB_TOPIC . "&nbsp;" . htmlspecialchars($topic_title)
                 );
             }
@@ -190,13 +190,8 @@
     $xoopsTpl->assign('pollItems', $pollItems);
     $xoopsTpl->assign('rendered_nav', $renderedNav);
     $xoopsTpl->assign('self', $_SERVER['PHP_SELF']);
-    $xoopsTpl->display($GLOBALS['xoops']->path('modules' . DIRECTORY_SEPARATOR
-                                           . 'xoopspoll' . DIRECTORY_SEPARATOR
-                                           . 'templates' . DIRECTORY_SEPARATOR
-                                               . 'admin' . DIRECTORY_SEPARATOR
-                                                         . 'xoopspoll_list.tpl')
-    );
-    include 'admin_footer.php';
+    $xoopsTpl->display($GLOBALS['xoops']->path('modules/xoopspoll/templates/admin/xoopspoll_list.tpl'));
+    include_once __DIR__ . '/admin_footer.php';
     exit();
     break;
 
@@ -204,7 +199,7 @@
 case 'add':
     $optHandler  =& xoops_getmodulehandler('option', 'xoopspoll');
     $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
-    $pollId = XoopspollRequest::getInt('poll_id', 0);
+    $pollId = XoopsRequest::getInt('poll_id', 0);
     $pollObj = $pollHandler->get($pollId); // will auto create object if poll_id=0
 
     // display the form
@@ -212,7 +207,7 @@
     $admin_class = new ModuleAdmin();
     echo $admin_class->addNavigation('main.php');
     $pollObj->renderForm($_SERVER['PHP_SELF'], 'post');
-    include 'admin_footer.php';
+    include_once __DIR__ . '/admin_footer.php';
     exit();
     break;
 
@@ -225,16 +220,16 @@
     $logHandler  =& xoops_getmodulehandler('log', 'xoopspoll');
     $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
 
-    $pollId = XoopspollRequest::getInt('poll_id', 0, 'POST');
+    $pollId = XoopsRequest::getInt('poll_id', 0, 'POST');
     $pollObj = $pollHandler->get($pollId);
 
-    $notify = XoopspollRequest::getInt('notify', XoopspollConstants::NOTIFICATION_ENABLED, 'POST');
+    $notify = XoopsRequest::getInt('notify', XoopspollConstants::NOTIFICATION_ENABLED, 'POST');
 
     $currentTimestamp = time();
-    $xuEndTimestamp   = strtotime(XoopspollRequest::getString('xu_end_time', null, 'POST'));
-    $endTimestamp     = (empty($_POST['xu_end_time'])) ? ($currentTimestamp + XoopspollConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuEndTimestamp);
-    $xuStartTimestamp = strtotime(XoopspollRequest::getString('xu_start_time', null, 'POST'));
-    $startTimestamp   = (empty($_POST['xu_start_time'])) ? ($endTimestamp - XoopspollConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuStartTimestamp);
+    $xuEndTimestamp   = strtotime(XoopsRequest::getString('xu_end_time', null, 'POST'));
+    $endTimestamp     = (empty($xuEndTimestamp)) ? ($currentTimestamp + XoopspollConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuEndTimestamp);
+    $xuStartTimestamp = strtotime(XoopsRequest::getString('xu_start_time', null, 'POST'));
+    $startTimestamp   = (empty($xuStartTimestamp)) ? ($endTimestamp - XoopspollConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuStartTimestamp);
 
     //  don't allow changing start time if there are votes in the log
     if (($startTimestamp < $pollObj->getVar('start_time'))
@@ -244,19 +239,19 @@
     }
 
     $pollVars = array(
-             'user_id'     => XoopspollRequest::getInt('user_id', $GLOBALS['xoopsUser']->uid(), 'POST'),
-             'question'    => XoopspollRequest::getString('question', null, 'POST'),
-             'description' => XoopspollRequest::getText('description', null, 'POST'),
+             'user_id'     => XoopsRequest::getInt('user_id', $GLOBALS['xoopsUser']->uid(), 'POST'),
+             'question'    => XoopsRequest::getString('question', null, 'POST'),
+             'description' => XoopsRequest::getText('description', null, 'POST'),
              'mail_status' => (XoopspollConstants::NOTIFICATION_ENABLED == $notify) ? XoopspollConstants::POLL_NOT_MAILED : XoopspollConstants::POLL_MAILED,
-             'mail_voter'  => XoopspollRequest::getInt('mail_voter', XoopspollConstants::NOT_MAIL_POLL_TO_VOTER, 'POST'),
+             'mail_voter'  => XoopsRequest::getInt('mail_voter', XoopspollConstants::NOT_MAIL_POLL_TO_VOTER, 'POST'),
              'start_time'  => $startTimestamp,
              'end_time'    => $endTimestamp,
-             'display'     => XoopspollRequest::getInt('display', XoopspollConstants::DO_NOT_DISPLAY_POLL_IN_BLOCK, 'POST'),
-             'visibility'  => XoopspollRequest::getInt('visibility', XoopspollConstants::HIDE_NEVER, 'POST'),
-             'weight'      => XoopspollRequest::getInt('weight', XoopspollConstants::DEFAULT_WEIGHT, 'POST'),
-             'multiple'    => XoopspollRequest::getInt('multiple', XoopspollConstants::NOT_MULTIPLE_SELECT_POLL, 'POST'),
-             'multilimit'  => XoopspollRequest::getInt('multilimit', XoopspollConstants::MULTIPLE_SELECT_LIMITLESS, 'POST'),
-             'anonymous'   => XoopspollRequest::getInt('anonymous', XoopspollConstants::ANONYMOUS_VOTING_DISALLOWED, 'POST'),
+             'display'     => XoopsRequest::getInt('display', XoopspollConstants::DO_NOT_DISPLAY_POLL_IN_BLOCK, 'POST'),
+             'visibility'  => XoopsRequest::getInt('visibility', XoopspollConstants::HIDE_NEVER, 'POST'),
+             'weight'      => XoopsRequest::getInt('weight', XoopspollConstants::DEFAULT_WEIGHT, 'POST'),
+             'multiple'    => XoopsRequest::getInt('multiple', XoopspollConstants::NOT_MULTIPLE_SELECT_POLL, 'POST'),
+             'multilimit'  => XoopsRequest::getInt('multilimit', XoopspollConstants::MULTIPLE_SELECT_LIMITLESS, 'POST'),
+             'anonymous'   => XoopsRequest::getInt('anonymous', XoopspollConstants::ANONYMOUS_VOTING_DISALLOWED, 'POST'),
     );
     $pollObj->setVars($pollVars);
     $pollId = $pollHandler->insert($pollObj);
@@ -266,10 +261,10 @@
     }
 
     // now get the options
-    $optionIdArray    = XoopspollRequest::getArray('option_id', array(), 'POST');
+    $optionIdArray    = XoopsRequest::getArray('option_id', array(), 'POST');
     $optionIdArray    = array_map('intval', $optionIdArray);
-    $optionTextArray  = XoopspollRequest::getArray('option_text', array(), 'POST');
-    $optionColorArray = XoopspollRequest::getArray('option_color', array(), 'POST');
+    $optionTextArray  = XoopsRequest::getArray('option_text', array(), 'POST');
+    $optionColorArray = XoopsRequest::getArray('option_color', array(), 'POST');
 
     foreach ($optionIdArray as $key=>$oId) {
         if (!empty($oId) && ($optionObj = $optHandler->get($oId))) {
@@ -303,25 +298,23 @@
 
     unset($optHandler, $logHandler, $pollObj, $pollHandler, $pollId);
     // clear the template cache so changes take effect immediately
-    include_once $GLOBALS['xoops']->path("class" . DIRECTORY_SEPARATOR . "template.php");
+    include_once $GLOBALS['xoops']->path("class/template.php");
     xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
     redirect_header($_SERVER['PHP_SELF'] . "?op=list", XoopspollConstants::REDIRECT_DELAY_SHORT, _AM_XOOPSPOLL_DBUPDATED);
-    exit();
     break;
 
 case 'delete':
-    $pollId = XoopspollRequest::getInt('poll_id', 0);
+    $pollId = XoopsRequest::getInt('poll_id', 0);
     $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
     $pollObj = $pollHandler->get($pollId);
     if (empty($pollObj) || !($pollObj instanceof XoopspollPoll)) {
         redirect_header($_SERVER['PHP_SELF'], XoopspollConstants::REDIRECT_DELAY_SHORT, implode('<br />', $pollHandler->getErrors()));
-        exit();
     }
     xoops_cp_header();
     $admin_class = new ModuleAdmin();
     echo $admin_class->addNavigation('main.php');
     xoops_confirm(array('op' => 'delete_ok', 'poll_id' => $pollId), $_SERVER['PHP_SELF'], sprintf(_AM_XOOPSPOLL_RUSUREDEL, $myts->htmlSpecialChars($pollObj->getVar('question'))));
-    include 'admin_footer.php';
+    include_once __DIR__ . '/admin_footer.php';
 //    xoops_cp_footer();
     exit();
     break;
@@ -331,7 +324,7 @@
         redirect_header($_SERVER['PHP_SELF'], XoopspollConstants::REDIRECT_DELAY_MEDIUM, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
     }
     $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
-    $pollId = XoopspollRequest::getInt('poll_id', 0, 'POST');
+    $pollId = XoopsRequest::getInt('poll_id', 0, 'POST');
     if ($pollHandler->deleteAll(new Criteria('poll_id', $pollId, '='))) {
         $optHandler =& xoops_getmodulehandler('option', 'xoopspoll');
         $optHandler->deleteAll(new Criteria('poll_id', $pollId));
@@ -339,7 +332,7 @@
         $logHandler->deleteByPollId($pollId);
         unset($pollHandler, $optHandler, $logHandler);
         // clear the template cache
-        include_once $GLOBALS['xoops']->path("class" . DIRECTORY_SEPARATOR . "template.php");
+        include_once $GLOBALS['xoops']->path("class/template.php");
         xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
         // delete comments for this poll
         xoops_comment_delete($GLOBALS['xoopsModule']->getVar('mid'), $pollId);
@@ -358,12 +351,11 @@
         }
     }
     redirect_header($_SERVER['PHP_SELF'], XoopspollConstants::REDIRECT_DELAY_SHORT, _AM_XOOPSPOLL_DBUPDATED);
-    exit();
     break;
 
 case 'restart':
     xoops_load('FormDateTimePicker', 'xoopspoll');
-    $pollId = XoopspollRequest::getInt('poll_id', 0);
+    $pollId = XoopsRequest::getInt('poll_id', 0);
     $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
     $pollObj = $pollHandler->get($pollId);
     $pollForm = new XoopsThemeForm(_AM_XOOPSPOLL_RESTARTPOLL, "poll_form", $_SERVER['PHP_SELF'], 'post', true);
@@ -403,7 +395,7 @@
     $admin_class = new ModuleAdmin();
     echo $admin_class->addNavigation('main.php');
     $pollForm->display();
-    include 'admin_footer.php';
+    include_once __DIR__ . '/admin_footer.php';
     exit();
     break;
 
@@ -411,24 +403,23 @@
     if (!$GLOBALS['xoopsSecurity']->check()) {
         redirect_header($_SERVER['PHP_SELF'], XoopspollConstants::REDIRECT_DELAY_MEDIUM, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
     }
-    $pollId  = XoopspollRequest::getInt('poll_id', 0, 'POST');
+    $pollId  = XoopsRequest::getInt('poll_id', 0, 'POST');
     if (empty($pollId)) {
         redirect_header($_SERVER['PHP_SELF'], XoopspollConstants::REDIRECT_DELAY_SHORT, _AM_XOOPSPOLL_ERROR_INVALID_POLLID);
-        exit();
     }
 
     $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
     $pollObj = $pollHandler->get($pollId);
 
-    $xuEndTimestamp   = strtotime(XoopspollRequest::getString('xu_end_time', null, 'POST'));
-    $xuStartTimestamp = strtotime(XoopspollRequest::getString('xu_start_time', null, 'POST'));
+    $xuEndTimestamp   = strtotime(XoopsRequest::getString('xu_end_time', null, 'POST'));
+    $xuStartTimestamp = strtotime(XoopsRequest::getString('xu_start_time', null, 'POST'));
 
-    $endTimestamp   = (empty($_POST['xu_end_time'])) ? (time() + XoopspollConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuEndTimestamp);
-    $startTimestamp = (empty($_POST['xu_start_time'])) ? ($xuEndTimestamp - XoopspollConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuStartTimestamp);
+    $endTimestamp   = (empty($xuEndTimestamp)) ? (time() + XoopspollConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuEndTimestamp);
+    $startTimestamp = (empty($xuStartTimestamp)) ? ($xuEndTimestamp - XoopspollConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuStartTimestamp);
     $pollObj->setVar('end_time', $endTimestamp);
     $pollObj->setVar('start_time', $startTimestamp);
 
-    $notify = XoopspollRequest::getInt('notify', XoopspollConstants::NOTIFICATION_DISABLED, 'POST');
+    $notify = XoopsRequest::getInt('notify', XoopspollConstants::NOTIFICATION_DISABLED, 'POST');
     if (XoopspollConstants::NOTIFICATION_ENABLED == $notify) {
         // if notify, set mail status to "not mailed"
         $pollObj->setVar('mail_status', XoopspollConstants::POLL_NOT_MAILED);
@@ -439,7 +430,7 @@
     // save the poll settings
     $pollHandler->insert($pollObj);
 
-    $reset  = XoopspollRequest::getInt('reset', XoopspollConstants::DO_NOT_RESET_RESULTS, 'POST');
+    $reset  = XoopsRequest::getInt('reset', XoopspollConstants::DO_NOT_RESET_RESULTS, 'POST');
     if (XoopspollConstants::RESET_RESULTS == $reset) {
         // reset all logs
         $logHandler =& xoops_getmodulehandler('log', 'xoopspoll');
@@ -453,22 +444,20 @@
         echo $pollObj->getHtmlErrors();
         exit();
     }
-    include_once $GLOBALS['xoops']->path("class" . DIRECTORY_SEPARATOR . "template.php");
+    include_once $GLOBALS['xoops']->path("class/template.php");
     xoops_template_clear_module_cache($GLOBALS['xoopsModule']->ge...
 
[truncated message content]