\n"
- . " \n"
- . " 
\n" . " ![. _EDIT .](" . $pathIcon16 . "/edit.png)
",
- 'delete' => "![" . _DELETE . "](" . $pathIcon16 . "/delete.png)
",
- 'clone' => "![" . _CLONE . "](" . $pathIcon16 . "/editcopy.png)
",
- 'preview' => "![" . _PREVIEW . "](" . $pathIcon16 . "/view.png)
",
- 'print' => "![" . _CLONE . "](" . $pathIcon16 . "/printer.png)
",
- 'pdf' => "![" . _CLONE . "](" . $pathIcon16 . "/pdf.png)
",
- 'add' => "![" . _ADD . "](" . $pathIcon16 . "/add.png)
",
- '0' => "![" . 0 . "](" . $pathIcon16 . "/0.png)
",
- '1' => "![" . 1 . "](" . $pathIcon16 . "/1.png)
",
- ],
+$pathIcon16 = Admin::iconUrl('', '16');
+$moduleDirName = \basename(\dirname(__DIR__));
+
+return [
+ 'name' => \mb_strtoupper($moduleDirName) . ' IconConfigurator',
+ 'edit' => "",
+ 'delete' => "",
+ 'clone' => "",
+ 'preview' => "",
+ 'print' => "",
+ 'pdf' => "",
+ 'add' => "",
+ '0' => "",
+ '1' => "",
+
+ 'log' => "![. _AM_XOOPSPOLL_VIEWLOG . ' title=' . _AM_XOOPSPOLL_VIEWLOG .](" . $pathIcon16 . "/search.png)
",
];
diff --git a/config/imageconfig.php b/config/imageconfig.php
index 26e2408..85852b6 100644
--- a/config/imageconfig.php
+++ b/config/imageconfig.php
@@ -1,7 +1,7 @@
- 'text',
'default' => 'uploads/' . $modversion['dirname'] . '/images',
];
-
diff --git a/config/index.html b/config/index.html
deleted file mode 100644
index 2c5cdd3..0000000
--- a/config/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/config/index.php b/config/index.php
new file mode 100644
index 0000000..b295ab9
--- /dev/null
+++ b/config/index.php
@@ -0,0 +1,3 @@
+ mb_strtoupper($moduleDirName) . ' PathConfigurator',
- 'paths' => [
- 'dirname' => $moduleDirName,
- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
- ],
+return [
+ 'name' => \mb_strtoupper($moduleDirName) . ' PathConfigurator',
+ 'dirname' => $moduleDirName,
+ 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
+ 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
+ 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
+ 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+ 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
'uploadFolders' => [
XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
@@ -20,4 +18,3 @@
//XOOPS_UPLOAD_PATH . '/flags'
],
];
-
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 9815273..f51d961 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -1,9 +1,16 @@
-![](" . XOOPS_URL . "/modules/{$pollmodules}/assets/images/colorbars/{$current_bar}){kind=small}
| <{$poll.question}> | -|
|---|---|
| <{$poll.end_text}> | -|
| <{$option.text}> | -<{$option.image}> <{$option.percent}> | -
|
- <{$poll.totalVotes}>
- - <{$poll.totalVoters}> - |
- |
| <{$poll.question}> | -|
|---|---|
| <{$poll.end_text}> | -|
| <{$option.text}> | -<{$option.image}> <{$option.percent}> | -
|
- <{$poll.totalVotes}>
- - <{$poll.totalVoters}> - |
- |
getVar('dirname') . "/viewforum.php?forum=$forum'>" . _MD_RETURNTOTHEFORUM . "
'; - } elseif ('restore' === $mode) { - // /** @var NewbbTopicHandler $topicHandler */ - $forums = array(); - $topics_obj = $topicHandler->getAll(new Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN')); - foreach (array_keys($topics_obj) as $id) { - $topic_obj =& $topics_obj[$id]; - $topicHandler->approve($topic_obj); - $topicHandler->synchronization($topic_obj); - $forums[$topic_obj->getVar('forum_id')] = 1; - } - //irmtfan remove - no need to approve posts manually - see class/post.php approve function - $criteria_forum = new Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN'); - $forums_obj = $forumHandler->getAll($criteria_forum); - foreach (array_keys($forums_obj) as $id) { - $forumHandler->synchronization($forums_obj[$id]); - } - unset($topics_obj, $forums_obj); - // irmtfan add restore to viewtopic - $restoretopic_id = $topic_obj->getVar('topic_id'); - // irmtfan / missing in URL - echo $action[$mode]['msg'] . "getVar('dirname') . "/viewtopic.php?topic_id=$restoretopic_id'>" . _MD_VIEWTHETOPIC . '
' . "getVar('dirname') . "/viewforum.php?forum=$forum'>" . _MD_RETURNTOTHEFORUM . '
' . "'; - } elseif ('merge' === $mode) { - $pollmodul = null; - /** @var XoopsModuleHandler $moduleHandler */ - $moduleHandler = xoops_getHandler('module'); - $pollModule = $moduleHandler->getByDirname('xoopspoll'); - if (($pollModule instanceof XoopsModule) && $pollModule->isactive()) { - $pollmodul = 'xoopspoll'; - $xpOptHandler = xoops_getModuleHandler('option', 'xoopspoll'); - $xpLogHandler = xoops_getModuleHandler('log', 'xoopspoll'); - } else { - //Umfrage - $pollModule = $moduleHandler->getByDirname('umfrage'); - if (($pollModule instanceof XoopsModule) && $pollModule->isactive()) { - $pollmodul = 'umfrage'; - } - } - - $postHandler = \XoopsModules\Newbb\Helper::getInstance()->getHandler('Post'); - foreach ($topic_id as $tid) { - $topic_obj = $topicHandler->get($tid); - $newtopic_obj = $topicHandler->get($newtopic); - /* return false if destination topic is newer or not existing */ - /* - if ($newtopic>$tid || !is_object($newtopic_obj)) { - redirect_header("javascript:history.go(-1)", 2, _MD_ERROR); - } - */ - $criteria_topic = new Criteria('topic_id', $tid); - $criteria = new CriteriaCompo($criteria_topic); - $criteria->add(new Criteria('pid', 0)); - $postHandler->updateAll('pid', $topicHandler->getTopPostId($newtopic), $criteria, true); - $postHandler->updateAll('topic_id', $newtopic, $criteria_topic, true); - - $topic_views = $topic_obj->getVar('topic_views') + $newtopic_obj->getVar('topic_views'); - $criteria_newtopic = new Criteria('topic_id', $newtopic); - $topicHandler->updateAll('topic_views', $topic_views, $criteria_newtopic, true); - - $topicHandler->synchronization($newtopic); - - $poll_id = $topicHandler->get($tid, 'poll_id'); - if ($poll_id > 0) { - if ('xoopspoll' === $pollmodul) { - $xpPollHandler = xoops_getModuleHandler('poll', 'xoopspoll'); - $poll = $xpPollHandler->get($poll_id); - if (false !== $xpPollHandler->delete($poll)) { - $xpOptHandler->deleteByPollId($poll_id); - $xpLogHandler->deleteByPollId($poll_id); - xoops_comment_delete($xoopsModule->getVar('mid'), $poll_id); - } - } elseif ('umfrage' === $pollmodul) { - include_once $GLOBALS['xoops']->path('modules/umfrage/class/umfrage.php'); - include_once $GLOBALS['xoops']->path('modules/umfrage/class/umfrageoption.php'); - include_once $GLOBALS['xoops']->path('modules/umfrage/class/umfragelog.php'); - include_once $GLOBALS['xoops']->path('modules/umfrage/class/umfragerenderer.php'); - - $poll = new Umfrage($poll_id); - if ($poll->delete() !== false) { - UmfrageOption::deleteByPollId($poll_id); - UmfrageLog::deleteByPollId($poll_id); - xoops_comment_delete($xoopsModule->getVar('mid'), $poll_id); - } - } - } - - $sql = sprintf('DELETE FROM %s WHERE topic_id = %u', $xoopsDB->prefix('bb_topics'), $tid); - $result = $xoopsDB->queryF($sql); - - $sql = sprintf('DELETE FROM %s WHERE topic_id = %u', $xoopsDB->prefix('bb_votedata'), $tid); - $result = $xoopsDB->queryF($sql); - - $sql = sprintf('UPDATE %s SET forum_topics = forum_topics-1 WHERE forum_id = %u', $xoopsDB->prefix('bb_forums'), $forum); - $result = $xoopsDB->queryF($sql); - - $topic_obj->loadFilters('delete'); - $newtopic_obj->loadFilters('update'); - } - // irmtfan full URL - echo $action[$mode]['msg'] . "getVar('dirname') . "/viewtopic.php?topic_id={$newtopic}'>" . _MD_VIEWTHETOPIC . '
' . "getVar('dirname') . "/viewforum.php?forum={$forum}'>" . _MD_RETURNTOTHEFORUM . '
' . "getVar('dirname') . "/index.php'>" . _MD_RETURNFORUMINDEX . '
'; - } elseif ('move' === $mode) { - if ($newforum > 0) { - $topic_id = $topic_id[0]; - $topic_obj = $topicHandler->get($topic_id); - $topic_obj->loadFilters('update'); - $topic_obj->setVar('forum_id', $newforum, true); - $topicHandler->insert($topic_obj, true); - $topic_obj->loadFilters('update'); - - $sql = sprintf('UPDATE %s SET forum_id = %u WHERE topic_id = %u', $xoopsDB->prefix('bb_posts'), $newforum, $topic_id); - if (!$r = $xoopsDB->query($sql)) { - return false; - } - $forumHandler->synchronization($forum); - $forumHandler->synchronization($newforum); - // irmtfan full URL - echo $action[$mode]['msg'] . "getVar('dirname') . "/viewtopic.php?topic_id=$topic_id&forum=$newforum'>" . _MD_GOTONEWFORUM . "
'; - } else { - // irmtfan - issue with javascript:history.go(-1) - redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_ERRORFORUM); - } - } else { - $topic_id = $topic_id[0]; - $forum = $topicHandler->get($topic_id, 'forum_id'); - $forum_new = !empty($newtopic) ? $topicHandler->get($newtopic, 'forum_id') : 0; - - if (!$forumHandler->getPermission($forum, 'moderate') - || (!empty($forum_new) - && !$forumHandler->getPermission($forum_new, 'reply')) - // The forum for the topic to be merged to - || (!empty($newforum) && !$forumHandler->getPermission($newforum, 'post')) // The forum to be moved to - ) { - redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id", 2, _NOPERM); - } - - if (!empty($action[$mode]['sql'])) { - $sql = sprintf('UPDATE %s SET ' . $action[$mode]['sql'] . ' WHERE topic_id = %u', $xoopsDB->prefix('bb_topics'), $topic_id); - if (!$r = $xoopsDB->query($sql)) { - redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&order=$order&viewmode=$viewmode", 2, _MD_ERROR_BACK . 'getVar('dirname') . "/viewtopic.php?topic_id=$topic_id&forum=$forum'>" . _MD_VIEWTHETOPIC . "
'; - } -} else { // No submit - $mode = $_GET['mode']; - echo "Software and its documentation made available on the XOOPS web site:
+Software and its documentation made available on the XOOPS website:
In no event shall XOOPS team be liable to you or any third parties for
@@ -43,6 +43,6 @@
and risk and with agreement that you will be solely responsible for any damage to
your computer system or loss of data that results from such activities. No advice
or information, whether oral or written, obtained by you from XOOPS or from XOOPS
- web site shall create any warranty for the software
+ 
Additional integration with both the Marquee module and the SmartClone XOOPS modules are included in the extras folder. Copy these plugins to the corresponding folder in those modules to enable support for the XOOPS poll - module. Additionally a patch has been created for the forum module (newbb) + module. Additionally, a patch has been created for the forum module (newbb) to support this version of XOOPS poll. Replace the existing forum module files with the files found in the ./extras/newbb folder.
It is recommended that you delete the ./xoopspoll/extras and @@ -47,7 +47,7 @@
- Tutorial has been started, but we might need your help! Please check out the status of the tutorial here .
+ Tutorial has been started, but we might need your help! Please check out the status of the tutorial here .
To contribute to this Tutorial, please fork it on GitHub.
-
This document describes our Documentation Process and it will help you to understand how to contribute.
+
This document describes our Documentation Process and it will help you to understand how to contribute.
There are more XOOPS Tutorials, so check them out in our XOOPS Tutorial Repository on GitBook.
Translations are on Transifex and in our XOOPS Languages Repository on GitHub.
If you have questions about this module and need help, you can visit our Support Forums on XOOPS Website
+If you have questions about this module and need help, you can visit our Support Forums on XOOPS Website
This module is Open Source and we would love your help in making it better! You can fork this module on GitHub
diff --git a/language/english/help/help.tpl b/language/english/help/help.tpl
index 2ce642c..9a16a86 100644
--- a/language/english/help/help.tpl
+++ b/language/english/help/help.tpl
@@ -2,7 +2,7 @@
+