[geeklog-cvs] geeklog: Fixed wrong "access denied" message when attempting to ...

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Sat Dec 5 13:47:30 EST 2009 

changeset 7515:67570edee13f
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/67570edee13f
user: Dirk Haun <dirk at haun-online.de>
date: Sat Dec 05 19:36:06 2009 +0100
description:
Fixed wrong "access denied" message when attempting to view comments on a poll that the user is not allowed to view (bug #0001044)

diffstat:

 plugins/polls/functions.inc                          |   4 +-
 plugins/polls/language/chinese_simplified_utf-8.php  |   3 +-
 plugins/polls/language/chinese_traditional_utf-8.php |   3 +-
 plugins/polls/language/dutch.php                     |   3 +-
 plugins/polls/language/dutch_utf-8.php               |   3 +-
 plugins/polls/language/english.php                   |   3 +-
 plugins/polls/language/english_utf-8.php             |   3 +-
 plugins/polls/language/estonian.php                  |   3 +-
 plugins/polls/language/estonian_utf-8.php            |   3 +-
 plugins/polls/language/french_canada.php             |   3 +-
 plugins/polls/language/french_canada_utf-8.php       |   3 +-
 plugins/polls/language/german.php                    |   3 +-
 plugins/polls/language/german_formal.php             |   3 +-
 plugins/polls/language/german_formal_utf-8.php       |   3 +-
 plugins/polls/language/german_utf-8.php              |   3 +-
 plugins/polls/language/hebrew_utf-8.php              |   3 +-
 plugins/polls/language/japanese_utf-8.php            |  51 +++++++++++++------------
 plugins/polls/language/korean.php                    |   3 +-
 plugins/polls/language/korean_utf-8.php              |   3 +-
 plugins/polls/language/russian.php                   |   3 +-
 plugins/polls/language/russian_utf-8.php             |   3 +-
 plugins/polls/language/slovenian.php                 |   3 +-
 plugins/polls/language/slovenian_utf-8.php           |   3 +-
 plugins/polls/language/spanish.php                   |   3 +-
 plugins/polls/language/spanish_utf-8.php             |   3 +-
 plugins/polls/language/ukrainian.php                 |   3 +-
 plugins/polls/language/ukrainian_koi8-u.php          |   3 +-
 plugins/polls/language/ukrainian_utf-8.php           |   3 +-
 public_html/docs/history                             |   2 +
 29 files changed, 82 insertions(+), 53 deletions(-)

diffs (truncated from 439 to 300 lines):

diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/functions.inc	Sat Dec 05 19:36:06 2009 +0100
@@ -995,7 +995,7 @@
 */
 function plugin_displaycomment_polls ($id, $cid, $title, $order, $format, $page, $view)
 {
-    global $_TABLES, $LANG_ACCESS;
+    global $_TABLES, $LANG_ACCESS, $LANG_POLLS;
 
     $retval = '';
 
@@ -1019,7 +1019,7 @@
     } else {
         $retval .= COM_startBlock ($LANG_ACCESS['accessdenied'], '',
                         COM_getBlockTemplate ('_msg_block', 'header'))
-                . $LANG_ACCESS['storydenialmsg']
+                . $LANG_POLLS['deny_msg']
                 . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
     }
 
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/chinese_simplified_utf-8.php
--- a/plugins/polls/language/chinese_simplified_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/chinese_simplified_utf-8.php	Sat Dec 05 19:36:06 2009 +0100
@@ -59,7 +59,8 @@
     'editinstructions' => 'Please fill in the Poll ID, at least one question and two answers for it.',
     'pollclosed' => 'This poll is closed for voting.',
     'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
-    'start_poll' => 'Start Poll'
+    'start_poll' => 'Start Poll',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/chinese_traditional_utf-8.php
--- a/plugins/polls/language/chinese_traditional_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/chinese_traditional_utf-8.php	Sat Dec 05 19:36:06 2009 +0100
@@ -59,7 +59,8 @@
     'editinstructions' => 'Please fill in the Poll ID, at least one question and two answers for it.',
     'pollclosed' => 'This poll is closed for voting.',
     'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
-    'start_poll' => 'Start Poll'
+    'start_poll' => 'Start Poll',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/dutch.php
--- a/plugins/polls/language/dutch.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/dutch.php	Sat Dec 05 19:36:06 2009 +0100
@@ -58,7 +58,8 @@
     'editinstructions' => 'Please fill in the Poll ID, at least one question and two answers for it.',
     'pollclosed' => 'This poll is closed for voting.',
     'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
-    'start_poll' => 'Start Poll'
+    'start_poll' => 'Start Poll',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/dutch_utf-8.php
--- a/plugins/polls/language/dutch_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/dutch_utf-8.php	Sat Dec 05 19:36:06 2009 +0100
@@ -58,7 +58,8 @@
     'editinstructions' => 'Please fill in the Poll ID, at least one question and two answers for it.',
     'pollclosed' => 'This poll is closed for voting.',
     'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
-    'start_poll' => 'Start Poll'
+    'start_poll' => 'Start Poll',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/english.php
--- a/plugins/polls/language/english.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/english.php	Sat Dec 05 19:36:06 2009 +0100
@@ -52,7 +52,8 @@
     'editinstructions'  => 'Please fill in the Poll ID, at least one question and two answers for it.',
     'pollclosed'        => 'This poll is closed for voting.', 
     'pollhidden'        => 'You have already voted. This poll results will only be shown when voting is closed.', 
-    'start_poll'        => 'Start Poll'
+    'start_poll'        => 'Start Poll',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/english_utf-8.php
--- a/plugins/polls/language/english_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/english_utf-8.php	Sat Dec 05 19:36:06 2009 +0100
@@ -52,7 +52,8 @@
     'editinstructions'  => 'Please fill in the Poll ID, at least one question and two answers for it.',
     'pollclosed'        => 'This poll is closed for voting.', 
     'pollhidden'        => 'You have already voted. This poll results will only be shown when voting is closed.', 
-    'start_poll'        => 'Start Poll'
+    'start_poll'        => 'Start Poll',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/estonian.php
--- a/plugins/polls/language/estonian.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/estonian.php	Sat Dec 05 19:36:06 2009 +0100
@@ -60,7 +60,8 @@
     'editinstructions' => 'Palun sisesta küsitluse ID, vähemalt üks küsitluse küsimus ning sellele küsimusele vähemalt kaks vastusevarianti',
     'pollclosed' => 'This poll is closed for voting.',
     'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
-    'start_poll' => 'Käivita küsitlus'
+    'start_poll' => 'Käivita küsitlus',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/estonian_utf-8.php
--- a/plugins/polls/language/estonian_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/estonian_utf-8.php	Sat Dec 05 19:36:06 2009 +0100
@@ -60,7 +60,8 @@
     'editinstructions' => 'Palun sisesta küsitluse ID, vähemalt üks küsitluse küsimus ning sellele küsimusele vähemalt kaks vastusevarianti',
     'pollclosed' => 'This poll is closed for voting.',
     'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
-    'start_poll' => 'Käivita küsitlus'
+    'start_poll' => 'Käivita küsitlus',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/french_canada.php
--- a/plugins/polls/language/french_canada.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/french_canada.php	Sat Dec 05 19:36:06 2009 +0100
@@ -59,7 +59,8 @@
     'editinstructions' => 'Please fill in the Poll ID, at least one question and two answers for it.',
     'pollclosed' => 'This poll is closed for voting.',
     'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
-    'start_poll' => 'Start Poll'
+    'start_poll' => 'Start Poll',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/french_canada_utf-8.php
--- a/plugins/polls/language/french_canada_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/french_canada_utf-8.php	Sat Dec 05 19:36:06 2009 +0100
@@ -59,7 +59,8 @@
     'editinstructions' => 'Please fill in the Poll ID, at least one question and two answers for it.',
     'pollclosed' => 'This poll is closed for voting.',
     'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
-    'start_poll' => 'Start Poll'
+    'start_poll' => 'Start Poll',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/german.php
--- a/plugins/polls/language/german.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/german.php	Sat Dec 05 19:36:06 2009 +0100
@@ -58,7 +58,8 @@
     'editinstructions' => 'Bitte für die Umfrage-ID mindestens eine Frage und zwei Antworten eintragen.',
     'pollclosed' => 'Diese Umfrage ist abgeschlossen.',
     'pollhidden' => 'Du hast schon abgestimmt. Die Ergebnisse dieser Umfrage werden veröffentlicht, sobald sie abgeschlossen ist.',
-    'start_poll' => 'Zur Umfrage'
+    'start_poll' => 'Zur Umfrage',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/german_formal.php
--- a/plugins/polls/language/german_formal.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/german_formal.php	Sat Dec 05 19:36:06 2009 +0100
@@ -58,7 +58,8 @@
     'editinstructions' => 'Bitte für die Umfrage-ID mindestens eine Frage und zwei Antworten eintragen.',
     'pollclosed' => 'Diese Umfrage ist abgeschlossen.',
     'pollhidden' => 'Sie haben schon abgestimmt. Die Ergebnisse dieser Umfrage werden veröffentlicht, sobald sie abgeschlossen ist.',
-    'start_poll' => 'Zur Umfrage'
+    'start_poll' => 'Zur Umfrage',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/german_formal_utf-8.php
--- a/plugins/polls/language/german_formal_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/german_formal_utf-8.php	Sat Dec 05 19:36:06 2009 +0100
@@ -58,7 +58,8 @@
     'editinstructions' => 'Bitte für die Umfrage-ID mindestens eine Frage und zwei Antworten eintragen.',
     'pollclosed' => 'Diese Umfrage ist abgeschlossen.',
     'pollhidden' => 'Sie haben schon abgestimmt. Die Ergebnisse dieser Umfrage werden veröffentlicht, sobald sie abgeschlossen ist.',
-    'start_poll' => 'Zur Umfrage'
+    'start_poll' => 'Zur Umfrage',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/german_utf-8.php
--- a/plugins/polls/language/german_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/german_utf-8.php	Sat Dec 05 19:36:06 2009 +0100
@@ -58,7 +58,8 @@
     'editinstructions' => 'Bitte für die Umfrage-ID mindestens eine Frage und zwei Antworten eintragen.',
     'pollclosed' => 'Diese Umfrage ist abgeschlossen.',
     'pollhidden' => 'Du hast schon abgestimmt. Die Ergebnisse dieser Umfrage werden veröffentlicht, sobald sie abgeschlossen ist.',
-    'start_poll' => 'Zur Umfrage'
+    'start_poll' => 'Zur Umfrage',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/hebrew_utf-8.php
--- a/plugins/polls/language/hebrew_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/hebrew_utf-8.php	Sat Dec 05 19:36:06 2009 +0100
@@ -59,7 +59,8 @@
     'editinstructions' => 'אנא מלאו את קוד הזיהוי של הסקר, לפחות שאלה אחת ושתי תשובות לה.',
     'pollclosed' => 'ההצבעה לסקר זה סגורה.',
     'pollhidden' => 'כבר הצבעתם. תוצאות הסקר יוצגו כאשר ההצבעה תיסגר.',
-    'start_poll' => 'התחילו את הסקר'
+    'start_poll' => 'התחילו את הסקר',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/japanese_utf-8.php
--- a/plugins/polls/language/japanese_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/japanese_utf-8.php	Sat Dec 05 19:36:06 2009 +0100
@@ -41,30 +41,31 @@
 ###############################################################################
 
 $LANG_POLLS = array(
-    'polls'             => 'アンケート',
-    'results'           => '結果',
-    'pollresults'       => '投票結果',
-    'votes'             => '投票',
-    'vote'              => '投票する',
-    'pastpolls'         => 'アンケートの一覧',
-    'savedvotetitle'    => '投票ありがとうございました',
-    'savedvotemsg'      => 'テーマ:',
-    'pollstitle'        => 'アンケート一覧',
-    'polltopics'        => '他のアンケートを見る',
-    'stats_top10'       => 'アンケート（上位10件）',
-    'stats_topics'      => 'アンケートの質問',
-    'stats_votes'       => '投票',
-    'stats_none'        => 'このサイトにはアンケートがないか、まだ誰も投票していないようです。',
-    'stats_summary'     => 'アンケート数(投票数)',
-    'open_poll'         => '投票可否',
-    'answer_all'        => '残りのすべての質問にお答えください',
-    'not_saved'         => '結果は保存されませんでした',
-    'upgrade1'          => 'アンケートプラグインの新しいバージョンがインストールされました。',
-    'upgrade2'          => 'アップグレードしてください。',
-    'editinstructions'  => 'アンケートIDã‚’å
¥åŠ›ã—てください。少なくとも1つの質問と2つの回答を用意してください。',
-    'pollclosed'        => 'このアンケートは投票を終了しました。',
-    'pollhidden'        => 'あなたは既に投票済みです。このアンケートの結果は投票終了後にå
¬é–‹ã•ã‚Œã¾ã™ã€‚',
-    'start_poll'        => '投稿する'
+    'polls' => 'アンケート',
+    'results' => '結果',
+    'pollresults' => '投票結果',
+    'votes' => '投票',
+    'vote' => '投票する',
+    'pastpolls' => 'アンケートの一覧',
+    'savedvotetitle' => '投票ありがとうございました',
+    'savedvotemsg' => 'テーマ:',
+    'pollstitle' => 'アンケート一覧',
+    'polltopics' => '他のアンケートを見る',
+    'stats_top10' => 'アンケート（上位10件）',
+    'stats_topics' => 'アンケートの質問',
+    'stats_votes' => '投票',
+    'stats_none' => 'このサイトにはアンケートがないか、まだ誰も投票していないようです。',
+    'stats_summary' => 'アンケート数(投票数)',
+    'open_poll' => '投票可否',
+    'answer_all' => '残りのすべての質問にお答えください',
+    'not_saved' => '結果は保存されませんでした',
+    'upgrade1' => 'アンケートプラグインの新しいバージョンがインストールされました。',
+    'upgrade2' => 'アップグレードしてください。',
+    'editinstructions' => 'アンケートIDã‚’å
¥åŠ›ã—てください。少なくとも1つの質問と2つの回答を用意してください。',
+    'pollclosed' => 'このアンケートは投票を終了しました。',
+    'pollhidden' => 'あなたは既に投票済みです。このアンケートの結果は投票終了後にå
¬é–‹ã•ã‚Œã¾ã™ã€‚',
+    'start_poll' => '投稿する',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
@@ -153,7 +154,7 @@
 // Note: entries 0, 1, and 12 are the same as in $LANG_configselects['Core']
 $LANG_configselects['polls'] = array(
     0 => array('はい' => 1, 'いいえ' => 0),
-    1 => array('はい' => TRUE, 'いいえ' => FALSE),
+    1 => array('はい' => true, 'いいえ' => false),
     2 => array('登録順' => 'submitorder', '得票順' => 'voteorder'),
     9 => array('作成したアンケートを表示する' => 'item', 'アンケート管理を表示する' => 'list', 'アンケート一覧を表示する' => 'plugin', 'ホームを表示する' => 'home', '管理画面トップを表示する' => 'admin'),
     12 => array('アクセス不可' => 0, '表示' => 2, '表示・編集' => 3)
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/korean.php
--- a/plugins/polls/language/korean.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/korean.php	Sat Dec 05 19:36:06 2009 +0100
@@ -59,7 +59,8 @@
     'editinstructions' => 'Please fill in the Poll ID, at least one question and two answers for it.',
     'pollclosed' => 'This poll is closed for voting.',
     'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
-    'start_poll' => 'Start Poll'
+    'start_poll' => 'Start Poll',
+    'deny_msg' => 'Access to this poll is denied.  Either the poll has been moved/removed or you do not have sufficient permissions.'
 );
 
 ###############################################################################
diff -r 45420e4a6c33 -r 67570edee13f plugins/polls/language/korean_utf-8.php
--- a/plugins/polls/language/korean_utf-8.php	Sat Dec 05 16:52:21 2009 +0100
+++ b/plugins/polls/language/korean_utf-8.php	Sat Dec 05 19:36:06 2009 +0100

More information about the geeklog-cvs mailing list