...
 
Commits (349)
......@@ -83,7 +83,7 @@ db/index.php -text
db/tiki-db-adodb.php -text
db/tiki-db-pdo.php -text
db/tiki-db.php -text
db/tiki-secdb_9.2_mysql.sql -text
db/tiki-secdb_9.11_mysql.sql -text
db/tiki.sql -text
db/tiki_1.8to1.9.sql -text
db/tiki_1.9to2.0.sql -text
......@@ -928,6 +928,7 @@ img/icons/large/areas.png -text
img/icons/large/areas48x48.png -text
img/icons/large/blogs.png -text
img/icons/large/blogs48x48.png -text
img/icons/large/blogs_new.png -text
img/icons/large/bookmarks.gif -text
img/icons/large/boot.png -text
img/icons/large/boot48x48.png -text
......@@ -948,6 +949,7 @@ img/icons/large/feed-icon-48x48.png -text
img/icons/large/feed-icon.png -text
img/icons/large/file-manager.png -text
img/icons/large/file-manager48x48.png -text
img/icons/large/file-manager_new.png -text
img/icons/large/fileopen48x48.png -text
img/icons/large/files.gif -text
img/icons/large/gftp.png -text
......@@ -1032,7 +1034,10 @@ img/icons/large/stock_quit.png -text
img/icons/large/stock_quit48x48.png -text
img/icons/large/stock_select-color.png -text
img/icons/large/stock_select-color48x48.png -text
img/icons/large/stock_select-color_new.png -text
img/icons/large/tasks.gif -text
img/icons/large/trackers_new.png -text
img/icons/large/trackers_updated.png -text
img/icons/large/usagelist.txt -text
img/icons/large/user.png -text
img/icons/large/userfiles.png -text
......@@ -1905,6 +1910,7 @@ installer/schema/20100920_todo_event_tiki.sql -text
installer/schema/20100923_fix_column_position_tiki.sql -text
installer/schema/20100923_social_networking_permission_and_menuitem_tiki.sql -text
installer/schema/20100925_fix_some_default_value_tiki.sql -text
installer/schema/20100927_better_column_fix2_tiki.php -text
installer/schema/20100927_better_column_fix_tiki.php -text
installer/schema/20100928_sefurl_regex_reordering_tiki.sql -text
installer/schema/20101008_user_id_for_tiki_language_tiki.sql -text
......@@ -5117,6 +5123,7 @@ templates/comment-footer.tpl -text
templates/comment-header.tpl -text
templates/comment.tpl -text
templates/comment/archive.tpl -text
templates/comment/edit.tpl -text
templates/comment/index.php -text
templates/comment/list.tpl -text
templates/comment/lock.tpl -text
......@@ -5364,6 +5371,7 @@ templates/modules/mod-messages_unread_messages.tpl -text
templates/modules/mod-messages_unread_messages.tpl.nocache -text
templates/modules/mod-minichat.tpl -text
templates/modules/mod-mobile.tpl -text
templates/modules/mod-mobile.tpl.nocache -text
templates/modules/mod-months_links.tpl -text
templates/modules/mod-most_commented.tpl -text
templates/modules/mod-num_submissions.tpl -text
......
Tiki! The wiki with a lot of features!
Version 9.2beta1
Version 9.11
DOCUMENTATION
* The documentation for 9.2 version is ever evolving at http://doc.tiki.org.
* The documentation for 9.11 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:
* http://doc.tiki.org/Installation for a setup guide
* Notes about this release are accessible from http://tiki.org/ReleaseNotes92
* Notes about this release are accessible from http://tiki.org/ReleaseNotes911
* Tikiwiki has an active IRC channel, #tikiwiki on irc.freenode.net
INSTALLATION
......@@ -24,7 +24,7 @@ UPGRADES
COPYRIGHT
Copyright (c) 2002-2012, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
Copyright (c) 2002-2016, 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.
......
......@@ -32,6 +32,12 @@
deny from all
</FilesMatch>
# This prevents reading of tags file for developpers who run ctags on their server
#<Files tags>
# order deny,allow
# deny from all
#</Files>
<IfModule mod_dir.c>
DirectoryIndex index.php
# if using wiki as homepage feature you may avoid the home page name being appended to the url by replacing the previous line with the following line
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
// (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$
......@@ -45,10 +45,10 @@ if ( function_exists('apc_sma_info') && ini_get('apc.enabled') ) {
'hit_miss' => $cache['num_misses'] / $hit_total,
'hit_total' => $hit_total,
);
} elseif ( function_exists('xcache_info') ) {
} elseif ( function_exists('xcache_info') && ( ini_get('xcache.cacher') == '1' || ini_get('xcache.cacher') == 'On' ) ) {
$opcode_cache = 'XCache';
if ( ini_get('xcache.admin.enable_auth') ) {
if ( ini_get('xcache.admin.enable_auth') == '1' || ini_get('xcache.admin.enable_auth') == 'On' ) {
$opcode_stats['warning_xcache_blocked'] = true;
} else {
$stat_flag = 'xcache.stat';
......@@ -61,7 +61,7 @@ if ( function_exists('apc_sma_info') && ini_get('apc.enabled') ) {
'hit_total' => 0,
);
foreach ( range(0, xcache_count(XC_TYPE_PHP) - 1) as $index ) {
foreach (range(0, xcache_count(XC_TYPE_PHP) - 1) as $index) {
$info = xcache_info(XC_TYPE_PHP, $index);
$opcode_stats['hit_hit'] += $info['hits'];
......@@ -78,8 +78,42 @@ if ( function_exists('apc_sma_info') && ini_get('apc.enabled') ) {
$opcode_stats['hit_hit'] /= $opcode_stats['hit_total'];
$opcode_stats['hit_miss'] /= $opcode_stats['hit_total'];
}
} elseif ( function_exists('wincache_ocache_fileinfo') && ( ini_get('wincache.ocenabled') == '1') ) {
$opcode_cache = 'WinCache';
$stat_flag = 'wincache.ocenabled';
$opcode_stats = array(
'memory_used' => 0,
'memory_avail' => 0,
'memory_total' => 0,
'hit_hit' => 0,
'hit_miss' => 0,
'hit_total' => 0,
);
$info = wincache_ocache_fileinfo();
$opcode_stats['hit_hit'] = $info['total_hit_count'];
$opcode_stats['hit_miss'] = $info['total_miss_count'];
$opcode_stats['hit_total'] = $info['total_hit_count'] + $info['total_miss_count'];
$memory = wincache_ocache_meminfo();
$opcode_stats['memory_avail'] = $memory['memory_free'];
$opcode_stats['memory_total'] = $memory['memory_total'];
$opcode_stats['memory_used'] = $memory['memory_total'] - $memory['memory_free'];
$opcode_stats['memory_used'] /= $opcode_stats['memory_total'];
$opcode_stats['memory_avail'] /= $opcode_stats['memory_total'];
$opcode_stats['hit_hit'] /= $opcode_stats['hit_total'];
$opcode_stats['hit_miss'] /= $opcode_stats['hit_total'];
}
// Make results easier to read
$opcode_stats['memory_used'] = round($opcode_stats['memory_used'],2);
$opcode_stats['memory_avail'] = round($opcode_stats['memory_avail'],2);
$opcode_stats['hit_hit'] = round($opcode_stats['hit_hit'],2);
$opcode_stats['hit_miss'] = round($opcode_stats['hit_miss'],2);
if ( $stat_flag ) {
$opcode_stats['warning_check'] = (bool) ini_get($stat_flag);
$smarty->assign('stat_flag', $stat_flag);
......@@ -87,21 +121,21 @@ if ( $stat_flag ) {
if ( isset($opcode_stats['hit_total']) ) {
$opcode_stats = array_merge(
$opcode_stats,
array(
'warning_fresh' => $opcode_stats['hit_total'] < 10000,
'warning_ratio' => $opcode_stats['hit_hit'] < 0.8,
)
$opcode_stats,
array(
'warning_fresh' => $opcode_stats['hit_total'] < 10000,
'warning_ratio' => $opcode_stats['hit_hit'] < 0.8,
)
);
}
if ( isset($opcode_stats['memory_total']) ) {
$opcode_stats = array_merge(
$opcode_stats,
array(
'warning_starve' => $opcode_stats['memory_avail'] < 0.2,
'warning_low' => $opcode_stats['memory_total'] < 60*1024*1024,
)
$opcode_stats,
array(
'warning_starve' => $opcode_stats['memory_avail'] < 0.2,
'warning_low' => $opcode_stats['memory_total'] < 60*1024*1024,
)
);
}
......
This diff is collapsed.
This diff is collapsed.
......@@ -105,7 +105,13 @@ if ( file_exists($local_php) ) {
global $systemConfiguration;
$systemConfiguration = new Zend_Config(
array(
'preference' => array(),
'preference' => array(
'feature_jison_wiki_parser' => 'n', // hard code json parser off, as it's more than just "experimental"
// Developer Notice:
// if you want to help improve this feature then either comment out the line above
// or add 'feature_jison_wiki_parser' = 'y' to your tiki.ini file
// and enable that in your db/local.php
),
'rules' => array(),
),
array('readOnly' => false)
......
......@@ -23,6 +23,7 @@ define('CHANGELOG', ROOT . '/' . CHANGELOG_FILENAME);
define('COPYRIGHTS_FILENAME', 'copyright.txt');
define('COPYRIGHTS', ROOT . '/' . COPYRIGHTS_FILENAME);
define('SF_TW_MEMBERS_URL', 'http://sourceforge.net/project/memberlist.php?group_id=64258');
define('DEV_TW_MEMBERS_URL', 'http://dev.tiki.org/getTikiUser.php');
define('README_FILENAME', 'README');
define('README', ROOT . '/' . README_FILENAME);
define('LICENSE_FILENAME', 'license.txt');
......@@ -841,21 +842,26 @@ function get_contributors_sf_data(&$contributors)
if (! function_exists('iconv'))
error("PHP 'iconv' function is not available on this system. Impossible to get SF.net data.");
$html = $options['http-proxy'] ? file_get_contents(SF_TW_MEMBERS_URL, 0, $options['http-proxy']) : file_get_contents(SF_TW_MEMBERS_URL);
if (!empty($html) && preg_match('/(<table.*<\/\s*table>)/sim', $html, $matches)) {
$usersInfo = array();
if (preg_match_all('/<tr[^>]*>' . str_repeat('\s*<td[^>]*>(.*)<\/td>\s*', 4).'<\/\s*tr>/Usim', $matches[0], $usersInfo, PREG_SET_ORDER)) {
foreach ($usersInfo as $k => $userInfo) {
$userInfo = array_map('trim', array_map('strip_tags', $userInfo));
$user = strtolower($userInfo['2']);
if (empty($user)) continue;
$contributors[$user] = array(
'Name' => html_entity_decode(iconv("ISO-8859-15", "UTF-8", $userInfo['1']), ENT_COMPAT, 'UTF-8'),
'SF Role' => $userInfo['3']
);
}
}
#$html = $options['http-proxy'] ? file_get_contents(SF_TW_MEMBERS_URL, 0, $options['http-proxy']) : file_get_contents(SF_TW_MEMBERS_URL);
$html = $options['http-proxy'] ? file_get_contents(DEV_TW_MEMBERS_URL, 0, $options['http-proxy']) : file_get_contents(DEV_TW_MEMBERS_URL);
# if (!empty($html) && preg_match('/(<table.*<\/\s*table>)/sim', $html, $matches)) {
# $usersInfo = array();
# if (preg_match_all('/<tr[^>]*>' . str_repeat('\s*<td[^>]*>(.*)<\/td>\s*', 4).'<\/\s*tr>/Usim', $matches[0], $usersInfo, PREG_SET_ORDER)) {
# foreach ($usersInfo as $k => $userInfo) {
# $userInfo = array_map('trim', array_map('strip_tags', $userInfo));
# $user = strtolower($userInfo['2']);
# if (empty($user)) {
# continue;
# }
# $contributors[$user] = array(
# 'Name' => html_entity_decode(iconv("ISO-8859-15", "UTF-8", $userInfo['1']), ENT_COMPAT, 'UTF-8'),
# 'SF Role' => $userInfo['3']
# );
# }
# }
if (!empty($html)) {
$contributors = json_decode($html, true);
} else {
error('Impossible to get SF.net users information. If you need to use a web proxy, try the --http-proxy option.');
die;
......
<?php
// (c) Copyright 2002-2010 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$
define('SVN_MIN_VERSION', 1.3);
define('TIKISVN', 'https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki');
#define('TIKISVN', 'https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki');
define('TIKISVN', 'https://svn.code.sf.net/p/tikiwiki/code');
function full($relative)
{
......@@ -34,7 +35,7 @@ function color($string, $color)
}
function error($message)
{
{
die(color($message, 'red') . "\n");
}
......@@ -73,7 +74,7 @@ function is_valid_merge_source($destination, $source)
if (is_experimental($destination))
return is_trunk($source);
return false;
}
......@@ -107,10 +108,10 @@ function update_working_copy($localPath)
function has_uncommited_changes($localPath)
{
$localPath = escapeshellarg($localPath);
$dom = new DOMDocument;
$dom->loadXML(`svn status --xml $localPath`);
$xp = new DOMXPath($dom);
$count = $xp->query("/status/target/entry/wc-status[@item = 'added' or @item = 'conflicted' or @item = 'deleted' or @item = 'modified' or @item = 'replaced']");
......@@ -120,10 +121,10 @@ function has_uncommited_changes($localPath)
function get_conflicts($localPath)
{
$localPath = escapeshellarg($localPath);
$dom = new DOMDocument;
$dom->loadXML(`svn status --xml $localPath`);
$xp = new DOMXPath($dom);
$list = $xp->query("/status/target/entry/wc-status[@item = 'conflicted']");
......@@ -134,7 +135,7 @@ function find_last_merge($path, $source)
{
$short = preg_quote(short($source), '/');
$pattern = "/^\\[(MRG|BRANCH)\\].*$short'?\s+\d+\s+to\s+(\d+)/";
$descriptorspec = array(
0 => array('pipe', 'r'),
1 => array('pipe', 'w'),
......
......@@ -17,7 +17,7 @@
# ==========================================================================
#
SVNROOT="https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki"
SVNROOT="http://svn.code.sf.net/p/tikiwiki/code"
WORKDIR="$HOME/tikipack"
MODULE="tiki"
......
No preview for this file type
<?php
// (c) Copyright 2002-2012 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$
if (strpos($_SERVER["SCRIPT_NAME"], basename(__FILE__)) !== false) {
header("location: index.php");
exit;
}
function upgrade_20100927_better_column_fix2_tiki($installer)
{
global $dbs_tiki;
$result = $installer->getOne(
"SELECT COUNT(*) FROM information_schema.COLUMNS" .
" WHERE COLUMN_NAME='show_lastDownload' AND TABLE_NAME='tiki_file_galleries' AND TABLE_SCHEMA='" .
$dbs_tiki .
"';"
);
if ($result == 0) {
$result = $installer->query('ALTER TABLE `tiki_file_galleries` ADD COLUMN `show_lastDownload` char(1) default NULL AFTER `show_hits`;');
}
$result = $installer->getOne(
"SELECT COUNT(*) FROM information_schema.COLUMNS" .
" WHERE COLUMN_NAME='tweetId' AND TABLE_NAME='tiki_shoutbox' AND TABLE_SCHEMA='" .
$dbs_tiki."';"
);
if ($result == 0) {
$result = $installer->query('ALTER TABLE `tiki_shoutbox` ADD COLUMN `tweetId` bigint(20) unsigned NOT NULL AFTER `hash`;');
}
}
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.
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.
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.
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.
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.
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.