Commit b8d5892a authored by mose's avatar mose

merged from branch. 47 conflicts solved please double-check and fix possible problems

parent 8f44d213
This diff is collapsed.
<?php
// $Header: /cvsroot/tikiwiki/tiki/backups/index.php,v 1.2 2004-03-27 21:23:52 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/bin/index.php,v 1.2 2004-03-27 21:23:53 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/categorize.php,v 1.9 2004-02-20 19:22:27 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/categorize.php,v 1.10 2004-03-27 21:23:52 mose Exp $
// Copyright (c) 2002-2003, 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.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== FALSE) {
//smarty is not there - we need setup
require_once('tiki-setup.php');
$smarty->assign('msg',tra("This script cannot be called directly"));
$smarty->display("error.tpl");
die;
}
include_once ('lib/categories/categlib.php');
if ($feature_categories == 'y') {
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/categorize_list.php,v 1.6 2004-02-20 19:22:27 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/categorize_list.php,v 1.7 2004-03-27 21:23:52 mose Exp $
// Copyright (c) 2002-2003, 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.
# $Header: /cvsroot/tikiwiki/tiki/categorize_list.php,v 1.6 2004-02-20 19:22:27 mose Exp $
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== FALSE) {
//smarty is not there - we need setup
require_once('tiki-setup.php');
$smarty->assign('msg',tra("This script cannot be called directly"));
$smarty->display("error.tpl");
die;
}
# $Header: /cvsroot/tikiwiki/tiki/categorize_list.php,v 1.7 2004-03-27 21:23:52 mose Exp $
include_once ('lib/categories/categlib.php');
if ($feature_categories == 'y') {
......
Tikiwiki Changelog
------------------
$Header: /cvsroot/tikiwiki/tiki/changelog.txt,v 1.151 2004-03-25 06:19:08 dabright Exp $
$Header: /cvsroot/tikiwiki/tiki/changelog.txt,v 1.152 2004-03-27 21:23:52 mose Exp $
All developers are invited to add relevant changes in that file as they
apply them to the CVS source. You can optionnaly indicate an identifer
......@@ -479,7 +479,6 @@ Version 1.7 -Eta Carinae-
* [FIX] all sent mails are utf-8 encoded now for intl sake
* [FIX] added sender email address to outgoing mails
* [FIX] added form to edit groups and change included groups
>>>>>>> 1.94.2.10
* [NEW] Added an Edit CSS feature, with fancy display of css and fast editor form
* [NEW] Added a setup_virtual.sh for virtual hosting, and changed internal code accordingly
* [NEW] Added a general Calendar feature for tiki content browsing and groups calendar
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/copyrights.php,v 1.3 2003-11-17 15:44:27 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/copyrights.php,v 1.4 2004-03-27 21:23:52 mose Exp $
// Copyright (c) 2002-2003, 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.
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== FALSE) {
//smarty is not there - we need setup
require_once('tiki-setup.php');
$smarty->assign('msg',tra("This script cannot be called directly"));
$smarty->display("error.tpl");
die;
}
// This file sets up the information needed to display
// the copyrights information box
require_once ('lib/tikilib.php');
......@@ -88,4 +97,4 @@ $smarty->assign('copyrights', $copyrights["data"]);
$smarty->assign('mid', 'copyrights.tpl');
$smarty->display("tiki.tpl");
?>
\ No newline at end of file
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/db/convertscripts/index.php,v 1.2 2004-03-27 21:23:53 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/db/index.php,v 1.2 2004-03-27 21:23:53 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/db/profiles/index.php,v 1.2 2004-03-27 21:23:53 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
......@@ -1823,6 +1823,7 @@ CREATE TABLE tiki_mailin_accounts (
useAuth char(1) default NULL,
smtpPort int(4) default NULL,
anonymous char(1) NOT NULL default 'y',
attachments char(1) NOT NULL default 'n',
PRIMARY KEY (accountId)
) TYPE=MyISAM AUTO_INCREMENT=1 ;
# --------------------------------------------------------
......
<?php
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
die("This script cannot be called directly");
}
//$api_tiki = 'pear';
$api_tiki = 'adodb';
$db_tiki = 'mysql';
......@@ -66,7 +71,7 @@ if (file_exists($file)) {
if (preg_match('/^adodb$/i', $api_tiki)) {
TikiInit::prependIncludePath('lib/adodb');
TikiInit::prependIncludePath('lib/pear');
error_reporting (E_ALL); # show any error messages triggered
#error_reporting (E_ALL); # show any error messages triggered
define('ADODB_FORCE_NULLS', 1);
define('ADODB_ASSOC_CASE', 2);
define('ADODB_CASE_ASSOC', 2); // typo in adodb's driver for sybase?
......
# $Header: /cvsroot/tikiwiki/tiki/db/tiki.sql,v 1.172 2004-03-24 13:46:45 mose Exp $
# $Header: /cvsroot/tikiwiki/tiki/db/tiki.sql,v 1.173 2004-03-27 21:23:53 mose Exp $
# phpMyAdmin MySQL-Dump
# version 2.5.1
# http://www.phpmyadmin.net/ (download page)
......@@ -1848,6 +1848,7 @@ CREATE TABLE tiki_mailin_accounts (
useAuth char(1) default NULL,
smtpPort int(4) default NULL,
anonymous char(1) NOT NULL default 'y',
attachments char(1) NOT NULL default 'n',
PRIMARY KEY (accountId)
) TYPE=MyISAM AUTO_INCREMENT=1 ;
# --------------------------------------------------------
......
# $Id: tiki_1.7to1.8.sql,v 1.104 2004-02-24 21:51:58 wolff_borg Exp $
# $Id: tiki_1.7to1.8.sql,v 1.105 2004-03-27 21:23:53 mose Exp $
# The following script will update a tiki database from verion 1.7 to 1.8
#
......@@ -887,3 +887,9 @@ INSERT /* IGNORE */ INTO tiki_preferences(name,value) VALUES ('search_lru_purge_
INSERT /* IGNORE */ INTO tiki_preferences(name,value) VALUES ('search_lru_length','100');
INSERT /* IGNORE */ INTO tiki_preferences(name,value) VALUES ('search_syll_age','48');
# added on 2004-03-18 by baptiste (adding anonymous posts discard possibility to mail-in feature)
ALTER TABLE tiki_mailin_accounts ADD anonymous CHAR(1) NOT NULL DEFAULT 'y';
# added on 2004-03-26 by baptiste (adding attachments handling to the mail-in feature)
ALTER TABLE tiki_mailin_accounts ADD attachments CHAR(1) NOT NULL DEFAULT 'n';
<?php
// $Header: /cvsroot/tikiwiki/tiki/display_banner.php,v 1.9 2004-01-28 04:06:29 musus Exp $
// $Header: /cvsroot/tikiwiki/tiki/display_banner.php,v 1.10 2004-03-27 21:23:52 mose Exp $
// Copyright (c) 2002-2003, 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.
# $Header: /cvsroot/tikiwiki/tiki/display_banner.php,v 1.9 2004-01-28 04:06:29 musus Exp $
# $Header: /cvsroot/tikiwiki/tiki/display_banner.php,v 1.10 2004-03-27 21:23:52 mose Exp $
// Only to be called from edit_banner or view_banner to display the banner without adding
// impressions to the banner
......@@ -14,6 +14,15 @@ if (!isset($_REQUEST["id"])) {
die;
}
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== FALSE) {
//smarty is not there - we need setup
require_once('tiki-setup.php');
$smarty->assign('msg',tra("This script cannot be called directly"));
$smarty->display("error.tpl");
die;
}
include_once("lib/init/initlib.php");
include_once ('db/tiki-db.php');
include_once ('lib/tikilib.php');
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/doc/devtools/index.php,v 1.2 2004-03-27 21:23:54 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/doc/index.php,v 1.2 2004-03-27 21:23:53 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/dump/index.php,v 1.2 2004-03-27 21:23:54 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/function.js_maxlength.php,v 1.2 2004-03-07 23:12:01 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/function.js_maxlength.php,v 1.3 2004-03-27 21:23:52 mose Exp $
/**
* \brief Smarty {js_maxlength} function handler
*
......@@ -11,6 +11,16 @@
*
*/
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== FALSE) {
//smarty is not there - we need setup
require_once('tiki-setup.php');
$smarty->assign('msg',tra("This script cannot be called directly"));
$smarty->display("error.tpl");
die;
}
function smarty_function_js_maxlength($params, &$smarty) {
extract($params); // textarea=string maxlength=num
......@@ -40,4 +50,4 @@ function smarty_function_js_maxlength($params, &$smarty) {
echo "//-->\n";
echo "</script>\n";
}
?>
\ No newline at end of file
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/games/flash/index.php,v 1.2 2004-03-27 21:23:54 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/games/index.php,v 1.2 2004-03-27 21:23:54 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/games/thumbs/index.php,v 1.2 2004-03-27 21:23:54 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/images/index.php,v 1.2 2004-03-27 21:23:54 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/img/avatars/index.php,v 1.2 2004-03-27 21:23:55 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/img/custom/index.php,v 1.2 2004-03-27 21:23:55 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/img/flags/index.php,v 1.2 2004-03-27 21:23:55 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/img/icn/index.php,v 1.2 2004-03-27 21:23:55 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/img/icons/index.php,v 1.2 2004-03-27 21:23:55 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/img/icons2/index.php,v 1.2 2004-03-27 21:23:56 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/img/index.php,v 1.2 2004-03-27 21:23:55 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/img/mytiki/index.php,v 1.2 2004-03-27 21:23:56 mose Exp $
// Copyright (c) 2002-2003, 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.
// This redirects to the sites root to prevent directory browsing
header ("location: ../../tiki-index.php");
die;
?>
<?php
// $Header: /cvsroot/tikiwiki/tiki/img/smiles/index.php,v 1.2 2004-03-27 21:23:56 mose Exp $
// Copyright (c) 2002-2003, 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.