[xoops-svn] SF.net SVN: xoops-svn:[11593] XoopsModules/xoopspoll/branches/zyspec

[<zy...@us...>]

Revision: 11593
          http://sourceforge.net/p/xoops/svn/11593
Author:   zyspec
Date:     2013-05-27 22:28:05 +0000 (Mon, 27 May 2013)
Log Message:
-----------
* remove XoopsEditor select in xoops_version and use XOOPS Preferences setting for editor selection
* add 'extra' renderer code to XoopspollPoll->renderForm() method
* update version to v1.40 BETA 2

Modified Paths:
--------------
    XoopsModules/xoopspoll/branches/zyspec/class/poll.php
    XoopsModules/xoopspoll/branches/zyspec/docs/changelog.txt
    XoopsModules/xoopspoll/branches/zyspec/language/english/modinfo.php
    XoopsModules/xoopspoll/branches/zyspec/language/french_iso/modinfo.php
    XoopsModules/xoopspoll/branches/zyspec/language/french_utf8/modinfo.php
    XoopsModules/xoopspoll/branches/zyspec/language/nederlands/modinfo.php
    XoopsModules/xoopspoll/branches/zyspec/language/persian/modinfo.php
    XoopsModules/xoopspoll/branches/zyspec/language/spanish/modinfo.php
    XoopsModules/xoopspoll/branches/zyspec/language/swedish/modinfo.php
    XoopsModules/xoopspoll/branches/zyspec/xoops_version.php

Modified: XoopsModules/xoopspoll/branches/zyspec/class/poll.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/class/poll.php	2013-05-27 08:49:49 UTC (rev 11592)
+++ XoopsModules/xoopspoll/branches/zyspec/class/poll.php	2013-05-27 22:28:05 UTC (rev 11593)
@@ -242,13 +242,17 @@
 
         $module_handler =& xoops_gethandler("module");
         $config_handler =& xoops_gethandler("config");
-        $xp_module      =& $module_handler->getByDirname("xoopspoll");
-        $module_id      = $xp_module->getVar("mid");
-        $xp_config      =& $config_handler->getConfigsByCat(0, $module_id);
+//        $xp_module      =& $module_handler->getByDirname("xoopspoll");
+//        $module_id      = $xp_module->getVar("mid");
+//        $xp_config      =& $config_handler->getConfigsByCat(0, $module_id);
+        $sys_module     =& $module_handler->getByDirname("system");
+        $sys_id         = $sys_module->getVar("mid");
+        $sys_config     =& $config_handler->getConfigsByCat(0, $sys_id);
 
         $editorConfigs = array(
 //                           'editor' => $GLOBALS['xoopsModuleConfig']['useeditor'],
-                           'editor' => $xp_config['useeditor'],
+//                           'editor' => $xp_config['useeditor'],
+                           'editor' => $sys_config['general_editor'],
                            'rows'   => 15,
                            'cols'   => 60,
                            'width'  => '100%',
@@ -283,12 +287,28 @@
                             , 20
                             , $xuEndTimestamp);
         } else {
+/*
+            $extra = "";
+            foreach($addHidden as $key=>$value) {
+                $extra="&{$key}={$value}";
+            }
+
             $xuEndFormattedTime = ucfirst(date(_MEDIUMDATESTRING, $xuEndTimestamp));
             $endTimeText = new XoopsFormLabel("<div class='bold middle'>" . _AM_XOOPSPOLL_EXPIRATION,
                              sprintf(_AM_XOOPSPOLL_EXPIREDAT, $xuEndFormattedTime)
                            . "<br /><a href='{$rtnPage}?op=restart&amp;poll_id="
-                           . $this->getVar('poll_id') . "'>" . _AM_XOOPSPOLL_RESTART . "</a></div>");
+                           . $this->getVar('poll_id') . "{$extra}'>" . _AM_XOOPSPOLL_RESTART . "</a></div>");
         }
+*/
+            $extra = (is_array($addHidden)) ? $addHidden : array();
+            $extra = array_merge($extra, array('op'=>'restart', 'poll_id' => $this->getVar('poll_id')));
+            $query = http_build_query($extra);
+            $query = htmlentities($query, ENT_QUOTES);
+            $xuEndFormattedTime = ucfirst(date(_MEDIUMDATESTRING, $xuEndTimestamp));
+            $endTimeText = new XoopsFormLabel("<div class='bold middle'>" . _AM_XOOPSPOLL_EXPIRATION,
+                             sprintf(_AM_XOOPSPOLL_EXPIREDAT, $xuEndFormattedTime)
+                           . "<br /><a href='{$rtnPage}?{$query}'>" . _AM_XOOPSPOLL_RESTART . "</a></div>");
+        }
 
         $timeTray->addElement($startTimeText);
         $timeTray->addElement($endTimeText, true);

Modified: XoopsModules/xoopspoll/branches/zyspec/docs/changelog.txt
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/docs/changelog.txt	2013-05-27 08:49:49 UTC (rev 11592)
+++ XoopsModules/xoopspoll/branches/zyspec/docs/changelog.txt	2013-05-27 22:28:05 UTC (rev 11593)
@@ -1,4 +1,4 @@
-v1.40 BETA (ZySpec) 2013/05/18
+v1.40 BETA (ZySpec) 2013/05/27
 =================================
 + added ability to change poll results visibility
 ++ results always visible
@@ -20,7 +20,7 @@
 + added updated plugin for XOOPS marquee module in extras folder
 + added ability to mail notification to poll voter (XoopsUsers only)
 + added ability to set maximum number of options for multi-select poll
-+ added ability to select XoopsEditors to enable HTML in poll descriptions
++ added use of XoopsEditors to enable HTML in poll descriptions (selected via XOOPS Preferences)
 + added ability to hide polls created with forum (newbb) from frontside of polls module
 + added obscured graphic to hide votes/voters polls that don't have visible results
 + added Userlog plugin for poll_id from pollresults.php and index.php

Modified: XoopsModules/xoopspoll/branches/zyspec/language/english/modinfo.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/language/english/modinfo.php	2013-05-27 08:49:49 UTC (rev 11592)
+++ XoopsModules/xoopspoll/branches/zyspec/language/english/modinfo.php	2013-05-27 22:28:05 UTC (rev 11593)
@@ -38,8 +38,8 @@
 define('_MI_XOOPSPOLL_LOOKUPHOSTDSC', "List host names instead of IP addresses in viewing poll log. Since nslookup is used, It might take longer to show names.");
 define('_MI_XOOPSPOLL_DISPVOTE', "Display number of poll votes and voters to users.");
 define('_MI_XOOPSPOLL_DISPVOTEDSC', "This will show/hide the total number of votes and voters in a poll to users in pages and blocks. Numbers are always shown in Admin panel.");
-define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
-define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
+//define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
+//define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLS', "Hide polls created in a forum from polls module and blocks");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLSDSC', "If Yes, polls created from a forum (newbb) are hidden in the polls module.<br />Set to Yes if forum module is not installed.");
 /**#@-*/

Modified: XoopsModules/xoopspoll/branches/zyspec/language/french_iso/modinfo.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/language/french_iso/modinfo.php	2013-05-27 08:49:49 UTC (rev 11592)
+++ XoopsModules/xoopspoll/branches/zyspec/language/french_iso/modinfo.php	2013-05-27 22:28:05 UTC (rev 11593)
@@ -36,8 +36,8 @@
 define('_MI_XOOPSPOLL_LOOKUPHOSTDSC', "List host names instead of IP addresses in viewing poll log. Since nslookup is used, It might take longer to show names.");
 define('_MI_XOOPSPOLL_DISPVOTE', "Display number of poll votes and voters to users.");
 define('_MI_XOOPSPOLL_DISPVOTEDSC', "This will show/hide the total number of votes and voters in a poll to users in pages and blocks. Numbers are always shown in Admin panel.");
-define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
-define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
+//define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
+//define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLS', "Hide polls created in a forum from polls module and blocks");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLSDSC', "If Yes, polls created from a forum (newbb) are hidden in the polls module.<br />Set to Yes if forum module is not installed.");
 

Modified: XoopsModules/xoopspoll/branches/zyspec/language/french_utf8/modinfo.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/language/french_utf8/modinfo.php	2013-05-27 08:49:49 UTC (rev 11592)
+++ XoopsModules/xoopspoll/branches/zyspec/language/french_utf8/modinfo.php	2013-05-27 22:28:05 UTC (rev 11593)
@@ -38,8 +38,8 @@
 define('_MI_XOOPSPOLL_LOOKUPHOSTDSC',  "");
 define('_MI_XOOPSPOLL_DISPVOTE',     "Display number of poll votes and voters to users.");
 define('_MI_XOOPSPOLL_DISPVOTEDSC', "This will show/hide the total number of votes and voters in a poll to users in pages and blocks. Numbers are always shown in Admin panel.");
-define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
-define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
+//define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
+//define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLS', "Hide polls created in a forum from polls module and blocks");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLSDSC', "If Yes, polls created from a forum (newbb) are hidden in the polls module.<br />Set to Yes if forum module is not installed.");
 

Modified: XoopsModules/xoopspoll/branches/zyspec/language/nederlands/modinfo.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/language/nederlands/modinfo.php	2013-05-27 08:49:49 UTC (rev 11592)
+++ XoopsModules/xoopspoll/branches/zyspec/language/nederlands/modinfo.php	2013-05-27 22:28:05 UTC (rev 11593)
@@ -34,8 +34,8 @@
 define('_MI_XOOPSPOLL_LOOKUPHOSTDSC', "");
 define('_MI_XOOPSPOLL_DISPVOTE', "Display number of poll votes and voters to users.");
 define('_MI_XOOPSPOLL_DISPVOTEDSC', "This will show/hide the total number of votes and voters in a poll to users in pages and blocks. Numbers are always shown in Admin panel.");
-define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
-define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
+//define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
+//define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLS', "Hide polls created in a forum from polls module and blocks");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLSDSC', "If Yes, polls created from a forum (newbb) are hidden in the polls module.<br />Set to Yes if forum module is not installed.");
 

Modified: XoopsModules/xoopspoll/branches/zyspec/language/persian/modinfo.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/language/persian/modinfo.php	2013-05-27 08:49:49 UTC (rev 11592)
+++ XoopsModules/xoopspoll/branches/zyspec/language/persian/modinfo.php	2013-05-27 22:28:05 UTC (rev 11593)
@@ -42,8 +42,8 @@
 define("_MI_XOOPSPOLL_LOOKUPHOSTDSC","فهرست نام هاست ها به جای آدرس IP  در نمایش اطلاعات نظر سنجی ها. اگر نام هاست  انتخاب شود زمان بیشتری برای نمایش نام ها طول خواهد کشید.");
 define('_MI_XOOPSPOLL_DISPVOTE', "Display number of poll votes and voters to users.");
 define('_MI_XOOPSPOLL_DISPVOTEDSC', "This will show/hide the total number of votes and voters in a poll to users in pages and blocks. Numbers are always shown in Admin panel.");
-define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
-define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
+//define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
+//define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLS', "Hide polls created in a forum from polls module and blocks");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLSDSC', "If Yes, polls created from a forum (newbb) are hidden in the polls module.<br />Set to Yes if forum module is not installed.");
 

Modified: XoopsModules/xoopspoll/branches/zyspec/language/spanish/modinfo.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/language/spanish/modinfo.php	2013-05-27 08:49:49 UTC (rev 11592)
+++ XoopsModules/xoopspoll/branches/zyspec/language/spanish/modinfo.php	2013-05-27 22:28:05 UTC (rev 11593)
@@ -35,8 +35,8 @@
 define('_MI_XOOPSPOLL_LOOKUPHOSTDSC', "List host names instead of IP addresses in viewing poll log. Since nslookup is used, It might take longer to show names.");
 define('_MI_XOOPSPOLL_DISPVOTE', "Display number of poll votes and voters to users.");
 define('_MI_XOOPSPOLL_DISPVOTEDSC', "This will show/hide the total number of votes and voters in a poll to users in pages and blocks. Numbers are always shown in Admin panel.");
-define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
-define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
+//define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
+//define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLS', "Hide polls created in a forum from polls module and blocks");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLSDSC', "If Yes, polls created from a forum (newbb) are hidden in the polls module.<br />Set to Yes if forum module is not installed.");
 

Modified: XoopsModules/xoopspoll/branches/zyspec/language/swedish/modinfo.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/language/swedish/modinfo.php	2013-05-27 08:49:49 UTC (rev 11592)
+++ XoopsModules/xoopspoll/branches/zyspec/language/swedish/modinfo.php	2013-05-27 22:28:05 UTC (rev 11593)
@@ -35,8 +35,8 @@
 define('_MI_XOOPSPOLL_LOOKUPHOSTDSC', "");
 define('_MI_XOOPSPOLL_DISPVOTE', "Display number of poll votes and voters to users.");
 define('_MI_XOOPSPOLL_DISPVOTEDSC', "This will show/hide the total number of votes and voters in a poll to users in pages and blocks. Numbers are always shown in Admin panel.");
-define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
-define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
+//define('_MI_XOOPSPOLL_CHOOSEEDITOR', "Choose text editor to use:");
+//define('_MI_XOOPSPOLL_CHOOSEEDITORDSC', "This is the editor to be used when entering descriptions.");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLS', "Hide polls created in a forum from polls module and blocks");
 define('_MI_XOOPSPOLL_HIDEFORUM_POLLSDSC', "If Yes, polls created from a forum (newbb) are hidden in the polls module.<br />Set to Yes if forum module is not installed.");
 

Modified: XoopsModules/xoopspoll/branches/zyspec/xoops_version.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/xoops_version.php	2013-05-27 08:49:49 UTC (rev 11592)
+++ XoopsModules/xoopspoll/branches/zyspec/xoops_version.php	2013-05-27 22:28:05 UTC (rev 11593)
@@ -82,7 +82,7 @@
 $modversion['demo_site_name']      = '';
 $modversion['module_website_url']  = 'xoops.org';
 $modversion['module_website_name'] = 'XOOPS';
-$modversion['release_date']        = '2013/05/18';
+$modversion['release_date']        = '2013/05/27';
 $modversion['module_status']       = 'BETA 2';
 $modversion["author_website_url"]  = 'http://www.myweb.ne.jp';
 $modversion["author_website_name"] = 'Kazumi Ono';
@@ -230,6 +230,7 @@
 /**
  * Select the WYSIWYG Editor
  */
+/*
 xoops_load('XoopsEditorHandler');
 $editor_handler = XoopsEditorHandler::getInstance();
 $editorList = array_flip($editor_handler->getList());
@@ -242,6 +243,7 @@
     'valuetype'   => 'text',
     'options'     => $editorList,
     'default'     => 'dhtmltextarea');
+*/
 /**#@-*/
 
 /**