...
 
Commits (877)

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

This diff is collapsed.
Tiki! The wiki with a lot of features!
Version 12.1
Version 12.13
DOCUMENTATION
* The documentation for 12.1 version is ever evolving at http://doc.tiki.org.
* The documentation for 12.13 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-2014, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
Copyright (c) 2002-2018, 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.
......
......@@ -49,8 +49,17 @@
#DirectoryIndex tiki-index.php index.php
</IfModule>
<IfModule deflate_module>
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript application/javascript
# Note in some distributions of Apache (e.g. Wampserver 2.5) you may also need to enable mod_filter as well as mod_deflate for this to work
<IfModule mod_deflate.c>
<IfModule mod_headers.c>
# Make sure proxies don't deliver the wrong content
Header append Vary User-Agent env=!dont-vary
</IfModule>
AddOutputFilterByType DEFLATE text/css text/x-component application/x-javascript application/javascript text/javascript text/x-js text/html text/richtext image/svg+xml text/plain text/xsd text/xsl text/xml image/x-icon application/json
<IfModule mod_mime.c>
# DEFLATE by extension
AddOutputFilter DEFLATE js css htm html xml
</IfModule>
</IfModule>
# Persistent connections: Allow multiple requests to be sent over
......@@ -78,7 +87,15 @@ FileETag none
#AuthType Basic
#AuthName "Restricted Access"
#AuthUserFile /etc/httpd/passwords
#Require valid-user
#Require valid-user
#
# ...or if you want to only restrict access to GET requests then use "Limit" like this
# (allows jcapture and other services that POST back to Tiki to work but will be less secure)
#
#<Limit GET>
# Require valid-user
#</Limit>
# Handling in Tiki errors caught by Apache
# Tiki can catch some errors and deal with them by redirecting to a similar page, sending you to the search, etc. However, some errors do not reach Tiki and are only caught by Apache (ex.: filenameThatDoesntExist.php).
......@@ -119,6 +136,12 @@ FileETag none
# some features like assigning perms to a group with a name containing a quote will not work without this
#php_flag magic_quotes_gpc off
# Set a timezone (needed for dates and times to work properly in PHP)
# php_value date.timezone "America/New_York"
# Set a character set
#php_value default_charset utf-8
<IfModule mod_rewrite.c>
RewriteEngine On
......
......@@ -63,3 +63,5 @@ if ($prefs['connect_server_mode'] === 'y') {
$smarty->assign('connect_stats', null);
$smarty->assign('connect_recent', null);
}
$smarty->assign('jitsi_url', Services_Suite_Controller::getJitsiUrl());
......@@ -136,6 +136,29 @@ if (isset($_REQUEST["filegalhandlers"])) {
if (isset($_REQUEST["filegalredosearch"])) {
$filegallib->reindex_all_files_for_search_text();
}
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'));
......
......@@ -29,14 +29,9 @@ $smarty->assign('opcode_stats', $opcode_stats);
$txtUsed = tr('Used');
$txtAvailable = tr('Available');
if ($opcode_cache == 'WinCache') {
// Somehow WinCache seems to flip the representations
$txtAvailable = tr('Used');
$txtUsed = tr('Available');
}
$smarty->assign(
'memory_graph',
$tikilib->httpScheme() . '://chart.apis.google.com/chart?' . http_build_query(
$tikilib->httpScheme() . '://chart.googleapis.com/chart?' . http_build_query(
array(
'cht' => 'p3',
'chs' => '250x100',
......@@ -51,14 +46,9 @@ $smarty->assign(
$txtHit = tr('Hit');
$txtMiss = tr('Miss');
if ($opcode_cache == 'WinCache') {
// Somehow WinCache seems to flip the representations
$txtHit = tr('Miss');
$txtMiss = tr('Hit');
}
$smarty->assign(
'hits_graph',
$tikilib->httpScheme() . '://chart.apis.google.com/chart?' . http_build_query(
$tikilib->httpScheme() . '://chart.googleapis.com/chart?' . http_build_query(
array(
'cht' => 'p3',
'chs' => '250x100',
......
......@@ -95,6 +95,8 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
// wrap in CODE tags if none there
$test_source = "{CODE(caption=>YAML)}\n$test_source\n{CODE}";
}
// desanitize the input, prefs etc will filter as required in the profile installer
$test_source = str_replace('<x>', '', $test_source);
$smarty->assign('test_source', $test_source);
$smarty->assign('profile_tester_name', $_POST['profile_tester_name']);
......
<?php
// (c) Copyright 2002-2013 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$
......@@ -14,4 +14,9 @@ if (isset($_REQUEST["security"])) {
check_ticket('admin-inc-security');
}
if (!extension_loaded('mcrypt')) {
global $smarty;
$smarty->assign('no_mcrypt', 'y');
}
ask_ticket('admin-inc-security');
......@@ -72,7 +72,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if (!is_array($_POST['enabled'])) {
$_POST['enabled'] = array();
}
foreach ($pluginsAlias as $name) {
foreach ($_POST['enabled'] as $name) {
WikiPlugin_Negotiator_Wiki_Alias::delete($name);
}
$pluginsAlias = WikiPlugin_Negotiator_Wiki_Alias::getList();
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -218,7 +218,7 @@ global $tiki_p_admin_comments;
if ($tiki_p_admin_forum == 'y') {
if (isset($_REQUEST["comments_remove"]) && isset($_REQUEST["comments_threadId"])) {
$access->check_authenticity();
$access->check_authenticity(tra('Are you sure you want to remove that post?'));
$comments_show = 'y';
$commentslib->remove_comment($_REQUEST["comments_threadId"]);
$_REQUEST["comments_threadId"] = 0;
......
......@@ -7,16 +7,17 @@
"require": {
"adodb/adodb": "5.18",
"aFarkas/html5shiv": "3.6.2",
"bombayworks/zendframework1": "1.12.3",
"ckeditor/ckeditor": "4.2.3",
"ckeditor/ckeditor/skins/kama": "4.2.3",
"ckeditor/ckeditor/plugins/divarea": "4.2.3",
"bombayworks/zendframework1": "1.12.20",
"ckeditor/ckeditor": "4.3.4",
"ckeditor/ckeditor/skins/kama": "4.3.4",
"ckeditor/ckeditor/plugins/divarea": "4.3.4",
"codemirror/codemirror": "3.19",
"dompdf/dompdf": "0.6.2",
"ezyang/htmlpurifier": "4.6.0",
"jcapture-applet/jcapture-applet": "dev-master",
"jquery/jquery": "1.10.2",
"jquery/jquery-min": "1.10.2",
"jquery/jquery-s5": "dev-master",
"jquery/jquery-s5": "1.0.1",
"jquery/jquery-sheet": "2.0.1",
"jquery/jquery-ui": "1.10.3",
"jquery/jquery-mobile": "1.3.2",
......@@ -99,7 +100,7 @@
"lib/TikiWebdav/",
"lib/rating/formula/",
"lib/core/StandardAnalyzer/",
"vendor/smarty/smarty/distribution/libs/sysplugins/smarty_security.php",
"vendor/smarty/smarty/libs/sysplugins/smarty_security.php",
"vendor/adodb/adodb/",
"vendor/phpcas/phpcas/",
"installer/",
......
This diff is collapsed.
......@@ -70,16 +70,20 @@ if ($isInstalled) {
if ($isInstalled && ! $installer->requiresUpdate()) {
require_once 'tiki-setup.php';
$console->add(new Tiki\Command\DailyReportSendCommand);
$console->add(new Tiki\Command\IndexRebuildCommand);
$console->add(new Tiki\Command\IndexOptimizeCommand);
$console->add(new Tiki\Command\IndexCatchUpCommand);
$console->add(new Tiki\Command\MailQueueSendCommand);
$console->add(new Tiki\Command\ProfileForgetCommand);
$console->add(new Tiki\Command\ProfileInstallCommand);
$console->add(new Tiki\Command\ProfileExport\Init);
} else {
$console->add(new Tiki\Command\UnavailableCommand('daily-report:send'));
$console->add(new Tiki\Command\UnavailableCommand('index:rebuild'));
$console->add(new Tiki\Command\UnavailableCommand('index:optimize'));
$console->add(new Tiki\Command\UnavailableCommand('index:catch-up'));
$console->add(new Tiki\Command\UnavailableCommand('mail-queue:send'));
$console->add(new Tiki\Command\UnavailableCommand('profile:forget'));
$console->add(new Tiki\Command\UnavailableCommand('profile:apply'));
$console->add(new Tiki\Command\UnavailableCommand('profile:export:init'));
......
......@@ -51,6 +51,10 @@ if ($prefs['feature_contribution'] == 'y') {
if ($prefs['feature_contributor_wiki'] == 'y' && !empty($section) && $section == 'wiki page') {
$users = $userlib->list_all_users();
include_once('lib/smarty_tiki/modifier.username.php');
$users = array_map('smarty_modifier_username', $users);
$smarty->assign_by_ref('users', $users);
if (!empty($_REQUEST['contributors'])) {
$smarty->assign_by_ref('contributors', $_REQUEST['contributors']);
......
This diff is collapsed.
......@@ -358,7 +358,7 @@
}
.calnavigation a {
padding: 0 10px 4px 10px;
padding: 0 4px 4px;
line-height: 11px;
}
......@@ -465,7 +465,7 @@ a.viewmodeoff img {
#filtercal {
background: #FFF;
position: absolute;
z-index: 2 !important;
z-index: 9 !important;
border: 1px solid #000;
right: 190px;
}
......
......@@ -22,7 +22,7 @@ if (!empty($_REQUEST['lang'])) {
include_once('lib/init/tra.php');
$local_php = TikiInit::getCredentialsFile();
global $default_api_tiki, $api_tiki, $db_tiki, $dbversion_tiki, $host_tiki, $user_tiki, $pass_tiki, $dbs_tiki, $tikidomain, $tikidomainslash;
global $default_api_tiki, $api_tiki, $db_tiki, $dbversion_tiki, $host_tiki, $user_tiki, $pass_tiki, $dbs_tiki, $tikidomain, $tikidomainslash, $dbfail_url;
$re = false;
if ( file_exists($local_php) ) {
$re = include($local_php);
......@@ -105,7 +105,11 @@ if (isset ($system_configuration_file)) {
if ( $re === false ) {
if (! defined('TIKI_IN_INSTALLER')) {
header('location: tiki-install.php');
if(!empty($dbfail_url)) {
header('location: '.$dbfail_url);
} else {
header('location: tiki-install.php');
}
exit;
} else {
// we are in the installer don't redirect...
......@@ -220,7 +224,11 @@ $initializer->setInitializeCallback(
$db = $initializer->getConnection($credentials['primary']);
if (! $db && ! defined('TIKI_IN_INSTALLER')) {
header('location: tiki-install.php');
if(!empty($dbfail_url)) {
header('location: '.$dbfail_url);
} else {
header('location: tiki-install.php');
}
exit;
} elseif ($db) {
TikiDb::set($db);
......
This diff is collapsed.
......@@ -916,6 +916,7 @@ CREATE TABLE `tiki_forums` (
`inbound_pop_password` varchar(80) default NULL,
`topic_smileys` char(1) default NULL,
`ui_avatar` char(1) default NULL,
`ui_rating_choice_topic` char(1) default NULL,
`ui_flag` char(1) default NULL,
`ui_posts` char(1) default NULL,
`ui_email` char(1) default NULL,
......@@ -1061,7 +1062,7 @@ CREATE TABLE `tiki_history` (
DROP TABLE IF EXISTS `tiki_hotwords`;
CREATE TABLE `tiki_hotwords` (
`word` varchar(40) NOT NULL default '',
`word` varchar(255) NOT NULL default '',
`url` varchar(255) NOT NULL default '',
PRIMARY KEY (`word`)
) ENGINE=MyISAM;
......@@ -1323,6 +1324,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','MyTiki','tiki-my_tiki.php',50,'feature_mytiki','','Registered',0);
......@@ -1462,11 +1465,13 @@ 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','Hotwords','tiki-admin_hotwords.php',1095,'feature_hotwords','tiki_p_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Edit languages','tiki-edit_languages.php',1098,'lang_use_db','tiki_p_edit_languages','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','External Feeds','tiki-admin_rssmodules.php',1100,'','tiki_p_admin_rssmodules','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','External Wikis','tiki-admin_external_wikis.php',1102,'','tiki_p_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Menus','tiki-admin_menus.php',1105,'','tiki_p_edit_menu','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Polls','tiki-admin_polls.php',1110,'feature_polls','tiki_p_admin_polls','',0);
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);
......@@ -3035,7 +3040,7 @@ CREATE TABLE `tiki_profile_symbols` (
`profile` VARCHAR(100) NOT NULL,
`object` VARCHAR(150) NOT NULL,
`type` VARCHAR(20) NOT NULL,
`value` VARCHAR(50) NOT NULL,
`value` VARCHAR(160) NOT NULL,
`named` ENUM('y','n') NOT NULL,
`creation_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY ( `domain`, `profile`, `object` ),
......@@ -3354,6 +3359,7 @@ CREATE TABLE `tiki_payment_requests` (
`currency` CHAR(3) NOT NULL,
`request_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
`due_date` TIMESTAMP NOT NULL,
`authorized_until` TIMESTAMP NULL,
`cancel_date` TIMESTAMP NULL,
`description` VARCHAR(100) NOT NULL,
`actions` TEXT,
......@@ -3369,6 +3375,7 @@ CREATE TABLE `tiki_payment_received` (
`payment_date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
`amount` DECIMAL(7,2),
`type` VARCHAR(15),
`status` VARCHAR(15) NOT NULL DEFAULT 'paid',
`details` TEXT,
`userId` int(8),