From: <be...@us...> - 2014-04-25 12:08:38
|
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. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // +/* + 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. -require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php'; -include_once dirname(__FILE__) . '/admin_header.php'; -xoops_cp_header(); + 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. -$indexAdmin = new ModuleAdmin(); + 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. -$result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("xoopspoll_desc") . "") ; -list($totalPolls) = $xoopsDB->fetchRow($result) ; + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + /** + * XOOPS Poll module + * Administration index to display module information and admin links + * + * @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$ +**/ -$result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("xoopspoll_desc") . " WHERE end_time < UNIX_TIMESTAMP()") ; -list($totalNonActivePolls) = $xoopsDB->fetchRow($result) ; +require_once 'admin_header.php'; +xoops_cp_header(); -$totalActivePolls = $totalPolls - $totalNonActivePolls; +$admin_class = new ModuleAdmin(); -$indexAdmin->addInfoBox(_MD_XOOPSPOLL_DASHBOARD) ; -$indexAdmin->addInfoBoxLine(_MD_XOOPSPOLL_DASHBOARD, "<infolabel>" ._MD_XOOPSPOLL_TOTALACTIVE. "</infolabel>", $totalActivePolls, 'Green') ; -$indexAdmin->addInfoBoxLine(_MD_XOOPSPOLL_DASHBOARD, "<infolabel>" ._MD_XOOPSPOLL_TOTALNONACTIVE. "</infolabel>", $totalNonActivePolls, 'Red') ; -$indexAdmin->addInfoBoxLine(_MD_XOOPSPOLL_DASHBOARD, "<infolabel>" ._MD_XOOPSPOLL_TOTALPOLLS."</infolabel><infotext>", $totalPolls."</infotext>") ; - +$pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll'); +$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->add(new Criteria('start_time', time(), '>')); +$totalWaitingPolls = $pollHandler->getCount($criteria); +$totalExpiredPolls = $totalPolls - $totalActivePolls - $totalWaitingPolls; - echo $indexAdmin->addNavigation('index.php'); - echo $indexAdmin->renderIndex(); +$admin_class->addInfoBox(_MD_XOOPSPOLL_DASHBOARD) ; +$admin_class->addInfoBoxLine(_MD_XOOPSPOLL_DASHBOARD, "<span class='infolabel'>" ._MD_XOOPSPOLL_TOTALACTIVE. "</span>", $totalActivePolls, 'Green') ; +$admin_class->addInfoBoxLine(_MD_XOOPSPOLL_DASHBOARD, "<span class='infolabel'>" ._MD_XOOPSPOLL_TOTALWAITING. "</span>", $totalWaitingPolls, 'Green') ; +$admin_class->addInfoBoxLine(_MD_XOOPSPOLL_DASHBOARD, "<span class='infolabel'>" ._MD_XOOPSPOLL_TOTALEXPIRED. "</span>", $totalExpiredPolls, 'Red') ; +$admin_class->addInfoBoxLine(_MD_XOOPSPOLL_DASHBOARD, "<span class='infolabel'>" ._MD_XOOPSPOLL_TOTALPOLLS."</span><span class='infotext'>", $totalPolls."</span>") ; -include "admin_footer.php"; \ No newline at end of file +/* 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') +); + +require 'admin_footer.php'; Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/main.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/main.php (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/main.php 2014-04-25 12:08:17 UTC (rev 12482) @@ -0,0 +1,727 @@ +<?php +/* + 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * XOOPS Poll Administration + * Routines to manage administration of CRUD and display of polls + * + * @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 + * @author:: Xoops Module Team + * @since:: 1.0 + * @version:: $Id$ + * + * @uses xoops_load() to instantiate needed classes + * @uses XoopsFormloader + * @uses Xoopslists + * @uses CriteriaCompo + * @uses Criteria + * @uses xoops_getmodulehandler() to load this modules class handlers + * @uses ModuleAdmin class to display module administration page navigation + * @uses $GLOBALS['xoopsSecurity']::getTokenHTML() used for security on input of form data + * @uses $GLOBALS['xoops'] class::methods used to get general information about XOOPS + * @uses XoopsPageNav class to display page navigation links for multiple pages of data + * @uses xoops_template_clear_module_cache() function used to clear cache after data has been updated + * @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"); + +xoops_load('xoopsformloader'); +xoops_load('xoopslists'); +xoops_load('renderer', 'xoopspoll'); +xoops_load('pollUtility', 'xoopspoll'); +xoops_load('request', 'xoopspoll'); + +$op = XoopspollRequest::getString('op', 'list'); +switch ($op) { + +case 'list': +default: + $limit = XoopspollRequest::getInt('limit', XoopspollConstants::DEFAULT_POLL_PAGE_LIMIT); + $start = XoopspollRequest::getInt('start', 0); + + $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll'); + $criteria = new CriteriaCompo(); + $criteria->setLimit($limit + 1); + $criteria->setStart($start); + $criteria->setSort('weight ASC, start_time'); // trick criteria to allow 2 sort criteria + $criteria->setOrder('ASC'); + $pollObjs = $pollHandler->getAll($criteria); + $pollsCount = count($pollObjs); + +// $GLOBALS['xoopsOption']['template_main'] = 'xoopspoll_list.html'; + xoops_cp_header(); + $admin_class = new ModuleAdmin(); + + $xoopsTpl->assign('navigation', $admin_class->addNavigation('main.php')); + $admin_class->addItemButton(_AM_XOOPSPOLL_CREATENEWPOLL, 'main.php' . '?op=add', $icon = 'add'); + $xoopsTpl->assign('addPollButton', $admin_class->renderButton()); + + $renderedNav = ""; + + if (is_array($pollObjs) && $pollsCount > 0) { + /* if newbb forum module is loaded find poll/topic association */ + $module_handler =& xoops_gethandler('module'); + $newbbModule =& $module_handler->getByDirname('newbb'); + if (($newbbModule instanceof XoopsModule) && $newbbModule->isactive()) { + $topic_handler =& xoops_getmodulehandler('topic', 'newbb'); + $topicFields = array('topic_id', 'topic_title', 'poll_id'); + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('topic_haspoll', 0, '>')); + $pollsWithTopics = array(); + $topicsWithPolls = $topic_handler->getAll($criteria, $topicFields, false); + foreach ($topicsWithPolls as $pollTopics) { + $pollsWithTopics[$pollTopics['poll_id']] = array( + 'topic_id' => $pollTopics['topic_id'], + 'topic_title' => $pollTopics['topic_title'] + ); + } + 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"); + $newbbIntro = $admin_class->renderInfoBox(); + } else { + $newbbIntro = ""; + } + } else { + $pollsWithTopics = array(); + $newbbIntro = ""; + } + $xoopsTpl->assign('newbbIntro', $newbbIntro); + $xoopsTpl->assign('securityToken', $GLOBALS['xoopsSecurity']->getTokenHTML()); + + $pollItems = array(); + foreach ($pollObjs as $pollObj) { + $pollVars = $pollObj->getValues(); + $id = $pollVars['poll_id']; + + if (array_key_exists($id, $pollsWithTopics)) { + $topic_id = $pollsWithTopics[$id]['topic_id']; + $topic_title = $pollsWithTopics[$id]['topic_title']; + } else { + $topic_id = 0; + $topic_title = ""; + } + + $checked = (XoopspollConstants::DISPLAY_POLL_IN_BLOCK == $pollVars['display']) ? " checked='checked'" : ""; + + $xuCurrentTimestamp = xoops_getUserTimestamp(time()); + $xuCurrentFormatted = ucfirst(date(_MEDIUMDATESTRING, $xuCurrentTimestamp)); + $xuStartTimestamp = xoops_getUserTimestamp($pollVars['start_time']); + $xuStartFormattedTime = ucfirst(date(_MEDIUMDATESTRING, $xuStartTimestamp)); + $xuEndTimestamp = xoops_getUserTimestamp($pollVars['end_time']); + + if ($xuEndTimestamp > $xuCurrentTimestamp) { + $end = ucfirst(date(_MEDIUMDATESTRING, $xuEndTimestamp)); // formatted output for current user + } else { + $end = "<span class='red'>" . _AM_XOOPSPOLL_EXPIRED . "</span><br />" + . "<a href='" . $_SERVER['PHP_SELF'] . "?op=restart&poll_id={$id}'>" . _AM_XOOPSPOLL_RESTART."</a>"; + } + + $pollItems[$id] = array( + 'question' => $pollVars['question'], + 'id' => $id, + 'weight' => $pollVars['weight'], + 'topic_id' => $topic_id, + 'topic_title' => $topic_title, + 'checked' => $checked, + 'voters' => $pollVars['voters'], + 'votes' => $pollVars['votes'], + 'xuStartFormattedTime' => $xuStartFormattedTime, + 'end' => $end, + 'buttons' => array( + 'edit' => array( + 'href' => $_SERVER['PHP_SELF'] . "?op=edit&poll_id={$id}", + 'file' => $pathIcon16 . DIRECTORY_SEPARATOR . "edit.png", + 'alt' => _AM_XOOPSPOLL_EDITPOLL), + 'clone' => array( + 'href' => $_SERVER['PHP_SELF'] . "?op=clone&poll_id={$id}", + 'file' => $pathIcon16 . DIRECTORY_SEPARATOR . "editcopy.png", + 'alt' => _AM_XOOPSPOLL_CLONE), + 'delete' => array( + 'href' => $_SERVER['PHP_SELF'] . "?op=delete&poll_id={$id}", + 'file' => $pathIcon16 . DIRECTORY_SEPARATOR . "delete.png", + 'alt' => _DELETE), + 'log' => array( + 'href' => $_SERVER['PHP_SELF'] . "?op=log&poll_id={$id}", + 'file' => $pathIcon16 . DIRECTORY_SEPARATOR . "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", + 'alt' => _AM_XOOPSPOLL_NEWBB_TOPIC . " " . htmlspecialchars($topic_title) + ); + } + } + xoops_load('pagenav'); + $pageNav = new XoopsPageNav($pollsCount, $limit, $start); + $renderedNav = $pageNav->renderNav(); + } + + $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'; + exit(); + break; + +case 'edit': +case 'add': + $optHandler =& xoops_getmodulehandler('option', 'xoopspoll'); + $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll'); + $pollId = XoopspollRequest::getInt('poll_id', 0); + $pollObj = $pollHandler->get($pollId); // will auto create object if poll_id=0 + + // display the form + xoops_cp_header(); + $admin_class = new ModuleAdmin(); + echo $admin_class->addNavigation('main.php'); + $pollObj->renderForm($_SERVER['PHP_SELF'], 'post'); + include 'admin_footer.php'; + exit(); + break; + +case 'update': + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header($_SERVER['PHP_SELF'], XoopspollConstants::REDIRECT_DELAY_MEDIUM, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + $optHandler =& xoops_getmodulehandler('option', 'xoopspoll'); + $logHandler =& xoops_getmodulehandler('log', 'xoopspoll'); + $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll'); + + $pollId = XoopspollRequest::getInt('poll_id', 0, 'POST'); + $pollObj = $pollHandler->get($pollId); + + $notify = XoopspollRequest::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); + + // don't allow changing start time if there are votes in the log + if (($startTimestamp < $pollObj->getVar('start_time')) + && ($logHandler->getTotalVotesByPollId($pollId) > 0)) + { + $startTimestamp = $pollObj->getVar('start_time'); //don't change start time + } + + $pollVars = array( + 'user_id' => XoopspollRequest::getInt('user_id', $GLOBALS['xoopsUser']->uid(), 'POST'), + 'question' => XoopspollRequest::getString('question', null, 'POST'), + 'description' => XoopspollRequest::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'), + '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'), + ); + $pollObj->setVars($pollVars); + $pollId = $pollHandler->insert($pollObj); + if (!$pollId) { + $err = $pollObj->getHtmlErrors(); + exit($err); + } + + // now get the options + $optionIdArray = XoopspollRequest::getArray('option_id', array(), 'POST'); + $optionIdArray = array_map('intval', $optionIdArray); + $optionTextArray = XoopspollRequest::getArray('option_text', array(), 'POST'); + $optionColorArray = XoopspollRequest::getArray('option_color', array(), 'POST'); + + foreach ($optionIdArray as $key=>$oId) { + if (!empty($oId) && ($optionObj = $optHandler->get($oId))) { + // existing option object so need to update it + $optionTextArray[$key] = trim($optionTextArray[$key]); + if ('' == $optionTextArray[$key]) { + // want to delete this option + if (false !== $optHandler->delete($optionObj)) { + // now remove it from the log + $logHandler->deleteByOptionId($optionObj->getVar('option_id')); + } + } else { + $optionObj->setVar('option_text', $optionTextArray[$key]); + $optionObj->setVar('option_color', $optionColorArray[$key]); + $optionObj->setVar('poll_id', $pollId); + $optHandler->insert($optionObj); + } + } else { + // new option object + $optionObj = $optHandler->create(); + $optionTextArray[$key] = trim($optionTextArray[$key]); + if ('' !== $optionTextArray[$key]) { // ignore if text is empty + $optionObj->setVar('option_text', $optionTextArray[$key]); + $optionObj->setVar('option_color', $optionColorArray[$key]); + $optionObj->setVar('poll_id', $pollId); + $optHandler->insert($optionObj); + } + unset($optionObj); + } + } + + 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"); + 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); + $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'; +// xoops_cp_footer(); + exit(); + break; + +case 'delete_ok': + if (!$GLOBALS['xoopsSecurity']->check()) { + 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'); + if ($pollHandler->deleteAll(new Criteria('poll_id', $pollId, '='))) { + $optHandler =& xoops_getmodulehandler('option', 'xoopspoll'); + $optHandler->deleteAll(new Criteria('poll_id', $pollId)); + $logHandler =& xoops_getmodulehandler('log', 'xoopspoll'); + $logHandler->deleteByPollId($pollId); + unset($pollHandler, $optHandler, $logHandler); + // clear the template cache + include_once $GLOBALS['xoops']->path("class" . DIRECTORY_SEPARATOR . "template.php"); + xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid')); + // delete comments for this poll + xoops_comment_delete($GLOBALS['xoopsModule']->getVar('mid'), $pollId); + + //now clear association with newbb topic if one exists + $module_handler =& xoops_gethandler('module'); + $newbbModule =& $module_handler->getByDirname('newbb'); + if (($newbbModule instanceof XoopsModule) && $newbbModule->isactive()) { + $topic_handler =& xoops_getmodulehandler('topic', 'newbb'); + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('poll_id', $pollId, "=")); + /** {@internal the order of the next 2 statements is important! */ + $topic_handler->updateAll('topic_haspoll', 0, $criteria); // clear poll association + $topic_handler->updateAll('poll_id', 0, $criteria); // clear poll_id + xoops_template_clear_module_cache($newbbModule->getVar('mid')); // clear newbb template cache + } + } + 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); + $pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll'); + $pollObj = $pollHandler->get($pollId); + $pollForm = new XoopsThemeForm(_AM_XOOPSPOLL_RESTARTPOLL, "poll_form", $_SERVER['PHP_SELF'], 'post', true); + + // setup times for forms + $xuCurrentTimestamp = xoops_getUserTimestamp(time()); + $xuCurrentFormatted = ucfirst(date(_MEDIUMDATESTRING, $xuCurrentTimestamp)); + $xuStartTimestamp = $xuCurrentTimestamp; + $xuEndTimestamp = $xuStartTimestamp + XoopspollConstants::DEFAULT_POLL_DURATION; + + $timeTray = new XoopsFormElementTray(_AM_XOOPSPOLL_POLL_TIMES, " ", "time_tray"); + + //add start time to the form + $startTimeText = new XoopspollFormDateTimePicker("<div class='bold'>" . _AM_XOOPSPOLL_START_TIME . "<br />" + . "<span class='x-small'>" . _AM_XOOPSPOLL_FORMAT . "<br />" + . sprintf(_AM_XOOPSPOLL_CURRENTTIME, $xuCurrentFormatted) . "</span></div>" + , 'xu_start_time' + , 20 + , $xuStartTimestamp); + $timeTray->addElement($startTimeText, true); + + // add ending date to form + $endTimeText = new XoopspollFormDateTimePicker("<div class='bold middle'>" . _AM_XOOPSPOLL_EXPIRATION . "</div>" + , 'xu_end_time' + , 20 + , $xuEndTimestamp); + $timeTray->addElement($endTimeText, true); + $pollForm->addElement($timeTray); + + $pollForm->addElement(new XoopsFormRadioYN(_AM_XOOPSPOLL_NOTIFY, "notify", XoopspollConstants::POLL_MAILED)); + $pollForm->addElement(new XoopsFormRadioYN(_AM_XOOPSPOLL_RESET, "reset", 0)); + $pollForm->addElement(new XoopsFormHidden("op", "restart_ok")); + $pollForm->addElement(new XoopsFormHidden("poll_id", $pollId)); + $pollForm->addElement(new XoopsFormButton("", "poll_submit", _AM_XOOPSPOLL_RESTART, "submit")); + + xoops_cp_header(); + $admin_class = new ModuleAdmin(); + echo $admin_class->addNavigation('main.php'); + $pollForm->display(); + include 'admin_footer.php'; + exit(); + break; + +case 'restart_ok': + 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'); + 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')); + + $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); + $pollObj->setVar('end_time', $endTimestamp); + $pollObj->setVar('start_time', $startTimestamp); + + $notify = XoopspollRequest::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); + } else { + // if not notify, set mail status to already "mailed" + $pollObj->setVar('mail_status', XoopspollConstants::POLL_MAILED); + } + // save the poll settings + $pollHandler->insert($pollObj); + + $reset = XoopspollRequest::getInt('reset', XoopspollConstants::DO_NOT_RESET_RESULTS, 'POST'); + if (XoopspollConstants::RESET_RESULTS == $reset) { + // reset all logs + $logHandler =& xoops_getmodulehandler('log', 'xoopspoll'); + $logHandler->deleteByPollId($pollId); + unset($logHandler); + $optHandler =& xoops_getmodulehandler('option', 'xoopspoll'); + $criteria = new Criteria('poll_id', $pollId, '='); + $optHandler->updateAll('option_count', 0, $criteria); + } + if (!$pollHandler->updateCount($pollObj)) { + echo $pollObj->getHtmlErrors(); + exit(); + } + include_once $GLOBALS['xoops']->path("class" . DIRECTORY_SEPARATOR . "template.php"); + xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid')); + redirect_header($_SERVER['PHP_SELF'], XoopspollConstants::REDIRECT_DELAY_SHORT, _AM_XOOPSPOLL_DBUPDATED); + exit(); + break; + +case 'log': + $pollId = XoopspollRequest::getInt('poll_id', 0); + $limit = XoopspollRequest::getInt('limit', XoopspollConstants::DEFAULT_POLL_PAGE_LIMIT); + $start = XoopspollRequest::getInt('start', 0); + $orderby = XoopspollRequest::getString('orderby', 'time'); + $orderdir = XoopspollRequest::getString('orderdir', 'ASC'); + + 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); + $expiredClass = ($po... [truncated message content] |