Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12996] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/xoopspoll
|
From: <be...@us...> - 2015-02-18 18:20:36
|
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&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&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&poll_id={$id}",
- 'file' => $pathIcon16 . DIRECTORY_SEPARATOR . "delete.png",
+ 'file' => $pathIcon16 . "/delete.png",
'alt' => _DELETE),
'log' => array(
'href' => $_SERVER['PHP_SELF'] . "?op=log&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 . " " . 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']->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');
+ $pollId = XoopsRequest::getInt('poll_id', 0);
+ $limit = XoopsRequest::getInt('limit', XoopspollConstants::DEFAULT_POLL_PAGE_LIMIT);
+ $start = XoopsRequest::getInt('start', 0);
+ $orderby = XoopsRequest::getString('orderby', 'time');
+ $orderdir = XoopsRequest::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');
@@ -486,7 +475,7 @@
* {@internal show a brief description of the question we are focusing on}
*/
echo "<h4 class='left'>" . _AM_XOOPSPOLL_LOGSLIST . "</h4>\n"
- . "<table class='outer bnone width100' style='padding: 0px; margin: 0px;'>\n"
+ . "<table class='outer bnone width100' style='padding: 0; margin: 0;'>\n"
. " <tr>\n"
. " <td>\n"
. " <table class='width100 bnone marg2 pad3'>\n"
@@ -525,7 +514,7 @@
echo "<div class='center' style='margin-bottom: 2em;'>\n"
. "<h4 class='left'>" . _AM_XOOPSPOLL_LOGSLIST . "</h4>\n"
- . "<table class='outer bnone width100' style='padding: 0px; margin: 0px;'>\n"
+ . "<table class='outer bnone width100' style='padding: 0; margin: 0;'>\n"
. "<thead>\n"
. " <tr>\n"
. " <th class='width15'>" . _AM_XOOPSPOLL_OPTION . "</th>\n"
@@ -559,13 +548,13 @@
$criteria->setLimit($limit);
$logsArray = $logHandler->getAll($criteria);
- $arrowUp = $pathIcon16 . DIRECTORY_SEPARATOR . "up.gif";
- $arrowDown = $pathIcon16 . DIRECTORY_SEPARATOR . "down.gif";
+ $arrowUp = $pathIcon16 . "/up.gif";
+ $arrowDown = $pathIcon16 . "/down.gif";
$sorthref = $_SERVER['PHP_SELF'] . "?op=log&poll_id={$pollId}&orderby=";
$class = 'even';
if (is_array($logsArray) && $logsCount > 0) {
- echo "<table class='outer bnone width100' style='padding: 0px; margin: 0px;'>\n"
+ echo "<table class='outer bnone width100' style='padding: 0; margin: 0;'>\n"
. " <tr>\n"
. " <td class='bg2'>\n"
. " <table class='width100 bnone pad3 marg2'>\n"
@@ -613,7 +602,7 @@
echo " <td class='{$class} center'>\n"
. " <a href=" . $GLOBALS['xoops']->url('/userinfo.php') . "?uid=" . $user->getVar('uid') . ">{$uname}</a> \n"
- . " <a href='{$pmLink}' target='_blank'><img src='" . $pathIcon16 . DIRECTORY_SEPARATOR . "mail_generic.png' alt='" . _AM_XOOPSPOLL_PM_VOTER . "' title='" . _AM_XOOPSPOLL_PM_VOTER . "' />\n"
+ . " <a href='{$pmLink}' target='_blank'><img src='" . $pathIcon16 . "/mail_generic.png' alt='" . _AM_XOOPSPOLL_PM_VOTER . "' title='" . _AM_XOOPSPOLL_PM_VOTER . "' />\n"
. " </td>\n";
} else {
echo " <td class='{$class} center'>{$GLOBALS['xoopsConfig']['anonymous']}</td>\n";
@@ -641,13 +630,12 @@
// echo "<div class='center' style='margin-bottom: 1em;'>[ <a href='" . $_SERVER['PHP_SELF'] . "?op=list'><img src='". $pathIcon16 ."/back.png' alt='" . _AM_XOOPSPOLL_RETURNLIST . "' title='" . _AM_XOOPSPOLL_RETURNLIST . "'>" . _AM_XOOPSPOLL_RETURNLIST . "</a> ]</div>\n";
$admin_class->addItemButton(_AM_XOOPSPOLL_RETURNLIST, 'main.php' . '?op=list', $icon = '../16/back');
echo $admin_class->renderButton('center');
- include 'admin_footer.php';
- exit();
+ include_once __DIR__ . '/admin_footer.php';
break;
case 'quickupdate':
- $pollId = isset($_POST['poll_id']) ? $_POST['poll_id'] : array();
+ $pollId = XoopsRequest::getArray('poll_id', array(), 'POST');
$pollId = (array) $pollId;
$pollId = array_map('intval', $pollId);
@@ -661,9 +649,9 @@
$pollObjs = $pollHandler->getAll($criteria);
// get display variables from form POST
- $display = isset($_POST['display']) ? $_POST['display'] : array();
+ $display = XoopsRequest::getArray('display', array(), 'POST');
$display = array_map('intval', (array) $display);
- $weight = isset($_POST['weight']) ? $_POST['weight'] : array();
+ $weight = XoopsRequest::getArray('weight', array(), 'POST');
$weight = array_map('intval', (array) $weight);
foreach ($pollObjs as $pollObj) {
@@ -677,19 +665,18 @@
unset($pollObj);
}
unset($pollObjs);
- 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'], XoopspollConstants::REDIRECT_DELAY_SHORT, _AM_XOOPSPOLL_DBUPDATED);
} else {
redirect_header($_SERVER['PHP_SELF'], XoopspollConstants::REDIRECT_DELAY_SHORT, _AM_XOOPSPOLL_NOTHING_HERE);
}
- exit();
break;
// added cloning capability in v 1.40
case 'clone':
$pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
$optHandler =& xoops_getmodulehandler('option', 'xoopspoll');
- $pollId = XoopspollRequest::getInt('poll_id', 0);
+ $pollId = XoopsRequest::getInt('poll_id', 0);
$pollObj = $pollHandler->get($pollId);
$origValues = $pollObj->getValues();
unset($origValues['poll_id']);
@@ -722,6 +709,5 @@
}
unset($pollObj, $cloneObj, $origValues, $cloneValues, $newValues);
redirect_header($_SERVER['PHP_SELF'] . "?poll_id={$cloneId}&op=edit", XoopspollConstants::REDIRECT_DELAY_MEDIUM, _AM_XOOPSPOLL_CLONE_SUCCESS);
- exit();
break;
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/menu.php 2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/menu.php 2015-02-18 18:20:22 UTC (rev 12996)
@@ -34,7 +34,7 @@
* @version:: $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS Root Path not defined');
$moduleHandler =& xoops_gethandler('module');
$xoopsModule =& XoopsModule::getByDirname('xoopspoll');
@@ -48,25 +48,25 @@
$adminmenu = array();
$i = 1;
$adminmenu[$i] = array('title' => _MI_XOOPSPOLL_HOME,
- 'link' => "admin" . DIRECTORY_SEPARATOR . "index.php",
+ 'link' => "admin/index.php",
'desc' => _MI_XOOPSPOLL_HOMEDSC,
- 'icon' => "{$pathImageAdmin}" . DIRECTORY_SEPARATOR . "home.png"
+ 'icon' => "{$pathImageAdmin}" . "/home.png"
);
++$i;
$adminmenu[$i] = array('title' => _MI_XOOPSPOLL_ADMENU1,
- 'link' => "admin" . DIRECTORY_SEPARATOR . "main.php",
+ 'link' => "admin/main.php",
'desc' => _MI_XOOPSPOLL_ADMENU1DSC,
- 'icon' => "{$pathImageAdmin}" . DIRECTORY_SEPARATOR . "poll.png"
+ 'icon' => "{$pathImageAdmin}" . "/poll.png"
);
++$i;
$adminmenu[$i] = array('title' => _MI_XOOPSPOLL_ADMENU2,
- 'link' => "admin" . DIRECTORY_SEPARATOR . "utility.php",
+ 'link' => "admin/utility.php",
'desc' => _MI_XOOPSPOLL_ADMENU2DSC,
- 'icon' => "{$pathImageAdmin}" . DIRECTORY_SEPARATOR . "wizard.png"
+ 'icon' => "{$pathImageAdmin}" . "/wizard.png"
);
++$i;
$adminmenu[$i] = array('title' => _MI_XOOPSPOLL_ADABOUT,
- 'link' => "admin" . DIRECTORY_SEPARATOR . "about.php",
+ 'link' => "admin/about.php",
'desc' => _MI_XOOPSPOLL_ADABOUTDSC,
- 'icon' => "{$pathImageAdmin}" . DIRECTORY_SEPARATOR . "about.png"
+ 'icon' => "{$pathImageAdmin}" . "/about.png"
);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/utility.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/utility.php 2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/admin/utility.php 2015-02-18 18:20:22 UTC (rev 12996)
@@ -34,11 +34,11 @@
* @version:: $Id$
*/
-require_once 'admin_header.php';
-xoops_load('request', 'xoopspoll');
+require_once __DIR__ . '/admin_header.php';
+xoops_load('XoopsRequest');
xoops_load('pollUtility', 'xoopspoll');
-$op = XoopspollRequest::getString('op', 'list');
+$op = XoopsRequest::getString('op', 'list');
switch ($op) {
case 'list':
@@ -55,19 +55,14 @@
$GLOBALS['xoopsTpl']->assign('navigation', $admin_class->addNavigation('index.php'));
$GLOBALS['xoopsTpl']->assign('umfrageIntro', _AM_XOOPSPOLL_UMFRAGE_INTRO);
- $GLOBALS['xoopsTpl']->display($GLOBALS['xoops']->path('modules' . DIRECTORY_SEPARATOR
- . 'xoopspoll' . DIRECTORY_SEPARATOR
- . 'templates' . DIRECTORY_SEPARATOR
- . 'admin' . DIRECTORY_SEPARATOR
- . 'xoopspoll_utility.tpl')
- );
+ $GLOBALS['xoopsTpl']->display($GLOBALS['xoops']->path('modules/xoopspoll/templates/admin/xoopspoll_utility.tpl'));
- require 'admin_footer.php';
+ require_once __DIR__ . '/admin_header.php';
break;
/* Import data from umfrage */
case 'umfrage':
- $ok = XoopspollRequest::getString('ok', XoopspollConstants::CONFIRM_NOT_OK, 'POST');
+ $ok = XoopsRequest::getString('ok', XoopspollConstants::CONFIRM_NOT_OK, 'POST');
if ($ok) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($_SERVER['PHP_SELF'], XoopspollConstants::REDIRECT_DELAY_MEDIUM, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -90,21 +85,9 @@
}
//setup poll objects for both umfrage and xoopspoll
- require_once $GLOBALS['xoops']->path("modules"
- . DIRECTORY_SEPARATOR . "umfrage"
- . DIRECTORY_SEPARATOR . "class"
- . DIRECTORY_SEPARATOR . "umfrage.php"
- );
- require_once $GLOBALS['xoops']->path("modules"
- . DIRECTORY_SEPARATOR . "umfrage"
- . DIRECTORY_SEPARATOR . "class"
- . DIRECTORY_SEPARATOR . "umfrageoption.php"
- );
- require_once $GLOBALS['xoops']->path("modules"
- . DIRECTORY_SEPARATOR . "umfrage"
- . DIRECTORY_SEPARATOR . "class"
- . DIRECTORY_SEPARATOR . "umfragelog.php"
- );
+ require_once $GLOBALS['xoops']->path("modules/umfrage/class/umfrage.php");
+ require_once $GLOBALS['xoops']->path("modules/umfrage/class/umfrageoption.php");
+ require_once $GLOBALS['xoops']->path("modules/umfrage/class/umfragelog.php");
$xpHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
$xpOptHandler =& xoops_getmodulehandler('option', 'xoopspoll');
@@ -217,7 +200,7 @@
$admin_class = new ModuleAdmin();
echo $admin_class->addNavigation('utility.php');
echo "<div class='floatcenter1'>" . xoops_error($e->getMessage(), _AM_XOOPSPOLL_IMPORT_FAILED) . "</div>\n";
- include 'admin_footer.php';
+ include_once __DIR__ . '/admin_footer.php';
exit();
}
} else {
@@ -225,8 +208,9 @@
$admin_class = new ModuleAdmin();
echo $admin_class->addNavigation('utility.php');
xoops_confirm(array('op' => 'umfrage', 'ok' => 1), $_SERVER['PHP_SELF'], _AM_XOOPSPOLL_RUSUREUMFRAGE);
- include 'admin_footer.php';
+ include_once __DIR__ . '/admin_footer.php';
exit();
}
break;
}
+include_once __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/constants.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/constants.php 2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/constants.php 2015-02-18 18:20:22 UTC (rev 12996)
@@ -40,7 +40,7 @@
* @version:: $Id$
**/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS Root Path not defined');
interface XoopspollConstants
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/formdatetimepicker.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/formdatetimepicker.php 2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/formdatetimepicker.php 2015-02-18 18:20:22 UTC (rev 12996)
@@ -20,7 +20,7 @@
* @version:: $Id$
*/
-defined('XOOPS_ROOT_PATH') or die("Restricted access");
+// defined('XOOPS_ROOT_PATH') || die("Restricted access");
/**
* Creates a text field with jquery ui calendar & time select popup
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/log.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/log.php 2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/log.php 2015-02-18 18:20:22 UTC (rev 12996)
@@ -29,12 +29,12 @@
* @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
* @package:: xoopspoll
* @subpackage:: class
- * @since:: 1.40
+ * @since:: 1.40
* @author:: {@link http://www.myweb.ne.jp/ Kazumi Ono (AKA onokazu)}
* @version:: $Id$
**/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS Root Path not defined');
/**
*
* XoopspollLog() class definition for Log Objects
@@ -49,48 +49,64 @@
/**
* Constructor
+ * @param null $id
*/
function __construct(&$id = null)
{
parent::__construct();
- $this->initVar('log_id', XOBJ_DTYPE_INT, 0);
- $this->initVar('poll_id', XOBJ_DTYPE_INT, null, true);
+ $this->initVar('log_id', XOBJ_DTYPE_INT, 0);
+ $this->initVar('poll_id', XOBJ_DTYPE_INT, null, true);
$this->initVar('option_id', XOBJ_DTYPE_INT, null, true);
- $this->initVar('ip', XOBJ_DTYPE_OTHER, null);
- $this->initVar('user_id', XOBJ_DTYPE_INT, 0);
- $this->initVar('time', XOBJ_DTYPE_INT, null);
+ $this->initVar('ip', XOBJ_DTYPE_OTHER, null);
+ $this->initVar('user_id', XOBJ_DTYPE_INT, 0);
+ $this->initVar('time', XOBJ_DTYPE_INT, null);
if (!empty($id) && is_array($id)) {
$this->assignVars($id);
}
}
+ /**
+ * @param null $id
+ */
public function XoopspollLog(&$id = null)
{
$this->__construct($id);
}
-/**#@+
- * The following method is provided for backward compatibility with cbb/xforum
- * @deprecated since Xoopspoll 1.40, please use XoopspollLogHandler & XoopspollLog
- */
+ /**#@+
+ * The following method is provided for backward compatibility with cbb/xforum
+ * @deprecated since Xoopspoll 1.40, please use XoopspollLogHandler & XoopspollLog
+ * @param $pid
+ * @return
+ */
static function deleteByPollId(&$pid)
{
$GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . "::" . __FUNCTION__ . " is deprecated since Xoopspoll 1.40, please use XoopspollLog and XoopspollLogHandler methods instead.");
$slogHandler = self::getStaticLogHandler();
- $criteria = new Criteria('poll_id', intval($pid), '=');
+ $criteria = new Criteria('poll_id', intval($pid), '=');
return $slogHandler->deleteAll($criteria);
}
+ /**
+ * @param $opt_id
+ * @return mixed
+ */
static function deleteByOptionId(&$opt_id)
{
$GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . "::" . __FUNCTION__ . " is deprecated since Xoopspoll 1.40, please use XoopspollLog and XoopspollLogHandler methods instead.");
$slogHandler = self::getStaticLogHandler();
- $criteria = new Criteria('option_id', intval($opt_id), '=');
+ $criteria = new Criteria('option_id', intval($opt_id), '=');
return $slogHandler->deleteAll($criteria);
}
+ /**
+ * @param $pid
+ * @param $ip
+ * @param $uid
+ * @return mixed
+ */
static function hasVoted(&$pid, &$ip, &$uid)
{
$GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . "::" . __FUNCTION__ . " is deprecated since Xoopspoll 1.40, please use XoopspollLog and XoopspollLogHandler methods instead.");
@@ -99,6 +115,9 @@
return $slogHandler->hasVoted($pid, $ip, $uid);
}
+ /**
+ * @return bool
+ */
private function getStaticLogHandler()
{
static $log_h;
@@ -110,9 +129,12 @@
return $log_h;
}
-/**#@-*/
+ /**#@-*/
}
+/**
+ * Class XoopspollLogHandler
+ */
class XoopspollLogHandler extends XoopsPersistableObjectHandler
//class XoopspollLogHandler extends XoopsPersistableObjectHandler
@@ -124,7 +146,7 @@
**/
function __construct(&$db)
{
- parent::__construct($db, 'mod_xoopspoll_log', 'XoopspollLog', 'log_id');
+ parent::__construct($db, 'xoopspoll_log', 'XoopspollLog', 'log_id');
}
/**
@@ -140,13 +162,13 @@
/**
*
* Delete all log entries by Option ID
- * @param int $option_id
+ * @param int $option_id
* @return bool $success
*/
public function deleteByOptionId($option_id)
{
$criteria = new Criteria('option_id', $option_id, '=');
- $success = ($this->deleteAll($criteria)) ? true : false;
+ $success = ($this->deleteAll($criteria)) ? true : false;
return $success;
}
@@ -155,13 +177,13 @@
*
* Delete all log entries by Poll ID
* @uses CriteriaCompo
- * @param int $pid
+ * @param int $pid
* @return bool $success
*/
public function deleteByPollId($pid)
{
$criteria = new Criteria('poll_id', intval($pid), '=');
- $success = ($this->deleteAll($criteria)) ? true : false ;
+ $success = ($this->deleteAll($criteria)) ? true : false;
return $success;
}
@@ -170,14 +192,14 @@
*
* Gets all log entries by Poll ID
* @uses CriteriaCompo
- * @param int $pid
- * @param string $sortby sort all results by this field
+ * @param int $pid
+ * @param string $sortby sort all results by this field
* @param string $orderby sort order (ASC, DESC)
* @return bool $success
*/
public function getAllByPollId($pid, $sortby = 'time', $orderby = 'ASC')
{
- $ret = array();
+ $ret = array();
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('poll_id', intval($pid), '='));
$criteria->setSort($sortby);
@@ -222,29 +244,30 @@
/**
* Get the total number of votes for an option
- *@uses CriteriaCompo
+ * @uses CriteriaCompo
* @param int $option_id
* @return int
*/
public function getTotalVotesByOptionId($option_id)
{
$criteria = new Criteria('option_id', intval($option_id), '=');
- $votes = $this->getCount($criteria);
+ $votes = $this->getCount($criteria);
return $votes;
}
+
/**
* hasVoted indicates if user (logged in or not) has voted in a poll
* @uses $_COOKIE
- * @param int $pid of the poll the check
- * @param string $ip the ip address for this voter
- * @param int $uid the XOOPS user id of this voter (0 for anon)
+ * @param int $pid of the poll the check
+ * @param string $ip the ip address for this voter
+ * @param int $uid the XOOPS user id of this voter (0 for anon)
* @return bool
*/
- public function hasVoted($pid, $ip, $uid=0)
+ public function hasVoted($pid, $ip, $uid = 0)
{
- $uid = intval($uid);
- $pid = intval($pid);
+ $uid = intval($uid);
+ $pid = intval($pid);
$voted = true;
xoops_load('pollUtility', 'xoopspoll');
$voted_polls = XoopspollPollUtility::getVoteCookie();
@@ -252,7 +275,7 @@
$pollHandler =& xoops_getmodulehandler('poll', 'xoopspoll');
if ($pollObj = $pollHandler->get($pid)) {
$pollStarttime = $pollObj->getVar('start_time');
- $criteria = new CriteriaCompo();
+ $criteria = new CriteriaCompo();
$criteria->add(new Criteria('poll_id', $pid, '='));
if ($uid > 0) {
/**
@@ -263,23 +286,23 @@
$criteria->add(new Criteria('user_id', $uid, '='));
$criteria->add(new Criteria('time', intval($pollStarttime), '>='));
$vCount = $this->getCount($criteria);
- $voted = ($vCount > 0) ? true : false;
+ $voted = ($vCount > 0) ? true : false;
} elseif (!empty($ip) && filter_var($ip, FILTER_VALIDATE_IP)) {
$criteria->add(new Criteria('ip', $ip, '='));
$criteria->add(new Criteria('time', intval($pollStarttime, '>=')));
$criteria->add(new Criteria('user_id', 0, '='));
$vCount = $this->getCount($criteria);
- $voted = ($vCount > 0) ? true : false;
+ $voted = ($vCount > 0) ? true : false;
} else {
/* Check cookie to see if someone from this system has voted before */
if ((array_key_exists($pid, $voted_polls))
- && (intval($voted_polls[$pid]) >= $pollStarttime))
- {
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('poll_id', $pid, '='));
- $criteria->add(new Criteria('time', $pollStarttime, '>='));
- $vCount = $this->getCount($criteria);
- $voted = ($vCount > 0) ? true : false;
+ && (intval($voted_polls[$pid]) >= $pollStarttime)
+ ) {
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('poll_id', $pid, '='));
+ $criteria->add(new Criteria('time', $pollStarttime, '>='));
+ $vCount = $this->getCount($criteria);
+ $voted = ($vCount > 0) ? true : false;
} else {
$voted = false;
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/option.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/option.php 2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/option.php 2015-02-18 18:20:22 UTC (rev 12996)
@@ -34,7 +34,7 @@
* @version:: $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS Root Path not defined');
class XoopspollOption extends XoopsObject
{
@@ -55,6 +55,9 @@
protected $optHandler;
// constructor
+ /**
+ * @param null $id
+ */
function __construct(&$id=null)
{
parent::__construct();
@@ -80,6 +83,9 @@
}
}
+ /**
+ * @param null $id
+ */
public function XoopspollOption(&$id=null)
{
$this->__construct($id);
@@ -165,6 +171,9 @@
/**#@-*/
}
+/**
+ * Class XoopspollOptionHandler
+ */
class XoopspollOptionHandler extends XoopsPersistableObjectHandler
{
/**
@@ -175,7 +184,7 @@
function __construct(&$db)
{
xoops_load('constants', 'xoopspoll');
- parent::__construct($db, 'mod_xoopspoll_option', 'XoopspollOption', 'option_id', 'option_text');
+ parent::__construct($db, 'xoopspoll_option', 'XoopspollOption', 'option_id', 'option_text');
}
/**
@@ -211,14 +220,17 @@
return $status;
}
+
/**
*
* Gets all options for poll ID
*
- * @param int $pid
+ * @param int $pid
+ * @param string $sortby
+ * @param string $orderby
+ * @return array an array of Option objects
* @uses CriteriaCompo
* @uses XoopsPersistableObjectHandler::deleteAll
- * @return array an array of Option objects
*/
public function getAllByPollId($pid=0, $sortby = 'option_id', $orderby = 'ASC')
{
@@ -280,12 +292,7 @@
xoops_load('xoopsformloader');
$pid = intval($pid);
$barcolor_array =& XoopsLists::getImgListAsArray(
- $GLOBALS['xoops']->path( "modules" . DIRECTORY_SEPARATOR
- . "xoopspoll" . DIRECTORY_SEPARATOR
- . "assets" . DIRECTORY_SEPARATOR
- . "images" . DIRECTORY_SEPARATOR
- . "colorbars" . DIRECTORY_SEPARATOR)
- );
+ $GLOBALS['xoops']->path( "modules/xoopspoll/assets/images/colorbars/"));
/**
* get all the options for this poll & add some blank options to allow adding more
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/plugin/userlog.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/plugin/userlog.php 2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/plugin/userlog.php 2015-02-18 18:20:22 UTC (rev 12996)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS Root Path not defined');
class XoopspollUserlogPlugin extends Userlog_Module_Plugin_Abstract implements UserlogPluginInterface
{
@@ -38,8 +38,8 @@
*/
public function item($subscribe_from)
{
- xoops_load('request', 'xoopspoll');
- $poll_id = XoopspollRequest::getInt('poll_id', 0);
+ xoops_load('XoopsRequest');
+ $poll_id = XoopsRequest::getInt('poll_id', 0);
switch ($subscribe_from) {
case "index.php":
case "pollresults.php":
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/poll.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/poll.php 2015-02-18 18:16:27 UTC (rev 12995)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/class/poll.php 2015-02-18 18:20:22 UTC (rev 12996)
@@ -19,14 +19,15 @@
* @author:: zyspec <ow...@zy...>
* @version:: $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS Root Path not defined');
class XoopspollPoll extends XoopsObject
{
/**
* XoopspollPoll::__construct()
*
- **/
+ * @param null $id
+ */
public function __construct(&$id=null)
{
parent::__construct();
@@ -75,6 +76,7 @@
*
* XoopspollPoll::XoopspollPoll()
* @access public
+ * @param null $id
*/
public function XoopspollPoll(&$id=null)
{
@@ -131,10 +133,10 @@
* @uses CriteriaCompo()
* @uses XoopspollPollHandler::getAll()
* @uses XoopspollLogHandler
- * @param int $optionId
- * @param string $ip ip address of voter
- * @param int $uid
- * @return bool true vote entered, false voting failed
+ * @param int $optionId
+ * @param string $ip ip address of voter
+ * @param $time
+ * @return bool true vote entered, false voting failed* @internal param int $uid
*/
public function vote($optionId, $ip, $time)
{
@@ -208,8 +210,9 @@
/**
*
* display the poll form
- * @param string $rtnPage where to send the form result
+ * @param string $rtnPage where to send the form result
* @param string $rtnMethod return method get|post
+ * @param array $addHidden
*/
public function renderForm($rtnPage, $rtnMethod='post', $addHidden=array())
{
@@ -415,12 +418,7 @@
$xoopsMailer->useMail();
$language = $GLOBALS['xoopsConfig']['language'];
- $templateDir = $GLOBAL...
[truncated message content] |
