[evolvis-commits] r18697: small-fixes pending merges:↵ Thorsten Glaser 2012-10-04 unbreak news-when-abused-as-forums: make those world-readable
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Oct 4 19:54:33 CEST 2012
Author: mirabilos
Date: 2012-10-04 19:54:32 +0200 (Thu, 04 Oct 2012)
New Revision: 18697
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/forum/Forum.class.php
trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
Log:
small-fixes pending merges:
Thorsten Glaser 2012-10-04 unbreak news-when-abused-as-forums: make those world-readable
and out with it!
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/forum/Forum.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/forum/Forum.class.php 2012-10-04 17:54:27 UTC (rev 18696)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/forum/Forum.class.php 2012-10-04 17:54:32 UTC (rev 18697)
@@ -118,9 +118,17 @@
}
}
//
+ // Is this a news posting (or a real forum)?
+ //
+ $res = db_query_params('SELECT forum_id FROM news_bytes
+ WHERE forum_id=$1',
+ array($this->getID()));
+ $is_news = $res && db_numrows($res) >= 1;
+ //
// Make sure they can even access this object
//
- if (!forge_check_perm ('forum', $this->getID(), 'read')) {
+ if (!$is_news &&
+ !forge_check_perm ('forum', $this->getID(), 'read')) {
$this->setPermissionDeniedError();
$this->data_array = null;
return false;
Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog 2012-10-04 17:54:27 UTC (rev 18696)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog 2012-10-04 17:54:32 UTC (rev 18697)
@@ -1,8 +1,8 @@
-fusionforge (1:5.1.1+evolvis73) xunstable; urgency=low
+fusionforge (1:5.1.1+evolvis73) unstable; urgency=low
- * Fix some display issues with the forum when abused as news
+ * Fix display and permission issues with the forum when abused as news
- -- Thorsten Glaser <t.glaser at tarent.de> Thu, 04 Oct 2012 19:28:27 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de> Thu, 04 Oct 2012 19:37:21 +0200
fusionforge (1:5.1.1+evolvis72) unstable; urgency=low
Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/de.po 2012-10-04 17:54:27 UTC (rev 18696)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/de.po 2012-10-04 17:54:32 UTC (rev 18697)
@@ -1,9 +1,9 @@
# German translations for Evolvis.
msgid ""
msgstr ""
-"Project-Id-Version: EvolvisForge 5.1+evolvis72\n"
+"Project-Id-Version: EvolvisForge 5.1+evolvis73\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-04 17:57+0200\n"
+"POT-Creation-Date: 2012-10-04 19:37+0200\n"
"PO-Revision-Date: 2012-10-04 17:57+0200\n"
"Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
"Language-Team: german\n"
@@ -73,7 +73,7 @@
msgid "Unable To Remove Monitor"
msgstr "Konnte Beobachtung nicht entfernen"
-#: common/docman/Document.class.php:560 common/forum/Forum.class.php:464
+#: common/docman/Document.class.php:560 common/forum/Forum.class.php:472
msgid "Unable To Add Monitor"
msgstr "Konnte Beobachtung nicht hinzufügen"
@@ -1035,50 +1035,50 @@
msgid "Forums: No Valid Group Object"
msgstr "Forum:: Kein gültiges Gruppen-Objekt"
-#: common/forum/Forum.class.php:150 common/forum/Forum.class.php:562
+#: common/forum/Forum.class.php:158 common/forum/Forum.class.php:570
msgid "Forum Name Must Be At Least 3 Characters"
msgstr "Der Forenname muß mindestens 3 Zeichen lang sein"
-#: common/forum/Forum.class.php:154 common/forum/Forum.class.php:566
+#: common/forum/Forum.class.php:162 common/forum/Forum.class.php:574
msgid "Forum Description Must Be At Least 10 Characters"
msgstr "Die Foren-Beschreibung muß mindestens 10 Zeichen lang sein"
-#: common/forum/Forum.class.php:158 common/forum/Forum.class.php:570
+#: common/forum/Forum.class.php:166 common/forum/Forum.class.php:578
msgid "Illegal Characters in Forum Name"
msgstr "Illegale Zeichen im Forenname"
-#: common/forum/Forum.class.php:177
+#: common/forum/Forum.class.php:185
msgid "Mailing List Exists with same name"
msgstr "Mailingliste mit gleichem Namen existiert bereits"
-#: common/forum/Forum.class.php:208
+#: common/forum/Forum.class.php:216
msgid "Error Adding Forum"
msgstr "Fehler beim Anlegen eines Forums"
-#: common/forum/Forum.class.php:219 www/account/first.php:29
+#: common/forum/Forum.class.php:227 www/account/first.php:29
#, php-format
msgid "Welcome to %1$s"
msgstr "Willkommen auf %1$s"
-#: common/forum/Forum.class.php:243
+#: common/forum/Forum.class.php:251
msgid "Invalid forum group identifier"
msgstr "Ungültige Forengruppen Kennung"
-#: common/forum/Forum.class.php:445 common/forum/Forum.class.php:480
+#: common/forum/Forum.class.php:453 common/forum/Forum.class.php:488
#: common/frs/FRSPackage.class.php:269 common/frs/FRSPackage.class.php:301
#: common/tracker/ArtifactType.class.php:554
msgid "You can only monitor if you are logged in"
msgstr "Sie können nur Foren beobachten/überwachen, wenn Sie angemeldet sind."
-#: common/forum/Forum.class.php:513
+#: common/forum/Forum.class.php:521
msgid "You Can Only Save Your Place If You Are Logged In"
msgstr "Sie können nur speichern, wenn Sie auch angemeldet sind."
-#: common/forum/Forum.class.php:531
+#: common/forum/Forum.class.php:539
msgid "Forum::savePlace()"
msgstr "Forum::savePlace()"
-#: common/forum/Forum.class.php:606 common/mail/MailingList.class.php:253
+#: common/forum/Forum.class.php:614 common/mail/MailingList.class.php:253
#: plugins/mailman/include/MailmanList.class.php:251
#: plugins/mailman/include/MailmanList.class.php:378
#: plugins/mailman/include/MailmanList.class.php:395
@@ -1087,7 +1087,7 @@
msgid "Error On Update:"
msgstr "Fehler bei der Aktualisierung:"
-#: common/forum/Forum.class.php:621 common/frs/FRSPackage.class.php:448
+#: common/forum/Forum.class.php:629 common/frs/FRSPackage.class.php:448
#: common/frs/FRSRelease.class.php:356 common/include/Group.class.php:1652
#: common/mail/MailingList.class.php:396 common/pm/ProjectGroup.class.php:377
#: common/pm/ProjectTask.class.php:521 common/tracker/Artifact.class.php:497
@@ -1096,8 +1096,8 @@
msgid "Please tick all checkboxes."
msgstr "Bitte hake alle Ankreuzkästchen an."
-#: common/forum/Forum.class.php:632 common/forum/Forum.class.php:640
-#: common/forum/Forum.class.php:648
+#: common/forum/Forum.class.php:640 common/forum/Forum.class.php:648
+#: common/forum/Forum.class.php:656
#, fuzzy
msgid "Error Deleting Forum"
msgstr "Fehler beim Suchen des Forums"
Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot 2012-10-04 17:54:27 UTC (rev 18696)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot 2012-10-04 17:54:32 UTC (rev 18697)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-04 17:57+0200\n"
+"POT-Creation-Date: 2012-10-04 19:37+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -75,7 +75,7 @@
msgid "Unable To Remove Monitor"
msgstr ""
-#: common/docman/Document.class.php:560 common/forum/Forum.class.php:464
+#: common/docman/Document.class.php:560 common/forum/Forum.class.php:472
msgid "Unable To Add Monitor"
msgstr ""
@@ -941,50 +941,50 @@
msgid "Forums: No Valid Group Object"
msgstr ""
-#: common/forum/Forum.class.php:150 common/forum/Forum.class.php:562
+#: common/forum/Forum.class.php:158 common/forum/Forum.class.php:570
msgid "Forum Name Must Be At Least 3 Characters"
msgstr ""
-#: common/forum/Forum.class.php:154 common/forum/Forum.class.php:566
+#: common/forum/Forum.class.php:162 common/forum/Forum.class.php:574
msgid "Forum Description Must Be At Least 10 Characters"
msgstr ""
-#: common/forum/Forum.class.php:158 common/forum/Forum.class.php:570
+#: common/forum/Forum.class.php:166 common/forum/Forum.class.php:578
msgid "Illegal Characters in Forum Name"
msgstr ""
-#: common/forum/Forum.class.php:177
+#: common/forum/Forum.class.php:185
msgid "Mailing List Exists with same name"
msgstr ""
-#: common/forum/Forum.class.php:208
+#: common/forum/Forum.class.php:216
msgid "Error Adding Forum"
msgstr ""
-#: common/forum/Forum.class.php:219 www/account/first.php:29
+#: common/forum/Forum.class.php:227 www/account/first.php:29
#, php-format
msgid "Welcome to %1$s"
msgstr ""
-#: common/forum/Forum.class.php:243
+#: common/forum/Forum.class.php:251
msgid "Invalid forum group identifier"
msgstr ""
-#: common/forum/Forum.class.php:445 common/forum/Forum.class.php:480
+#: common/forum/Forum.class.php:453 common/forum/Forum.class.php:488
#: common/frs/FRSPackage.class.php:269 common/frs/FRSPackage.class.php:301
#: common/tracker/ArtifactType.class.php:554
msgid "You can only monitor if you are logged in"
msgstr ""
-#: common/forum/Forum.class.php:513
+#: common/forum/Forum.class.php:521
msgid "You Can Only Save Your Place If You Are Logged In"
msgstr ""
-#: common/forum/Forum.class.php:531
+#: common/forum/Forum.class.php:539
msgid "Forum::savePlace()"
msgstr ""
-#: common/forum/Forum.class.php:606 common/mail/MailingList.class.php:253
+#: common/forum/Forum.class.php:614 common/mail/MailingList.class.php:253
#: plugins/mailman/include/MailmanList.class.php:251
#: plugins/mailman/include/MailmanList.class.php:378
#: plugins/mailman/include/MailmanList.class.php:395
@@ -993,7 +993,7 @@
msgid "Error On Update:"
msgstr ""
-#: common/forum/Forum.class.php:621 common/frs/FRSPackage.class.php:448
+#: common/forum/Forum.class.php:629 common/frs/FRSPackage.class.php:448
#: common/frs/FRSRelease.class.php:356 common/include/Group.class.php:1652
#: common/mail/MailingList.class.php:396 common/pm/ProjectGroup.class.php:377
#: common/pm/ProjectTask.class.php:521 common/tracker/Artifact.class.php:497
@@ -1002,8 +1002,8 @@
msgid "Please tick all checkboxes."
msgstr ""
-#: common/forum/Forum.class.php:632 common/forum/Forum.class.php:640
-#: common/forum/Forum.class.php:648
+#: common/forum/Forum.class.php:640 common/forum/Forum.class.php:648
+#: common/forum/Forum.class.php:656
msgid "Error Deleting Forum"
msgstr ""
More information about the evolvis-commits
mailing list