...
 
Commits (157)
......@@ -82,7 +82,7 @@ db/index.php -text
db/install.ini.dist -text
db/preconfiguration.php -text
db/tiki-db.php -text
db/tiki-secdb_14.1_mysql.sql -text
db/tiki-secdb_14.4_mysql.sql -text
db/tiki.sql -text
db/tiki_1.8to1.9.sql -text
db/tiki_1.9to2.0.sql -text
......@@ -1748,6 +1748,11 @@ installer/schema/20150426_menu_item_external_wikis_restored_tiki.sql -text
installer/schema/20150508_perspectives_style_to_theme_tiki.php -text
installer/schema/20150730_menu_item_tabular_trackers_tiki.sql -text
installer/schema/20150929_make_hotwords_longer_tiki.sql -text
installer/schema/20160206_theme_option_modules_tiki.sql -text
installer/schema/20160527_menu_item_payment_tiki.sql -text
installer/schema/20160604_remove_unwanted_files_tiki.php -text
installer/schema/20160608_menu_item_admin_tokens_tiki.sql -text
installer/schema/20160627_remove_more_unwanted_files_tiki.php -text
installer/schema/999999991_decode_pages_sources_tiki.php -text
installer/schema/99999999_image_plugins_kill_tiki.php -text
installer/schema/index.php -text
......@@ -1977,6 +1982,7 @@ lib/calendar/calrecurrence.php -text
lib/calendar/index.php -text
lib/calendar/tikicalendarlib.php -text
lib/captcha/Captcha_Questions.php -text
lib/captcha/Captcha_ReCaptcha20.php -text
lib/captcha/DejaVuSansMono.ttf -text
lib/captcha/captchalib.js -text
lib/captcha/captchalib.php -text
......@@ -2227,6 +2233,8 @@ lib/core/Reports/Send/EmailBuilder/TrackerItemComment.php -text
lib/core/Reports/Send/EmailBuilder/TrackerItemModified.php -text
lib/core/Reports/Send/EmailBuilder/WikiFileAttached.php -text
lib/core/Reports/Send/EmailBuilder/WikiPageChanged.php -text
lib/core/Reports/Send/EmailBuilder/WikiPageCreated.php -text
lib/core/Reports/Send/EmailBuilder/WikiPageDeleted.php -text
lib/core/Reports/Send/EmailBuilder/index.php -text
lib/core/Reports/Send/index.php -text
lib/core/Reports/Users.php -text
......@@ -3274,6 +3282,7 @@ lib/jquery_tiki/tiki-ajax_services.js -text
lib/jquery_tiki/tiki-bootstrapmodalfix.js -text
lib/jquery_tiki/tiki-connect.js -text
lib/jquery_tiki/tiki-jquery.js -text
lib/jquery_tiki/tiki-jquery_upload.js -text
lib/jquery_tiki/tiki-maps.js -text
lib/jquery_tiki/tiki-themegenerator.js -text
lib/jquery_tiki/tiki-toolbars.js -text
......@@ -3903,6 +3912,7 @@ lib/smarty_tiki/function.favorite.php -text
lib/smarty_tiki/function.fgal_browse.php -text
lib/smarty_tiki/function.file_selector.php -text
lib/smarty_tiki/function.filegal_manager_url.php -text
lib/smarty_tiki/function.filegal_uploader.php -text
lib/smarty_tiki/function.fileinfo.php -text
lib/smarty_tiki/function.gallery.php -text
lib/smarty_tiki/function.help.php -text
......@@ -4746,6 +4756,7 @@ lib/wiki-plugins/wikiplugin_translated.php -text
lib/wiki-plugins/wikiplugin_translationof.php -text
lib/wiki-plugins/wikiplugin_twitter.php -text
lib/wiki-plugins/wikiplugin_usercount.php -text
lib/wiki-plugins/wikiplugin_useringroup.php -text
lib/wiki-plugins/wikiplugin_userlastlogged.php -text
lib/wiki-plugins/wikiplugin_userlink.php -text
lib/wiki-plugins/wikiplugin_userlist.php -text
......@@ -4758,6 +4769,7 @@ lib/wiki-plugins/wikiplugin_wantedpages.php -text
lib/wiki-plugins/wikiplugin_webdocviewer.php -text
lib/wiki-plugins/wikiplugin_webservice.php -text
lib/wiki-plugins/wikiplugin_wysiwyg.php -text
lib/wiki-plugins/wikiplugin_xmlupdate.php -text
lib/wiki-plugins/wikiplugin_youtube.php -text
lib/wiki-plugins/wikiplugin_zotero.php -text
lib/wiki-plugins/wikiplugin_zoterolist.php -text
......@@ -5257,6 +5269,7 @@ templates/fgal_context_menu.tpl -text
templates/fgal_listing_conf.tpl -text
templates/file/browse.tpl -text
templates/file/index.php -text
templates/file/jquery_upload.tpl -text
templates/file/list_gallery.tpl -text
templates/file/remote.tpl -text
templates/file/thumbnail_gallery.tpl -text
......@@ -6280,6 +6293,7 @@ templates/wiki-plugins/wikiplugin_trackerstat.tpl -text
templates/wiki-plugins/wikiplugin_trackertimeline.tpl -text
templates/wiki-plugins/wikiplugin_trade.tpl -text
templates/wiki-plugins/wikiplugin_vote.tpl -text
templates/wiki-plugins/wikiplugin_xmlupdate.tpl -text
templates/wiki/get_page.tpl -text
templates/wiki/index.php -text
templates/wiki/regenerate_slugs.tpl -text
......@@ -6700,6 +6714,7 @@ themes/fivealive-lite/options/watermelon/less/bootstrap-variables.less -text
themes/fivealive-lite/options/watermelon/less/tiki-selector-variables.less -text
themes/fivealive-lite/options/watermelon/less/watermelon.less -text
themes/fivealive-lite/templates/index.php -text
themes/fivealive/css/custom.css_example -text
themes/fivealive/css/fivealive.css -text
themes/fivealive/css/index.php -text
themes/fivealive/css/newsletter.css -text
......@@ -7820,7 +7835,6 @@ vendor_extra/elfinder/README.md -text
vendor_extra/elfinder/css/elfinder.full.css -text
vendor_extra/elfinder/css/elfinder.min.css -text
vendor_extra/elfinder/css/theme.css -text
vendor_extra/elfinder/elfinder.html -text
vendor_extra/elfinder/img/arrows-active.png -text
vendor_extra/elfinder/img/arrows-normal.png -text
vendor_extra/elfinder/img/crop.gif -text
......@@ -8237,25 +8251,7 @@ vendor_extra/pear/XML/index.php -text
vendor_extra/pear/XML_Parser/Parser.php -text
vendor_extra/pear/XML_Parser/Parser/Simple.php -text
vendor_extra/pear/XML_Parser/Parser/index.php -text
vendor_extra/pear/XML_Parser/examples/index.php -text
vendor_extra/pear/XML_Parser/examples/xml_parser_file.php -text
vendor_extra/pear/XML_Parser/examples/xml_parser_file.xml -text
vendor_extra/pear/XML_Parser/examples/xml_parser_funcmode.php -text
vendor_extra/pear/XML_Parser/examples/xml_parser_handler.php -text
vendor_extra/pear/XML_Parser/examples/xml_parser_simple1.php -text
vendor_extra/pear/XML_Parser/examples/xml_parser_simple1.xml -text
vendor_extra/pear/XML_Parser/examples/xml_parser_simple2.php -text
vendor_extra/pear/XML_Parser/examples/xml_parser_simple2.xml -text
vendor_extra/pear/XML_Parser/examples/xml_parser_simple_handler.php -text
vendor_extra/pear/XML_Parser/index.php -text
vendor_extra/pear/XML_Parser/tests/001.phpt -text
vendor_extra/pear/XML_Parser/tests/002.phpt -text
vendor_extra/pear/XML_Parser/tests/003.phpt -text
vendor_extra/pear/XML_Parser/tests/004.phpt -text
vendor_extra/pear/XML_Parser/tests/005.phpt -text
vendor_extra/pear/XML_Parser/tests/index.php -text
vendor_extra/pear/XML_Parser/tests/test2.xml -text
vendor_extra/pear/XML_Parser/tests/test3.xml -text
vendor_extra/pear/index.php -text
vendor_extra/vimeo/froogaloop.min.js -text
vendor_extra/vimeo/vimeo.js -text
......
Tiki! The wiki with a lot of features!
Version 14.1
Version 14.4
DOCUMENTATION
* The documentation for 14.1 version is ever evolving at http://doc.tiki.org.
* The documentation for 14.4 version is ever evolving at http://doc.tiki.org.
You're encouraged to contribute.
* It is highly recommended that you refer to the online documentation:
......@@ -24,7 +24,7 @@ UPGRADES
COPYRIGHT
Copyright (c) 2002-2015, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
Copyright (c) 2002-2016, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
Tiki was started under the name tikiwiki by Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
All Rights Reserved. See copyright.txt for details and a complete list of authors.
Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
......
......@@ -141,6 +141,29 @@ if (isset($_REQUEST["filegalfixvndmsfiles"])) {
$filegallib->fix_vnd_ms_files();
}
if ($prefs['fgal_viewerjs_feature'] === 'y') {
$viewerjs_err = '';
if (empty($prefs['fgal_viewerjs_uri'])) {
$viewerjs_err = tra('ViewerJS URI not set');
} else if (strpos($prefs['fgal_viewerjs_uri'], '://') === false) { // local install
if (! is_readable($prefs['fgal_viewerjs_uri'])) {
$viewerjs_err = tr('ViewerJS URI not found (local file not readable)');
}
} else { // remote (will take a while)
$file_headers = get_headers(Zend_OpenId::absoluteUrl($prefs['fgal_viewerjs_uri']));
if (strpos($file_headers[0], '200') === false) {
$viewerjs_err = tr('ViewerJS URI not found (%0)', $file_headers[0]);
}
}
$smarty->assign('viewerjs_err', $viewerjs_err);
}
if (!empty($prefs['fgal_sort_mode']) && preg_match('/(.*)_(asc|desc)/', $prefs['fgal_sort_mode'], $matches)) {
$smarty->assign('fgal_sortorder', $matches[1]);
$smarty->assign('fgal_sortdirection', $matches[2]);
......
......@@ -51,7 +51,7 @@ if (isset($_REQUEST['new_prefs'])) {
$smarty->assign('now', $tikilib->now);
if (!empty($_REQUEST['testMail'])) {
if (!empty($_REQUEST['testMail']) && key_check(null, false)) {
include_once('lib/webmail/tikimaillib.php');
$mail = new TikiMail();
$mail->setSubject(tra('Tiki Email Test'));
......
......@@ -24,7 +24,7 @@ foreach ($parserlib->plugin_get_list() as $name) {
}
}
$smarty->assign('plugins', $plugins);
if (isset($_REQUEST['textareasetup']) && (getCookie('admin_textarea', 'tabs') != 3)) {
if (isset($_REQUEST['textareasetup']) && (getCookie('admin_textarea', 'tabs') != '#contentadmin_textarea-3')) {
// tab=3 is plugins alias tab (TODO improve)
ask_ticket('admin-inc-textarea');
foreach (glob('temp/cache/wikiplugin_*') as $file) {
......@@ -79,7 +79,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if (isset($_POST['textareasetup'])
&& !in_array($_POST['plugin_alias'], $pluginsReal)
&& isset($_REQUEST['plugin_alias'])
&& (getCookie('admin_textarea', 'tabs') == 3)
&& (getCookie('admin_textarea', 'tabs') == '#contentadmin_textarea-3')
) {
// tab=3 is plugins alias tab (TODO improve)
$info = array(
......
......@@ -29,6 +29,15 @@ if ($prefs['feature_kaltura'] === 'y') {
if ($kcwDefault != $prefs['kaltura_kcwUIConf']) {
$tikilib->set_preference('kaltura_kcwUIConf', $kcwDefault);
}
if (empty($prefs['kaltura_kdpUIConf'])) { // player pref empty
$playerList = $kalturaadminlib->getPlayersUiConfs();
if ($playerList) {
$tikilib->set_preference('kaltura_kdpUIConf', $playerList[0]['id']);
}
}
if (empty($prefs['kaltura_kdpEditUIConf'])) { // edit mode player pref empty
$tikilib->set_preference('kaltura_kdpEditUIConf', $prefs['kaltura_kdpUIConf']);
}
} else {
$kcwText = "<div class='adminoptionbox error'>Unable to retrieve configuration from Kaltura. Please reload page after setting up the Kaltura Partner Settings section</div>";
$kplayerlist = "<div class='adminoptionbox error'>Unable to retrieve list of valid player IDs. Please reload page after setting up the Kaltura Partner Settings section</div>";
......
This diff is collapsed.
This diff is collapsed.
......@@ -12,9 +12,9 @@ This is how we implement the Tiki Social Contract.
http://tiki.org/Social+Contract
List of members of the Community
As of 2015-11-26, the community has:
* 596 members on SourceForge.net,
* 311 of those people who made at least one code commit
As of 2016-07-06, the community has:
* 603 members on SourceForge.net,
* 319 of those people who made at least one code commit
This list is automatically generated and alphabetically sorted
from subversion repository by the following script:
......@@ -54,6 +54,9 @@ SF Role: Developer
Nickname: aholmes99
Name: Aaron Holmes
First Commit: 2015-12-22
Last Commit: 2016-05-12
Number of Commits: 9
SF Role: Developer
Nickname: aigarius
......@@ -112,11 +115,25 @@ Nickname: alrahal
Name: Alessandro
SF Role: Developer
Nickname: ameoba32
Name: Constantin Bosneaga
First Commit: 2015-12-03
Last Commit: 2016-03-27
Number of Commits: 29
SF Role: Developer
Nickname: amette
Name: Alexander Mette
First Commit: 2005-05-19
Last Commit: 2015-09-29
Number of Commits: 228
Last Commit: 2016-02-28
Number of Commits: 253
SF Role: Developer
Nickname: amnabilal
Name: Amna Bilal
First Commit: 2016-05-19
Last Commit: 2016-07-02
Number of Commits: 25
SF Role: Developer
Nickname: amotl
......@@ -191,8 +208,8 @@ SF Role: Developer
Nickname: arildb
First Commit: 2011-09-04
Last Commit: 2015-11-24
Number of Commits: 1004
Last Commit: 2015-12-02
Number of Commits: 1006
SF Role: Developer
Nickname: arion92fr
......@@ -473,17 +490,15 @@ Name: Chandi Bernier
SF Role: Developer
Nickname: changi67
Name: Jean-François B.
First Commit: 2009-04-23
Last Commit: 2013-12-20
Number of Commits: 1631
SF Role: Admin
Nickname: chealer
Name: Philippe Cloutier
First Commit: 2003-09-27
Last Commit: 2015-11-10
Number of Commits: 1846
Last Commit: 2016-06-15
Number of Commits: 1847
SF Role: Developer
Nickname: chessy
......@@ -493,8 +508,8 @@ SF Role: Developer
Nickname: chibaguy
Name: Gary Cunningham-Lee
First Commit: 2006-02-04
Last Commit: 2015-11-12
Number of Commits: 2893
Last Commit: 2016-07-06
Number of Commits: 3124
SF Role: Admin
Nickname: chris_holman
......@@ -639,6 +654,13 @@ First Commit: 2004-08-27
Last Commit: 2004-08-27
Number of Commits: 1
Nickname: derceto125
Name: Kálmán Tamás
First Commit: 2016-04-18
Last Commit: 2016-04-18
Number of Commits: 2
SF Role: Developer
Nickname: derisavi
Name: Salem Derisavi
SF Role: Developer
......@@ -714,6 +736,13 @@ Nickname: dlech27
Name: David Lechner
SF Role: Developer
Nickname: dlucio
Name: Luis Daniel Lucio Quiroz
First Commit: 2016-02-23
Last Commit: 2016-05-27
Number of Commits: 77
SF Role: Developer
Nickname: dmytro
Name: Dmytro Kovalov
SF Role: Developer
......@@ -735,8 +764,8 @@ SF Role: Developer
Nickname: drsassafras
Name: Dr. Sassafras
First Commit: 2014-04-03
Last Commit: 2015-11-25
Number of Commits: 4
Last Commit: 2016-07-03
Number of Commits: 24
SF Role: Developer
Nickname: duebel
......@@ -816,8 +845,8 @@ SF Role: Developer
Nickname: eromneg
First Commit: 2009-06-07
Last Commit: 2015-08-03
Number of Commits: 252
Last Commit: 2016-05-29
Number of Commits: 356
SF Role: Developer
Nickname: essele
......@@ -984,6 +1013,10 @@ Last Commit: 2015-06-16
Number of Commits: 4
SF Role: Developer
Nickname: fvtorres
Name: Fernando Vergos Torres
SF Role: Developer
Nickname: garem
Name: Alain Gaeremynck
SF Role: Developer
......@@ -1025,12 +1058,12 @@ SF Role: Developer
Nickname: gezzzan
Name: gezza
First Commit: 2009-05-02
Last Commit: 2015-11-17
Number of Commits: 461
SF Role: Developer
Last Commit: 2016-04-15
Number of Commits: 543
SF Role: Admin, Developer
Nickname: ggd
Name: Gour
Name: Saša Janiška
SF Role: Developer
Nickname: ggeller
......@@ -1431,8 +1464,8 @@ SF Role: Developer
Nickname: jonnybradley
Name: jonny Bradley
First Commit: 2007-08-15
Last Commit: 2015-11-26
Number of Commits: 8400
Last Commit: 2016-07-06
Number of Commits: 9309
SF Role: Admin
Nickname: jorgercosta
......@@ -1518,8 +1551,8 @@ SF Role: Developer
Nickname: jyhem
Name: Jean-Marc Libs
First Commit: 2006-12-11
Last Commit: 2015-11-26
Number of Commits: 1062
Last Commit: 2016-06-20
Number of Commits: 1156
SF Role: Admin
Nickname: k2s
......@@ -1691,10 +1724,10 @@ Name: Lee Wilson (aka stella12)
SF Role: Developer
Nickname: lindonb
Name: Lindon Barnfield
Name: lindon
First Commit: 2009-05-10
Last Commit: 2015-11-26
Number of Commits: 1804
Last Commit: 2016-07-06
Number of Commits: 1982
SF Role: Developer
Nickname: llunax
......@@ -1732,11 +1765,9 @@ Number of Commits: 4333
SF Role: Developer
Nickname: lrargerich
Name: Luis Argerich
First Commit: 2002-10-08
Last Commit: 2003-11-28
Number of Commits: 399
SF Role: Admin
Nickname: lrrcenter
Name: LRRC
......@@ -1771,8 +1802,8 @@ SF Role: Developer
Nickname: luciash
Name: luciash d&#39; being
First Commit: 2003-08-05
Last Commit: 2015-11-23
Number of Commits: 1377
Last Commit: 2016-07-04
Number of Commits: 1415
SF Role: Admin
Nickname: lueders
......@@ -1915,6 +1946,13 @@ SF Role: Developer
Nickname: mastre
SF Role: Developer
Nickname: mathchartier
Name: mathieu chartier
First Commit: 2015-11-27
Last Commit: 2015-11-27
Number of Commits: 1
SF Role: Developer
Nickname: mathieu-rodic
Name: Mathieu Rodic
SF Role: Developer
......@@ -2083,7 +2121,6 @@ Nickname: mose
First Commit: 2003-06-12
Last Commit: 2008-03-22
Number of Commits: 1954
SF Role: Admin
Nickname: mrbuiu
Name: Renato da Silva Pereira
......@@ -2153,7 +2190,7 @@ Name: Nathan Waterhouse
SF Role: Developer
Nickname: neidhart
Name: Dietmar Neidhart
Name: Neidhart
SF Role: Developer
Nickname: nhuffschmid
......@@ -2198,8 +2235,8 @@ SF Role: Developer
Nickname: nkoth
Name: Nelson
First Commit: 2007-05-17
Last Commit: 2015-11-25
Number of Commits: 2020
Last Commit: 2016-06-30
Number of Commits: 2129
SF Role: Admin
Nickname: normandaoust
......@@ -2221,11 +2258,9 @@ Number of Commits: 16
SF Role: Developer
Nickname: nyloth
Name: Patrice W.
First Commit: 2006-11-09
Last Commit: 2011-07-14
Number of Commits: 1929
SF Role: Admin
Nickname: obnoxxx
Name: Michael Adam
......@@ -2248,8 +2283,8 @@ SF Role: Developer
Nickname: ohertel
Name: Oliver Hertel
First Commit: 2003-03-16
Last Commit: 2013-06-14
Number of Commits: 395
Last Commit: 2016-06-26
Number of Commits: 401
SF Role: Admin
Nickname: oldelvet
......@@ -2262,6 +2297,9 @@ SF Role: Developer
Nickname: olinuxx
Name: Olivier HUMBERT
First Commit: 2016-03-03
Last Commit: 2016-05-28
Number of Commits: 15
SF Role: Developer
Nickname: oliverscheck
......@@ -2327,8 +2365,8 @@ SF Role: Developer
Nickname: patrick-proulx
Name: Patrick Proulx
First Commit: 2013-07-14
Last Commit: 2015-11-19
Number of Commits: 115
Last Commit: 2016-07-05
Number of Commits: 216
SF Role: Developer
Nickname: patrickallard
......@@ -2417,7 +2455,6 @@ Nickname: pkdille
First Commit: 2007-03-14
Last Commit: 2013-07-04
Number of Commits: 1911
SF Role: Admin
Nickname: plillevold
Name: Peter Lillevold
......@@ -2446,6 +2483,13 @@ Nickname: polatouche
Name: Antoine Polatouche
SF Role: Developer
Nickname: pom2ter
Name: Benoit Roy
First Commit: 2016-01-20
Last Commit: 2016-05-06
Number of Commits: 15
SF Role: Developer
Nickname: popovich
Name: Peter Popovich
First Commit: 2004-06-10
......@@ -2534,11 +2578,9 @@ Name: Rick Cogley
SF Role: Developer
Nickname: redflo
Name: Florian Gleixner
First Commit: 2003-03-04
Last Commit: 2014-09-19
Number of Commits: 345
SF Role: Admin
Nickname: reiknir
Name: Olafur Gunnlaugsson
......@@ -2587,8 +2629,8 @@ SF Role: Developer
Nickname: rjsmelo
Name: Ricardo Melo
First Commit: 2015-10-08
Last Commit: 2015-11-21
Number of Commits: 18
Last Commit: 2016-06-08
Number of Commits: 54
SF Role: Developer
Nickname: rleibman
......@@ -2614,8 +2656,8 @@ SF Role: Developer
Nickname: robertplummer
Name: Robert Plummer
First Commit: 2010-06-30
Last Commit: 2015-04-08
Number of Commits: 1833
Last Commit: 2016-01-26
Number of Commits: 1834
SF Role: Developer
Nickname: robferguson
......@@ -2715,11 +2757,9 @@ Number of Commits: 3
SF Role: Developer
Nickname: sampaioprimo
Name: Rodrigo Sampaio Primo
First Commit: 2005-10-17
Last Commit: 2015-10-27
Number of Commits: 1160
SF Role: Admin
Last Commit: 2015-12-28
Number of Commits: 1161
Nickname: scarle
Name: Sylvain Carle
......@@ -2891,11 +2931,9 @@ Number of Commits: 1
SF Role: Developer
Nickname: sylvieg
Name: Sylvie Greverend
First Commit: 2003-05-28
Last Commit: 2013-11-03
Number of Commits: 7141
SF Role: Admin
Nickname: syracine
Name: S Racine
......@@ -3055,8 +3093,8 @@ SF Role: Developer
Nickname: uxeric
First Commit: 2015-08-17
Last Commit: 2015-09-23
Number of Commits: 16
Last Commit: 2016-02-01
Number of Commits: 17
SF Role: Developer
Nickname: v-woods
......@@ -3122,11 +3160,9 @@ Number of Commits: 3
SF Role: Developer
Nickname: wings-of-glory
Name: A. Zargamy
First Commit: 2008-09-07
Last Commit: 2008-09-18
Number of Commits: 3
SF Role: Developer
Nickname: wolff_borg
First Commit: 2003-08-07
......@@ -3147,8 +3183,8 @@ SF Role: Developer
Nickname: xavidp
Name: Xavier de Pedro
First Commit: 2005-07-08
Last Commit: 2015-10-26
Number of Commits: 1723
Last Commit: 2016-07-06
Number of Commits: 1851
SF Role: Admin
Nickname: xbtheria
......@@ -3184,9 +3220,9 @@ SF Role: Developer
Nickname: yonixxx
Name: Bernard Sfez
First Commit: 2008-02-25
Last Commit: 2015-11-10
Number of Commits: 162
SF Role: Developer
Last Commit: 2016-07-05
Number of Commits: 236
SF Role: Admin, Developer
Nickname: ysoya
Name: YongHa Kim
......
......@@ -1323,6 +1323,8 @@ INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `s
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Calendar','tiki-calendar.php',35,'feature_calendar','tiki_p_view_calendar','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Users Map','tiki-gmap_usermap.php',36,'feature_gmap','','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Tiki Calendar','tiki-action_calendar.php',37,'feature_action_calendar','tiki_p_view_tiki_calendar','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Payments','tiki-payment.php',39,'payment_feature','tiki_p_payment_view','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Payments','tiki-payment.php',39,'payment_feature','tiki_p_payment_request','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','(debug)','javascript:toggle(\'debugconsole\')',40,'feature_debug_console','tiki_p_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','User Wizard','tiki-wizard_user.php',45,'feature_wizard_user','','Registered',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','My Account','tiki-my_tiki.php',50,'feature_mytiki','','Registered',0);
......@@ -1469,6 +1471,7 @@ INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `s
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Mail Notifications','tiki-admin_notifications.php',1120,'','tiki_p_admin_notifications','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Search Stats','tiki-search_stats.php',1125,'feature_search_stats','tiki_p_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Theme Control','tiki-theme_control.php',1130,'feature_theme_control','tiki_p_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Tokens','tiki-admin_tokens.php',1132,'auth_token_access','tiki_p_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Toolbars','tiki-admin_toolbars.php',1135,'','tiki_p_admin_toolbars','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Transitions','tiki-admin_transitions.php',1140,'','tiki_p_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Categories','tiki-admin_categories.php',1145,'feature_categories','tiki_p_admin_categories','',0);
......
......@@ -35,6 +35,7 @@ if [ ! -d 'db' ]; then
exit 0
fi
find db/ -name local.php -follow | sed -nr 's/db(\/([a-z0-9_-]+))?\/local\.php/\2/p' | awk '{system("'$PHP' installer/shell.php " $0)}'
# Update old command 'installer/shell.php' to the newer one 'console.php d:u --site='
find db/ -name local.php -follow | sed -nr 's/db(\/([a-z0-9_-.]+))?\/local\.php/\2/p' | awk '{system("'$PHP' console.php -n database:update --site=" $0)}'
exit 0
UPDATE `tiki_modules` SET `params` = REPLACE(`params`, '.css', '');
INSERT IGNORE INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`)
VALUES (42,'o','Payments','tiki-payment.php',39,'payment_feature','tiki_p_payment_view','',0);
INSERT IGNORE INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`)
VALUES (42,'o','Payments','tiki-payment.php',39,'payment_feature','tiki_p_payment_request','',0);
<?php
// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id: 20150508_perspectives_style_to_theme_tiki.php 57954 2016-03-17 19:34:29Z jyhem $
if (strpos($_SERVER["SCRIPT_NAME"], basename(__FILE__)) !== false) {
header("location: index.php");
exit;
}
/**
* @param $installer
*/
function upgrade_20160604_remove_unwanted_files_tiki($installer)
{
$files = array(
'vendo/player/mp3/template_default/compileTemplateDefault.bat',
'vendor/player/mp3/template_default/compileTemplateDefault.sh',
'vendor/player/mp3/template_default/TemplateDefault.as',
'vendor/player/mp3/template_default/test.mp3',
'vendor/player/flv/flv_stream.php',
'vendor/player/flv/template_default/compileTemplateDefault.bat',
'vendor/player/flv/template_default/compileTemplateDefault.sh',
'vendor/player/flv/template_default/rorobong.jpg',
'vendor/player/flv/template_default/TemplateDefault.as',
'vendor/jcapture-applet/jcapture-applet/applet.php',
);
foreach ($files as $file) {
if (is_writable($file)) {
unlink($file);
}
}
}
INSERT IGNORE INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`)
VALUES (42,'o','Tokens','tiki-admin_tokens.php',1132,'auth_token_access','tiki_p_admin','',0);
<?php
// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id: 20150508_perspectives_style_to_theme_tiki.php 57954 2016-03-17 19:34:29Z jyhem $
if (strpos($_SERVER["SCRIPT_NAME"], basename(__FILE__)) !== false) {
header("location: index.php");
exit;
}
/**
* @param $installer
*/
function upgrade_20160627_remove_more_unwanted_files_tiki($installer)
{
$files = array(
'vendor/player/mp3/template_default/compileTemplateDefault.bat',
'vendor/blueimp/javascript-load-image/js/demo.js',
'vendor/blueimp/javascript-load-image/css/demo.css',
'vendor/Sam152/Javascript-Equal-Height-Responsive-Rows/demo.html',
'vendor/jquery/jtrack/demo.html',
'vendor_extra/elfinder/elfinder.html',
'vendor/blueimp/jquery-file-upload/css/demo-ie8.css',
'vendor/blueimp/jquery-file-upload/css/demo.css',
'vendor/blueimp/jquery-file-upload/angularjs.html',
'vendor/blueimp/jquery-file-upload/basic.html',
'vendor/blueimp/jquery-file-upload/basic-plus.html',
'vendor/blueimp/jquery-file-upload/index.html',
'vendor/blueimp/jquery-file-upload/jquery-ui.html',
'vendor/svg-edit/svg-edit/embedapi.html',
'vendor/svg-edit/svg-edit/extensions/imagelib/index.html',
'vendor/svg-edit/svg-edit/browser-not-supported.html',
);
$folders = array(
'vendor/codemirror/codemirror/doc',
'vendor/phpcas/phpcas/CAS-1.3.3/docs',
'vendor/zendframework/zend-json/doc',
'vendor/fortawesome/font-awesome/src/_includes/examples',
'vendor/fortawesome/font-awesome/src/3.2.1/examples',
'vendor/tijsverkoyen/css-to-inline-styles/TijsVerkoyen/CssToInlineStyles/tests/examples',
'vendor/phpcas/phpcas/CAS-1.3.3/docs/examples',
'vendor/fortawesome/font-awesome/src/_includes/tests',
'vendor/tijsverkoyen/css-to-inline-styles/TijsVerkoyen/CssToInlineStyles/tests',
'vendor/twitter/bootstrap/js/tests',
'vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests',
'vendor/symfony/console/Symfony/Component/Console/Tests',
'vendor/symfony/config/Symfony/Component/Config/Tests',
'vendor/symfony/filesystem/Tests',
'vendor_extra/pear/XML_Parser/examples',
'vendor_extra/pear/XML_Parser/tests',
'vendor_extra/elfinder/files',
'vendor/blueimp/jquery-file-upload/cors',
'vendor/blueimp/jquery-file-upload/server',
'vendor/phpcas/phpcas/CAS-1.3.3/docs',
'vendor/jquery/plugins/jquery-json/test',
);
foreach ($files as $file) {
if (is_writable($file)) {
unlink($file);
}
}
foreach ($folders as $folder) {
if (is_writable($folder)) {
delTree($folder);
}
}
}
function delTree($dir)
{
$files = array_diff(scandir($dir), array('.', '..'));
foreach ($files as $file) {
$path = "$dir/$file";
if ((is_dir($path) && !is_link($dir))) {
delTree($path);
} else {
unlink($path);
}
}
return rmdir($dir);
}
......@@ -24,7 +24,7 @@ $inputConfiguration = array(
'db' => 'alpha',
'dbinfo' => 'alpha',
'email_test_cc' => 'digits',
// 'email_test_to' => '', //validated later
'email_test_to' => 'email',
'error_reporting_adminonly' => 'alpha',
'error_reporting_level' => 'int',
'feature_switch_ssl_mode' => 'alpha',
......@@ -33,7 +33,7 @@ $inputConfiguration = array(
'fix_double_encoding' => 'xss',
'force_utf8' => 'alpha',
'general_settings' => 'alpha',
// 'host' => '', //validated later
'host' => 'text',
'https_login' => 'word',
'https_port' => 'digits',
'install_step' => 'digits',
......@@ -41,15 +41,15 @@ $inputConfiguration = array(
'lang' => 'lang',
'log_tpl' => 'alpha',
'multi' => 'striptags',
// 'name' => '', //validated later
// 'pass' => '', //validated later
'name' => 'text',
'pass' => 'text',
'perform_mail_test' => 'alpha',
'previous_encoding' => 'word',
'reset' => 'alpha',
'resetdb' => 'alpha',
'scratch' => 'word',
'sender_email' => 'striptags',
// 'setdbversion' => '', //not used as input
'setdbversion' => 'text',
'smarty_notice_reporting' => 'alpha',
'test' => 'alnum',
'test2' => 'digits',
......@@ -57,7 +57,7 @@ $inputConfiguration = array(
'test4' => 'word',
'update' => 'word',
'useInnoDB' => 'digits',
// 'user' => '', //validated later
'user' => 'text',
// 'validPatches' => '', //paramterized in sql
)
)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -44,6 +44,7 @@ lang = {
"To My Location" : "Localiser ma position",
"StreetView is not available at this specific point on the map. Zoom in as needed and make sure to click on a blue line." : "La fonction StreetView n'est pas disponible à cet endroit précis sur la carte. Approchez votre zoom au besoin et assurez-vous de cliquer sur une ligne bleue.",
"Browse Files" : "Parcourir la liste des fichiers",
"Page only allowed once in a structure" : "Page autorisée une seule fois dans une structure",
// remember the IE does not support ending comma on last item
"Bogus entry" : "bogus entry"
};
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<?php
// (c) Copyright 2002-2015 by authors of the Tiki Wiki CMS Groupware Project
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
class Captcha_ReCaptcha20 extends Zend_Captcha_ReCaptcha
{
protected $_RESPONSE = 'g-recaptcha-response';
/**
* Validate captcha
*
* @see Zend_Validate_Interface::isValid()
* @param mixed $value
* @param array|null $context
* @return boolean
*/
public function isValid($value, $context = null)
{
if (!is_array($value) && !is_array($context)) {
$this->error(self::MISSING_VALUE);
return false;
}
if (empty($value[$this->_RESPONSE])) {
$this->_error(self::MISSING_VALUE);
return false;
}
// Google request was cached
if (in_array($value[$this->_RESPONSE], $_SESSION['recaptcha_cache'])) {
return true;
}
//set POST variables
$url = 'https://www.google.com/recaptcha/api/siteverify';
$fields = array(
'secret' => urlencode($this->getPrivkey()),
'response' => urlencode($value[$this->_RESPONSE]),
'remoteip' => urlencode($_SERVER['REMOTE_ADDR']),
);
$fields_string = '';
foreach ($fields as $k => $v) {
$fields_string .= $k . '=' . $v . '&';
}
rtrim($fields_string, '&');
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$result = @json_decode(curl_exec($ch), true);
if (!is_array($result)) {
$this->_error(self::ERR_CAPTCHA);
return false;
}