Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16233] branches/experimental/perms
|
From: <lph...@us...> - 2009-01-10 18:57:45
|
Revision: 16233
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16233&view=rev
Author: lphuberdeau
Date: 2009-01-10 18:57:37 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
[MRG] Automatic merge, trunk 16177 to 16229
Modified Paths:
--------------
branches/experimental/perms/db/features.csv
branches/experimental/perms/db/tiki.sql
branches/experimental/perms/lang/ar/language.php
branches/experimental/perms/lang/ca/language.php
branches/experimental/perms/lang/cn/language.php
branches/experimental/perms/lang/cs/language.php
branches/experimental/perms/lang/da/language.php
branches/experimental/perms/lang/de/language.php
branches/experimental/perms/lang/el/language.php
branches/experimental/perms/lang/en/language.php
branches/experimental/perms/lang/en-uk/language.php
branches/experimental/perms/lang/es/language.php
branches/experimental/perms/lang/fa/language.php
branches/experimental/perms/lang/fi/language.php
branches/experimental/perms/lang/fj/language.php
branches/experimental/perms/lang/fr/language.php
branches/experimental/perms/lang/gl/language.php
branches/experimental/perms/lang/he/language.php
branches/experimental/perms/lang/hr/language.php
branches/experimental/perms/lang/hu/language.php
branches/experimental/perms/lang/it/language.php
branches/experimental/perms/lang/ja/language.php
branches/experimental/perms/lang/ko/language.php
branches/experimental/perms/lang/nl/language.php
branches/experimental/perms/lang/no/language.php
branches/experimental/perms/lang/pl/language.php
branches/experimental/perms/lang/pt/language.php
branches/experimental/perms/lang/pt-br/language.php
branches/experimental/perms/lang/ru/language.php
branches/experimental/perms/lang/sb/language.php
branches/experimental/perms/lang/sk/language.php
branches/experimental/perms/lang/sr/language.php
branches/experimental/perms/lang/sr-latn/language.php
branches/experimental/perms/lang/sv/language.php
branches/experimental/perms/lang/tv/language.php
branches/experimental/perms/lang/tw/language.php
branches/experimental/perms/lang/uk/language.php
branches/experimental/perms/lib/admin/magic-enumerations.php
branches/experimental/perms/lib/ajax/ajaxlib.php
branches/experimental/perms/lib/articles/artlib.php
branches/experimental/perms/lib/categories/categlib.php
branches/experimental/perms/lib/commentslib.php
branches/experimental/perms/lib/core/lib/DeclFilter.php
branches/experimental/perms/lib/core/lib/TikiFilter.php
branches/experimental/perms/lib/imagegals/imagegallib.php
branches/experimental/perms/lib/setup/prefs.php
branches/experimental/perms/lib/smarty_tiki/block.self_link.php
branches/experimental/perms/lib/smarty_tiki/function.icon.php
branches/experimental/perms/lib/smarty_tiki/modifier.sefurl.php
branches/experimental/perms/lib/structures/structlib.php
branches/experimental/perms/lib/tikilib.php
branches/experimental/perms/lib/trackers/trackerlib.php
branches/experimental/perms/lib/userslib.php
branches/experimental/perms/lib/wiki/wikilib.php
branches/experimental/perms/lib/wiki-plugins/wikiplugin_flash.php
branches/experimental/perms/modules/mod-freetag.php
branches/experimental/perms/styles/tikineat.css
branches/experimental/perms/templates/categorize.tpl
branches/experimental/perms/templates/modules/mod-blog_last_comments.tpl
branches/experimental/perms/templates/tiki-admin-include-gal.tpl
branches/experimental/perms/templates/tiki-admin-include-login.tpl
branches/experimental/perms/templates/tiki-admin-include-search.tpl
branches/experimental/perms/templates/tiki-admin_notifications.tpl
branches/experimental/perms/templates/tiki-galleries.tpl
branches/experimental/perms/templates/tiki-my_tiki.tpl
branches/experimental/perms/templates/tiki-mytiki_bar.tpl
branches/experimental/perms/templates/tiki-searchindex.tpl
branches/experimental/perms/templates/tiki-searchresults.tpl
branches/experimental/perms/templates/tiki-upload_image.tpl
branches/experimental/perms/templates/tiki-user_information.tpl
branches/experimental/perms/templates/tiki-user_preferences.tpl
branches/experimental/perms/templates/tiki-view_tracker_item.tpl
branches/experimental/perms/templates/wiki-plugins/wikiplugin_ftp.tpl
branches/experimental/perms/tiki-admin_include_search.php
branches/experimental/perms/tiki-admin_notifications.php
branches/experimental/perms/tiki-admingroups.php
branches/experimental/perms/tiki-adminusers.php
branches/experimental/perms/tiki-list_comments.php
branches/experimental/perms/tiki-mindmap.php
branches/experimental/perms/tiki-my_tiki.php
branches/experimental/perms/tiki-upload_image.php
branches/experimental/perms/tiki-user_information.php
branches/experimental/perms/tiki-user_preferences.php
branches/experimental/perms/tiki-wiki3d_xmlrpc.php
Added Paths:
-----------
branches/experimental/perms/installer/schema/20090106_group_watch_tiki.sql
Property Changed:
----------------
branches/experimental/perms/
branches/experimental/perms/installer/schema/20081105_calendar_items_allday_update_tiki.sql
branches/experimental/perms/lib/core/lib/Multilingual/Aligner/BilingualAligner.php
branches/experimental/perms/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php
branches/experimental/perms/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php
branches/experimental/perms/lib/core/test/Multilingual/Aligner/AllTests.php
branches/experimental/perms/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php
branches/experimental/perms/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php
branches/experimental/perms/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php
branches/experimental/perms/temp/cache/
Property changes on: branches/experimental/perms
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter:15787-16031
/trunk:16154-16177
+ /branches/experimental/declfilter:15787-16031
/trunk:16154-16229
Modified: branches/experimental/perms/db/features.csv
===================================================================
--- branches/experimental/perms/db/features.csv 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/db/features.csv 2009-01-10 18:57:37 UTC (rev 16233)
@@ -944,3 +944,9 @@
1053,Comments Moderation,15,,feature_comments_moderation,feature,,tiki_p_admin,,,,,,
1054,Group Alert,15,,feature_groupalert,feature,,tiki_p_admin,,,,,,
1055,Share,913,,wikiplugin_share,flag,,tiki_p_admin,,,,SHARE plugin social networking tool using plugins ADDTHIS SHARETHIS or SUBMIT plugins,,
+1056,Show object filters,70,,feature_search_show_object_filter,flag,,tiki_p_admin,,,,,,
+1057,Show search box,70,,feature_search_show_search_box,flag,,tiki_p_admin,,,,,,
+1058,Show visit count,70,,feature_search_show_visit_count,flag,,tiki_p_admin,,,,,,
+1059,Show pertinence,70,,feature_search_show_pertinence,flag,,tiki_p_admin,,,,,,
+1060,Show object type,70,,feature_search_show_object_type,flag,,tiki_p_admin,,,,,,
+1061,Show last modification,70,,feature_search_show_last_modification,flag,,tiki_p_admin,,,,,,
Modified: branches/experimental/perms/db/tiki.sql
===================================================================
--- branches/experimental/perms/db/tiki.sql 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/db/tiki.sql 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1127,6 +1127,19 @@
PRIMARY KEY (groupName(30),includeGroup(30))
) ENGINE=MyISAM;
+DROP TABLE IF EXISTS tiki_group_watches;
+CREATE TABLE tiki_group_watches (
+ watchId int(12) NOT NULL auto_increment,
+ `group` varchar(200) NOT NULL default '',
+ event varchar(40) NOT NULL default '',
+ object varchar(200) NOT NULL default '',
+ title varchar(250) default NULL,
+ type varchar(200) default NULL,
+ url varchar(250) default NULL,
+ KEY watchId (watchId),
+ PRIMARY KEY (`group`(50),event,object(100))
+) ENGINE=MyISAM;
+
DROP TABLE IF EXISTS tiki_history;
CREATE TABLE tiki_history (
historyId int(12) NOT NULL auto_increment,
Property changes on: branches/experimental/perms/installer/schema/20081105_calendar_items_allday_update_tiki.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/installer/schema/20081105_calendar_items_allday_update.sql:15787-16031
/trunk/installer/schema/20081105_calendar_items_allday_update_tiki.sql:16154-16177
+ /branches/experimental/declfilter/installer/schema/20081105_calendar_items_allday_update.sql:15787-16031
/trunk/installer/schema/20081105_calendar_items_allday_update_tiki.sql:16154-16229
Copied: branches/experimental/perms/installer/schema/20090106_group_watch_tiki.sql (from rev 16229, trunk/installer/schema/20090106_group_watch_tiki.sql)
===================================================================
--- branches/experimental/perms/installer/schema/20090106_group_watch_tiki.sql (rev 0)
+++ branches/experimental/perms/installer/schema/20090106_group_watch_tiki.sql 2009-01-10 18:57:37 UTC (rev 16233)
@@ -0,0 +1,12 @@
+#2008-01-06 lphuberdeau
+CREATE TABLE tiki_group_watches (
+ watchId int(12) NOT NULL auto_increment,
+ `group` varchar(200) NOT NULL default '',
+ event varchar(40) NOT NULL default '',
+ object varchar(200) NOT NULL default '',
+ title varchar(250) default NULL,
+ type varchar(200) default NULL,
+ url varchar(250) default NULL,
+ KEY watchId (watchId),
+ PRIMARY KEY (`group`(50),event,object(100))
+) ENGINE=MyISAM;
Modified: branches/experimental/perms/lang/ar/language.php
===================================================================
--- branches/experimental/perms/lang/ar/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/ar/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -570,6 +570,7 @@
// "Allow secure (https) login" => "Allow secure (https) login",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "Require secure (https) login" => "Require secure (https) login",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
Modified: branches/experimental/perms/lang/ca/language.php
===================================================================
--- branches/experimental/perms/lang/ca/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/ca/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -2234,6 +2234,7 @@
// "20 hours" => "20 hours",
// "1 year" => "1 year",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "Shibboleth" => "Shibboleth",
Modified: branches/experimental/perms/lang/cn/language.php
===================================================================
--- branches/experimental/perms/lang/cn/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/cn/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -2042,6 +2042,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/cs/language.php
===================================================================
--- branches/experimental/perms/lang/cs/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/cs/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1361,6 +1361,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/da/language.php
===================================================================
--- branches/experimental/perms/lang/da/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/da/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1171,6 +1171,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/de/language.php
===================================================================
--- branches/experimental/perms/lang/de/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/de/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -5032,6 +5032,7 @@
"Allow secure (https) login" => "Erlaube sicheren Login (https)",
"Encourage secure (https) login" => "Schlage sicheren Login (https) vor",
"Consider we are in always in HTTPS, but do not check" => "Gehe von HTTPS aus, aber prüfe nicht nach",
+"Consider we are always in HTTPS, but do not check" => "Gehe von HTTPS aus, aber prüfe nicht nach",
"Require secure (https) login" => "Sicherer Login (https) notwendig",
"tikihash (old)" => "tikihash (alt)",
"Just Tiki" => "Nur über Tiki",
Modified: branches/experimental/perms/lang/el/language.php
===================================================================
--- branches/experimental/perms/lang/el/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/el/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -631,6 +631,7 @@
// "Allow secure (https) login" => "Allow secure (https) login",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "Require secure (https) login" => "Require secure (https) login",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
Modified: branches/experimental/perms/lang/en/language.php
===================================================================
--- branches/experimental/perms/lang/en/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/en/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -511,6 +511,7 @@
// "Allow secure (https) login" => "Allow secure (https) login",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "Require secure (https) login" => "Require secure (https) login",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
Modified: branches/experimental/perms/lang/en-uk/language.php
===================================================================
--- branches/experimental/perms/lang/en-uk/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/en-uk/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -515,6 +515,7 @@
// "Allow secure (https) login" => "Allow secure (https) login",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "Require secure (https) login" => "Require secure (https) login",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
Modified: branches/experimental/perms/lang/es/language.php
===================================================================
--- branches/experimental/perms/lang/es/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/es/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1489,6 +1489,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/fa/language.php
===================================================================
--- branches/experimental/perms/lang/fa/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/fa/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1560,6 +1560,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/fi/language.php
===================================================================
--- branches/experimental/perms/lang/fi/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/fi/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1792,6 +1792,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/fj/language.php
===================================================================
--- branches/experimental/perms/lang/fj/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/fj/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -348,6 +348,7 @@
// "Allow secure (https) login" => "Allow secure (https) login",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "Require secure (https) login" => "Require secure (https) login",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
Modified: branches/experimental/perms/lang/fr/language.php
===================================================================
--- branches/experimental/perms/lang/fr/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/fr/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -2533,8 +2533,9 @@
"1 month" => "1 mois",
"1 year" => "1 an",
"Allow secure (https) login" => "Permettre une connexion sécurisée (HTTPS)",
-"Encourage secure (https) login" => "Encourager les logins sècurisés (https)",
+"Encourage secure (https) login" => "Encourager les logins sécurisés (https)",
"Consider we are in always in HTTPS, but do not check" => "Considère que nous sommes toujours en HTTPS, sans le vérifier",
+"Consider we are always in HTTPS, but do not check" => "Considère que nous sommes toujours en HTTPS, sans le vérifier",
"Require secure (https) login" => "Exiger une connexion sécurisée (HTTPS)",
"tikihash (old)" => "hashtiki (vieux)",
"Just Tiki" => "Juste Tiki",
Modified: branches/experimental/perms/lang/gl/language.php
===================================================================
--- branches/experimental/perms/lang/gl/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/gl/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1453,6 +1453,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/he/language.php
===================================================================
--- branches/experimental/perms/lang/he/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/he/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1037,6 +1037,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/hr/language.php
===================================================================
(Binary files differ)
Modified: branches/experimental/perms/lang/hu/language.php
===================================================================
--- branches/experimental/perms/lang/hu/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/hu/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -808,6 +808,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/it/language.php
===================================================================
--- branches/experimental/perms/lang/it/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/it/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1321,6 +1321,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/ja/language.php
===================================================================
--- branches/experimental/perms/lang/ja/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/ja/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1180,6 +1180,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/ko/language.php
===================================================================
--- branches/experimental/perms/lang/ko/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/ko/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -729,6 +729,7 @@
// "Allow secure (https) login" => "Allow secure (https) login",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "Require secure (https) login" => "Require secure (https) login",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
Modified: branches/experimental/perms/lang/nl/language.php
===================================================================
--- branches/experimental/perms/lang/nl/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/nl/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1382,6 +1382,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/no/language.php
===================================================================
--- branches/experimental/perms/lang/no/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/no/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -509,6 +509,7 @@
// "Allow secure (https) login" => "Allow secure (https) login",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "Require secure (https) login" => "Require secure (https) login",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
Modified: branches/experimental/perms/lang/pl/language.php
===================================================================
--- branches/experimental/perms/lang/pl/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/pl/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1194,6 +1194,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/pt/language.php
===================================================================
--- branches/experimental/perms/lang/pt/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/pt/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -5495,6 +5495,7 @@
"Allow secure (https) login" => "Permitir login seguro (https)",
"Encourage secure (https) login" => "Encourajar login seguro (HTTPS)",
"Consider we are in always in HTTPS, but do not check" => "Assumir HTTPS, mas sem verificar",
+"Consider we are always in HTTPS, but do not check" => "Assumir HTTPS, mas sem verificar",
"Require secure (https) login" => "Exigir login seguro (https)",
"Just Tiki" => "Apenas Tiki",
"Web Server" => "Servidor Web",
Modified: branches/experimental/perms/lang/pt-br/language.php
===================================================================
--- branches/experimental/perms/lang/pt-br/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/pt-br/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1700,6 +1700,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/ru/language.php
===================================================================
--- branches/experimental/perms/lang/ru/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/ru/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1297,6 +1297,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/sb/language.php
===================================================================
--- branches/experimental/perms/lang/sb/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/sb/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1353,6 +1353,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/sk/language.php
===================================================================
--- branches/experimental/perms/lang/sk/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/sk/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1202,6 +1202,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/sr/language.php
===================================================================
--- branches/experimental/perms/lang/sr/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/sr/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -509,6 +509,7 @@
// "Allow secure (https) login" => "Allow secure (https) login",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "Require secure (https) login" => "Require secure (https) login",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
Modified: branches/experimental/perms/lang/sr-latn/language.php
===================================================================
--- branches/experimental/perms/lang/sr-latn/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/sr-latn/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1333,6 +1333,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/sv/language.php
===================================================================
--- branches/experimental/perms/lang/sv/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/sv/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1464,6 +1464,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/tv/language.php
===================================================================
--- branches/experimental/perms/lang/tv/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/tv/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -535,6 +535,7 @@
// "Allow secure (https) login" => "Allow secure (https) login",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "Require secure (https) login" => "Require secure (https) login",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
Modified: branches/experimental/perms/lang/tw/language.php
===================================================================
--- branches/experimental/perms/lang/tw/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/tw/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1368,6 +1368,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lang/uk/language.php
===================================================================
--- branches/experimental/perms/lang/uk/language.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lang/uk/language.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1277,6 +1277,7 @@
// "1 year" => "1 year",
// "Encourage secure (https) login" => "Encourage secure (https) login",
// "Consider we are in always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
+// "Consider we are always in HTTPS, but do not check" => "Consider we are in always in HTTPS, but do not check",
// "crypt-md5" => "crypt-md5",
// "crypt-des" => "crypt-des",
// "tikihash (old)" => "tikihash (old)",
Modified: branches/experimental/perms/lib/admin/magic-enumerations.php
===================================================================
--- branches/experimental/perms/lib/admin/magic-enumerations.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/admin/magic-enumerations.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -80,7 +80,7 @@
//get_strings ('0'=>tra('5 minutes'),'1'=>tra('15 minutes'),'2'=>tra('30 minutes'),'3'=>tra('1 hour'),'4'=>tra('2 hours'),'5'=>tra('10 hours'),'6'=>tra('20 hours'),'7'=>tra('1 day'),'8'=>tra('1 week'),'9'=>tra('1 month'),'10'=>tra('1 year'));
$enumerations['httpslogin'] = array ('0'=>'Disabled','1'=>'Allow secure (https) login','2'=>'Encourage secure (https) login','3'=>'Consider we are in always in HTTPS, but do not check','4'=>'Require secure (https) login');
-//get_strings ('0'=>tra('Disabled'),'1'=>tra('Allow secure (https) login'),'2'=>tra('Encourage secure (https) login'),'3'=>tra('Consider we are in always in HTTPS, but do not check'),'4'=>tra('Require secure (https) login'));
+//get_strings ('0'=>tra('Disabled'),'1'=>tra('Allow secure (https) login'),'2'=>tra('Encourage secure (https) login'),'3'=>tra('Consider we are always in HTTPS, but do not check'),'4'=>tra('Require secure (https) login'));
$enumerations['featurecryptpasswords'] = array ('crypt-md5'=>'crypt-md5','crypt-des'=>'crypt-des','tikihash'=>'tikihash (old)');
//get_strings ('crypt-md5'=>tra('crypt-md5'),'crypt-des'=>tra('crypt-des'),'tikihash'=>tra('tikihash (old)'));
Modified: branches/experimental/perms/lib/ajax/ajaxlib.php
===================================================================
--- branches/experimental/perms/lib/ajax/ajaxlib.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/ajax/ajaxlib.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -189,6 +189,26 @@
$objResponse->script("tikitabs($tab,$max_tikitabs);");
}
+ } elseif ( $ajaxlib->templateIsRegistered('confirm.tpl') ) {
+ global $area;
+
+ $params = array(
+ '_tag' => 'n',
+ '_keepall' => 'y'
+ );
+
+ if ( $prefs['feature_ticketlib2'] == 'y' ) {
+ $objResponse->confirmCommands(1, $smarty->get_template_vars('confirmation_text'));
+ $params['daconfirm'] = 'y';
+ $params['ticket'] = $smarty->get_template_vars('ticket');
+ }
+
+ require_once('lib/smarty_tiki/block.self_link.php');
+ require_once('lib/smarty_tiki/modifier.escape.php');
+
+ $uri = smarty_modifier_escape(smarty_block_self_link($params, '', $smarty), 'javascript');
+ $objResponse->call("loadComponent('$uri','$template','$htmlElementId',".((int)$max_tikitabs).",'$last_user')");
+
} else {
$objResponse->alert(sprintf(tra("Template %s not registered"),$template));
}
Modified: branches/experimental/perms/lib/articles/artlib.php
===================================================================
--- branches/experimental/perms/lib/articles/artlib.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/articles/artlib.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -526,7 +526,9 @@
$ret = array();
while ($res = $result->fetchRow()) {
- $ret[] = $res;
+ if ($this->user_has_perm_on_object($user, $res['articleId'], 'article', 'tiki_p_read_article')) {
+ $ret[] = $res;
+ }
}
return $ret;
Modified: branches/experimental/perms/lib/categories/categlib.php
===================================================================
--- branches/experimental/perms/lib/categories/categlib.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/categories/categlib.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1336,6 +1336,8 @@
function remove_category_from_watchlists($categId) {
$query = 'delete from `tiki_user_watches` where `object`=? and `type`=?';
$this->query($query, array((int) $categId, 'Category'));
+ $query = 'delete from `tiki_group_watches` where `object`=? and `type`=?';
+ $this->query($query, array((int) $categId, 'Category'));
}
Modified: branches/experimental/perms/lib/commentslib.php
===================================================================
--- branches/experimental/perms/lib/commentslib.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/commentslib.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -1244,7 +1244,9 @@
$ret = array();
while ($res = $result->fetchRow()) {
- $ret[] = $res;
+ if ($this->user_has_perm_on_object($user, $res['forumId'], 'forum', 'tiki_p_forum_read')) {
+ $ret[] = $res;
+ }
}
return $ret;
Modified: branches/experimental/perms/lib/core/lib/DeclFilter.php
===================================================================
--- branches/experimental/perms/lib/core/lib/DeclFilter.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/core/lib/DeclFilter.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -21,18 +21,22 @@
{
$filter = new self;
- foreach( $configuration as $list ) {
- foreach( $list as $method => $argument ) {
- $real = 'add' . ucfirst( $method );
+ foreach( $configuration as $key => $list ) {
+ if (is_array($list) && is_numeric( $key ) ) {
+ foreach( $list as $method => $argument ) {
+ $real = 'add' . ucfirst( $method );
- // Accept all methods begining with 'add' except those that are disallowed
- if( method_exists( $filter, $real )
- && ! in_array( $method, $reject )
- ) {
- $filter->$real( $argument );
- } else {
- trigger_error( 'Disallowed filtering rule: ' . $method, E_USER_ERROR );
+ // Accept all methods begining with 'add' except those that are disallowed
+ if( method_exists( $filter, $real )
+ && ! in_array( $method, $reject )
+ ) {
+ $filter->$real( $argument );
+ } else {
+ trigger_error( 'Disallowed filtering rule: ' . $method, E_USER_ERROR );
+ }
}
+ } else {
+ trigger_error( 'Invalid input configuration structure', E_USER_ERROR );
}
}
Property changes on: branches/experimental/perms/lib/core/lib/Multilingual/Aligner/BilingualAligner.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/lib/multilingual/BilingualAligner.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16154-16177
+ /branches/experimental/declfilter/lib/multilingual/BilingualAligner.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16154-16229
Property changes on: branches/experimental/perms/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/lib/multilingual/SentenceSegmentor.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16154-16177
+ /branches/experimental/declfilter/lib/multilingual/SentenceSegmentor.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16154-16229
Property changes on: branches/experimental/perms/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/lib/multilingual/ShortestPathFinder.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16154-16177
+ /branches/experimental/declfilter/lib/multilingual/ShortestPathFinder.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16154-16229
Modified: branches/experimental/perms/lib/core/lib/TikiFilter.php
===================================================================
--- branches/experimental/perms/lib/core/lib/TikiFilter.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/core/lib/TikiFilter.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -45,6 +45,7 @@
case 'wikicontent':
require_once 'TikiFilter/RawUnsafe.php';
return new TikiFilter_RawUnsafe;
+ case 'email':
case 'url':
case 'lang':
// TODO
Property changes on: branches/experimental/perms/lib/core/test/Multilingual/Aligner/AllTests.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/lib/multilingual/AllTests.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/AllTests.php:16154-16177
+ /branches/experimental/declfilter/lib/multilingual/AllTests.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/AllTests.php:16154-16229
Property changes on: branches/experimental/perms/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/lib/multilingual/BilingualAlignerTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:16154-16177
+ /branches/experimental/declfilter/lib/multilingual/BilingualAlignerTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:16154-16229
Property changes on: branches/experimental/perms/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/lib/multilingual/SentenceSegmentorTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:16154-16177
+ /branches/experimental/declfilter/lib/multilingual/SentenceSegmentorTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:16154-16229
Property changes on: branches/experimental/perms/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:16154-16177
+ /trunk/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:16154-16229
Modified: branches/experimental/perms/lib/imagegals/imagegallib.php
===================================================================
--- branches/experimental/perms/lib/imagegals/imagegallib.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/imagegals/imagegallib.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -844,29 +844,21 @@
} else {
// Store data in directory
$fhash = md5(uniqid($filename));
-
- @$fw = fopen($prefs['gal_use_dir'] . $fhash, "wb");
-
- if (!$fw) {
+ if (!($fw = fopen($prefs['gal_use_dir'] . $fhash, "wb"))) {
return false;
}
-
fwrite($fw, $data);
fclose ($fw);
+ $data = '';
if ($t_data) {
- @$fw = fopen($prefs['gal_use_dir'] . $fhash . '.thumb', "wb");
-
- if (!$fw) {
+ if (!($fw = fopen($prefs['gal_use_dir'] . $fhash . '.thumb', "wb"))) {
return false;
}
-
fwrite($fw, $t_data['data']);
fclose ($fw);
- $t_data = '';
+ $t_data['data'] = '';
}
-
- $data = '';
$path = $fhash;
}
@@ -876,24 +868,20 @@
$query = "select max(`imageId`) from `tiki_images` where `created`=?";
$imageId = $this->getOne($query,array((int)$this->now));
// insert data
- $query = "insert into `tiki_images_data`(`imageId`,`xsize`,`ysize`,
- `type`,`filesize`,`filetype`,`filename`,`data`)
+ $query = "insert into `tiki_images_data`(`imageId`,`xsize`,`ysize`, `type`,`filesize`,`filetype`,`filename`,`data`)
values (?,?,?,?,?,?,?,?)";
$result = $this->query($query,array((int)$imageId,(int)$xsize,(int)$ysize,'o',(int)$size,$filetype,$filename,$data));
// insert thumb
if ($t_data) {
- $query = "insert into `tiki_images_data`(`imageId`,`xsize`,`ysize`,
- `type`,`filesize`,`filetype`,`filename`,`data`)
+ $query = "insert into `tiki_images_data`(`imageId`,`xsize`,`ysize`, `type`,`filesize`,`filetype`,`filename`,`data`)
values (?,?,?,?,?,?,?,?)";
-
$result = $this->query($query,array((int)$imageId,(int)$t_data['xsize'],(int)$t_data['ysize'],'t',(int)$size,$t_type,$filename,$t_data['data']));
}
$query = "update `tiki_galleries` set `lastModif`=? where `galleryId`=?";
$result = $this->query($query,array((int)$this->now,(int)$galleryId));
- global $prefs;
if ($prefs['feature_score'] == 'y') {
$this->score_event($user, 'igallery_new_img');
}
@@ -1597,7 +1585,6 @@
and d.`type`=?
$mid";
-
$result = $this->query($query,$bindvars,1);
if ($result===false || $result===null) {
Modified: branches/experimental/perms/lib/setup/prefs.php
===================================================================
--- branches/experimental/perms/lib/setup/prefs.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/setup/prefs.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -583,6 +583,12 @@
'feature_search_fulltext' => 'y',
'feature_search_show_forbidden_obj' => 'n',
'feature_search_show_forbidden_cat' => 'n',
+ 'feature_search_show_object_filter' => 'n',
+ 'feature_search_show_search_box' => 'y',
+ 'feature_search_show_visit_count' => 'y',
+ 'feature_search_show_pertinence' => 'n',
+ 'feature_search_show_object_type' => 'y',
+ 'feature_search_show_last_modification' => 'y',
'search_refresh_index_mode' => 'normal',
'search_parsed_snippet' => 'y',
Modified: branches/experimental/perms/lib/smarty_tiki/block.self_link.php
===================================================================
--- branches/experimental/perms/lib/smarty_tiki/block.self_link.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/smarty_tiki/block.self_link.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -106,7 +106,7 @@
if ( isset($params['_menu_icon']) ) $icon_params['_menu_icon'] = $params['_menu_icon'];
if ( isset($params['_icon_class']) ) $icon_params['class'] = $params['_icon_class'];
- $content = smarty_function_icon($icon_params, $smarty);
+ $content = smarty_function_icon($icon_params, $smarty).$content;
}
$link = ( ( isset($params['_class']) && $params['_class'] != '' ) ? 'class="'.$params['_class'].'" ' : '' )
Modified: branches/experimental/perms/lib/smarty_tiki/function.icon.php
===================================================================
--- branches/experimental/perms/lib/smarty_tiki/function.icon.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/smarty_tiki/function.icon.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -48,7 +48,7 @@
$icons_basedir = $basedirs[0].'/';
}
- if ( ! eregi('^[a-z0-9_]+$', $params['_id']) ) return;
+ if ( ! eregi('^[a-z0-9_-]+$', $params['_id']) ) return;
global $prefs, $style_base, $tikidomain, $tikipath, $url_path, $base_url;
Modified: branches/experimental/perms/lib/smarty_tiki/modifier.sefurl.php
===================================================================
--- branches/experimental/perms/lib/smarty_tiki/modifier.sefurl.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/smarty_tiki/modifier.sefurl.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -36,6 +36,12 @@
} else {
return 'tiki-browse_gallery.php?galleryId='. $source . ($with_next ? '&' : '');
}
+ case 'article':
+ if ($prefs['feature_sefurl'] == 'y') {
+ return 'article'.$source . ($with_next ? '?' : '') ;
+ } else {
+ return 'tiki-read_article.php?articleId='. $source . ($with_next ? '&' : '');
+ }
}
Modified: branches/experimental/perms/lib/structures/structlib.php
===================================================================
--- branches/experimental/perms/lib/structures/structlib.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/structures/structlib.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -321,7 +321,15 @@
}
$query = "SELECT ts.`parent_id`,tuw.`email`,tuw.`user`, tuw.`event`";
$query .= " FROM `tiki_structures` ts";
- $query .= " LEFT JOIN `tiki_user_watches` tuw ON (tuw.`object`=ts.`page_ref_id` AND tuw.`event`=?)";
+ $query .= " LEFT JOIN (
+ SELECT watchId, user, event, object, title, type, url, email FROM `tiki_user_watches`
+ UNION DISTINCT
+ SELECT watchId, uu.login as user, event, object, title, type, url, uu.email
+ FROM
+ `tiki_group_watches` tgw
+ INNER JOIN users_usergroups ug ON tgw.`group` = ug.groupName
+ INNER JOIN users_users uu ON ug.userId = uu.userId AND uu.email IS NOT NULL AND uu.email <> ''
+ ) tuw ON (tuw.`object`=ts.`page_ref_id` AND tuw.`event`=?)";
if (empty($page_ref_id)) {
$query .= " LEFT JOIN `tiki_pages` tp ON ( tp.`page_id`=ts.`page_id`)";
$query .= " WHERE tp.`pageName`=?";
Modified: branches/experimental/perms/lib/tikilib.php
===================================================================
--- branches/experimental/perms/lib/tikilib.php 2009-01-10 18:54:35 UTC (rev 16232)
+++ branches/experimental/perms/lib/tikilib.php 2009-01-10 18:57:37 UTC (rev 16233)
@@ -192,12 +192,20 @@
function list_watches($offset, $maxRecords, $sort_mode, $find) {
$mid = '';
+ $mid2 = '';
$bindvars = array();
if ($find) {
$mid = ' where `event` like ? or `email` like ?';
- $bindvars = array('%'.$find.'%', '%'.$find.'%');
+ $mid2 = ' where `event` like ? or `email` like ?';
+ $bindvars = array('%'.$find.'%', '%'.$find.'%', '%'.$find.'%');
}
- $query = 'select * from `tiki_user_watches`'.$mid.' order by '.$this->convert_sortmode($sort_mode);
+ $query = "select 'user' as watchtype, watchId, `user`, event, object, title, type, url, email from `tiki_user_watches` $mid
+ UNION ALL
+ (
+ select 'group' as watchtype, watchId, `group`, event, object, title, type, url, '' as email
+ from tiki_group_watches $mid2
+ )
+ order by ".$this->convert_sortmode($sort_mode);
$query_cant = 'select count(*) from `tiki_user_watches`'.$mid;
$result = $this->query($query,$bindvars,$maxRecords,$offset);
$cant = $this->getOne($query_cant,$bindvars);
@@ -233,6 +241,11 @@
$this->query($query,array($id));
}
+ function remove_group_watch_by_id($id) {
+ $query = "delete from `tiki_group_watches` where `watchId`=?";
+ $this->query($query,array($id));
+ }
+
/*shared*/
function remove_user_watch($user, $event, $object) {
$query = "delete from `tiki_user_watches` where ".$this->convert_binary()." `user`=? and `event`=? and `object`=?";
@@ -319,88 +332,104 @@
$bindvars[] = $page['objName'];
}
$mid .= 'and ('.implode(' or ', $mids).')';
- } else if ( $prefs['feature_user_watches_translations'] == 'y'
- && $event == 'wiki_page_created' ) {
- $page_info = $this->get_page_info( $object );
- $mid = "`event`='wiki_page_in_lang_created' and `object`=? and `type`='lang'";
- $bindvars[] = $page_info['lang'];
- } else if ($event == 'forum_post_topic') {
- $mid = "(`event`=? or `event`=?) and `object`=?";
- $bindvars[] = $event;
- $bindvars[] = 'forum_post_topic_and_thread';
- $bindvars[] = $object;
- } else if ($event == 'forum_post_thread') {
- $mid = "(`event`=? and `object`=?) or ( `event`=? and `object`=?)";
- $bindvars[] = $event;
- $bindvars[] = $object;
- $bindvars[] = 'forum_post_topic_and_thread';
- $forumId = $info['forumId'];
- $bindvars[] = $forumId;
- } else {
- $mid = "`event`=? and `object`=?";
- $bindvars[] = $event;
- $bindvars[] = $object;
- }
+ } elseif ( $prefs['feature_user_watches_translations'] == 'y'
+ && $event == 'wiki_page_created' ) {
+ $page_info = $this->get_page_info( $object );
+ $mid = "`event`='wiki_page_in_lang_created' and `object`=? and `type`='lang'";
+ $bindvars[] = $page_info['lang'];
+ } elseif ($event == 'forum_post_topic') {
+ $mid = "(`event`=? or `event`=?) and `object`=?";
+ $bindvars[] = $event;
+ $bindvars[] = 'forum_post_topic_and_thread';
+ $bindvars[] = $object;
+ } elseif ($event == 'forum_post_thread') {
+ $mid = "(`event`=? and `object`=?) or ( `event`=? and `object`=?)";
+ $bindvars[] = $event;
+ $bindvars[] = $object;
+ $bindvars[] = 'forum_post_topic_and_thread';
+ $forumId = $info['forumId'];
+ $bindvars[] = $forumId;
+ } else {
+ $mid = "`event`=? and `object`=?";
+ $bindvars[] = $event;
+ $bindvars[] = $object;
+ }
+
+ // Obtain the list of watches on event/object for user watches
+ // Union obtains all users member of groups being watched
+ // Distinct union insures there are no duplicates
$query = "select tuw.*, tup1.`value` as language, tup2.`value` as mailCharset from `tiki_user_watches` tuw
left join `tiki_user_preferences` tup1 on (tup1.`user`=tuw.`user` and tup1.`prefName`='language')
left join `tiki_user_preferences` tup2 on (tup2.`user`=tuw.`user` and tup2.`prefName`='mailCharset')
- where $mid";
- $result = $this->query($query,$bindvars);
+ where $mid
+ UNION DISTINCT
+ select tgw.watchId, uu.login, tgw.event, tgw.object, tgw.title, tgw.type, tgw.url, uu.email,
+ tup1.value as language, tup2.value as mailCharset
+ from
+ tiki_group_watches tgw
+ inner join users_usergroups ug on tgw.`group` = ug.groupName
+ inner join users_users uu on ug.userId = uu.userId and uu.email is not null and uu.email <> ''
+ left join `tiki_user_preferences` tup1 on (tup1.`user`=uu.`login` and tup1.`prefName`='language')
+ left join `tiki_user_preferences` tup2 on (tup2.`user`=uu.`login` and tup2.`prefName`='mailCharset')
+ where $mid
+ ";
+ $result = $this->query($query,array_merge( $bindvars, $bindvars ));
+
if ($result->numRows()) {
while ($res = $result->fetchRow()) {
switch($event) {
- case 'wiki_page_changed':
- case 'wiki_page_created':
- $res['perm']=($this->user_has_perm_on_object($res['user'],$object,'wiki page','tiki_p_view') ||
- $this->user_has_perm_on_object($res['user'],$object,'wiki page','tiki_p_admin_wiki'));
- break;
- case 'tracker_modified':
- $res['perm'] = $this->user_has_perm_on_object($res['user'],$object,'tracker','tiki_p_view_trackers');
- break;
- case 'tracker_item_modified':
- $res['perm'] = $this->user_has_perm_on_object($res['user'],$info['trackerId'],'tracker','tiki_p_view_trackers');
- break;
- case 'blog_post':
- $res['perm']=($this->user_has_perm_on_object($res['user'],$object,'blog','tiki_p_read_blog') ||
- $this->user_has_perm_on_object($res['user'],$object,'blog','tiki_p_admin_blog'));
- break;
- case 'map_changed':
- $res['perm']=$this->user_has_perm_on_object($res['user'],$object,'map','tiki_p_map_view');
- break;
- case 'forum_post_topic':
- $res['perm']=($this->user_has_perm_on_object($res['user'],$object,'forum','tiki_p_forum_read') ||
- $this->user_has_perm_on_object($res['user'],$object,'forum','tiki_p_admin_forum'));
- break;
- case 'forum_post_thread':
- $res['perm']=($this->user_has_perm_on_object($res['user'],$forumId,'forum','tiki_p_forum_read') ||
- $this->user_has_perm_on_object($res['user'],$object,'forum','tiki_p_admin_forum'));
- break;
- case 'file_gallery_changed':
- $res['perm']=($this->user_has_perm_on_object($res['user'],$object,'file gallery','tiki_p_view_file_gallery') ||
- $this->user_has_perm_on_object($res['user'],$object,'file gallery','tiki_p_download_files'));
- break;
- case 'article_submitted':
- case 'topic_article_created':
- global $userlib, $topicId;
- $res['perm']= ($userlib->user_has_permission($res['user'],'tiki_p_read_article') &&
- ...
[truncated message content] |