Commit 05b0cd4d authored by mose's avatar mose

Instant-Auto-Merge from BRANCH-1-9 to HEAD

parent d7066db2
......@@ -1716,6 +1716,10 @@ tiki/db/tiki-1.10-sqlite.sql -text
tiki/db/tiki-1.10-sybase.sql -text
tiki/db/tiki-db.php -text
tiki/db/tiki-secdb_1.10_mysql.sql -text
tiki/db/tiki-secdb_1.7.X_mysql.sql -text
tiki/db/tiki-secdb_1.8.X_mysql.sql -text
tiki/db/tiki-secdb_1.9_mysql.sql -text
tiki/db/tiki-secdb_pre_1.7_mysql.sql -text
tiki/db/tiki.sql -text
tiki/db/tiki_1.7to1.8.sql -text
tiki/db/tiki_1.8to1.9.sql -text
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/article_image.php,v 1.13 2005-05-18 10:58:51 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/article_image.php,v 1.14 2005-06-26 14:28:28 mose Exp $
// Copyright (c) 2002-2005, 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/article_image.php,v 1.13 2005-05-18 10:58:51 mose Exp $
# $Header: /cvsroot/tikiwiki/tiki/article_image.php,v 1.14 2005-06-26 14:28:28 mose Exp $
// application to display an image from the database with
// option to resize the image dynamically creating a thumbnail on the fly.
......@@ -24,7 +24,7 @@ $topiccachefile.= "/article.".$_REQUEST["id"];
if (is_file($topiccachefile) and (!isset($_REQUEST["reload"]))) {
$size = getimagesize($topiccachefile);
// header ("Content-type: ".$size['mime']);
header ("Content-type: ".$size['mime']); /* do not backport to 1.8 */
readfile($topiccachefile);
die();
} else {
......
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
# $Header: /cvsroot/tikiwiki/tiki/db/tiki_1.8to1.9.sql,v 1.97 2005-06-16 20:10:53 mose Exp $
# $Header: /cvsroot/tikiwiki/tiki/db/tiki_1.8to1.9.sql,v 1.98 2005-06-26 14:28:31 mose Exp $
# The following script will update a tiki database from verion 1.8 to 1.9
#
......@@ -1102,3 +1102,6 @@ UPDATE users_objectpermissions set permName='tiki_p_change_events' where permNam
# 2005-06-14 rv540
alter table tiki_referer_stats change referer referer varchar(255) not null;
#2005-06-20 amette: added on request of toggg(currently without CVS-access)
ALTER TABLE `tiki_pages` ADD created int(14);
......@@ -26,7 +26,7 @@ $query = "select * from `tiki_tracker_fields`where `isMain`=? order by `position
$result = $tikilib->query($query, array('y'));
while ($res = $result->fetchRow()) {
$mainFields[$res['trackerId']] = $res['fieldId'];
echo "Tracker: ".$res['trackerId']." - main field: ".$res['fieldId']."<br>";
echo "Tracker: ".$res['trackerId']." - main field: ".$res['fieldId']."<br>";
}
......@@ -42,10 +42,10 @@ while ($res = $result->fetchRow()) {
if ($debug == 'n') {
$result2 = $tikilib->query($query, array($mainValue, $itemId, "tracker ".$trackerId));
}
echo "Update tracker $trackerId pour l'item $itemId avec la valeur $mainValue<br>";
echo "Update tracker $trackerId for item $itemId with value $mainValue<br>";
} elseif (empty($mainValue)) {
if ($trklib->get_tracker_item($itemId))
echo "No value tracker $trackerId pour l'item <a href='tiki-view_tracker_item.php?trackerId=$trackerId&itemId=$itemId'>$itemId</a><br>";
echo "No value for tracker: $trackerId, item: <a href='tiki-view_tracker_item.php?trackerId=$trackerId&itemId=$itemId'>$itemId</a><br>";
else {
echo "Obsolete categorised object $trackerId - $itemId<br>";
if ($debug == 'n')
......
#!/bin/sh
# $Header: /cvsroot/tikiwiki/tiki/doc/devtools/tikimerge.sh,v 1.9 2005-06-16 20:10:53 mose Exp $
# $Header: /cvsroot/tikiwiki/tiki/doc/devtools/tikimerge.sh,v 1.10 2005-06-26 14:28:32 mose Exp $
#
# NOTE: Please start the merge process from BRANCH-1-8; don't start with 1-9
#
# NOTE: Please start the merge process from BRANCH-1-8; don't start with 1-9
# NOTE: Since 1.9 release, merge only concerns BRANCH-1-9 to HEAD
#
# That script is done for fast merging fixes that are done on branch
# refer to http://tikiwiki.org/tiki-index.php?page=CvsBranch18
......@@ -34,18 +32,18 @@ fi
echo "# Start of block you can just copy-paste"
echo "# or adapt (especially comment of commit)"
echo "# NOTE: Please start the merge process from BRANCH-1-8; don't start with 1-9"
echo "# NOTE: Since 1.9 release, merge only concerns BRANCH-1-9 to HEAD"
echo ""
echo "cvs -q up -dP -r BRANCH-1-9 $FILES"
echo "cvs -q up -d -r BRANCH-1-9 $FILES"
echo "cvs -q tag -r BRANCH-1-9 -F BRANCH-1-9-HEAD $FILES"
echo "cvs -q up -dAP $FILES"
echo "cvs -q up -dA $FILES"
for i in $FILES; do
echo "cvs -q up -dkk -j MERGE-BRANCH-1-9-to-HEAD -j BRANCH-1-9-HEAD $i"
done
for i in $EXCLUDE; do
echo "rm -rf $i"
echo "cvs -q up -dAP $i"
echo "cvs -q up -dA $i"
done
echo "grep -r '<<<<<<<' $FILES"
echo "cvs ci -m'Instant-Auto-Merge from BRANCH-1-9 to HEAD' $FILES"
......
......@@ -3,7 +3,7 @@
// HAWHAW: HTML and WML hybrid adapted webserver
// PHP class library
// Copyright (C) 2005 Norbert Huffschmid
// Last modified: 3. June 2005
// Last modified: 11. June 2005
//
// This library is free software; you can redistribute it and/or modify it under the
// terms of the GNU Library General Public License as published by the Free Software
......@@ -20,18 +20,9 @@
//
// For further information about this library and its license terms please visit:
// http://www.hawhaw.de/
//
// modifications against V5.9
// optimization: set [HTML_links] in brackets for better accessability
// optimization: control TTS for french and spanish per VoiceXML property
// bugfix: remove illegal characters from VoiceXML GSL grammar
// optimization: abandon border in HAW_linkset
// optimization: replaced Tellme with Motorola VoxGateway for hawdebug=voicexml
// optimization: declare encoding type in opening XML tag in case of VoiceXML
// optimization: short break after each VoiceXML link phrase
// miscellaneous constants
define("HAW_VERSION", "HAWHAW V5.10B");
define("HAW_VERSION", "HAWHAW V5.10");
define("HAW_COPYRIGHT", "(C) Norbert Huffschmid");
// constants for markup languages
......@@ -5095,7 +5086,7 @@ class HAW_submit
if ($method == HAW_METHOD_GET)
printf("<go href=\"%s%s%s\">\n", $url, $sep, $query_string);
else
printf("<go href=\"%s\">\n%s", $url, $post_fields);
printf("<go href=\"%s\" method=\"post\">\n%s", $url, $post_fields);
echo "</go>\n";
echo "</do>\n";
......@@ -5374,15 +5365,15 @@ class HAW_link
$br = "";
for ($i=0; $i < $this->br; $i++)
$br .= "<br>";
$content = sprintf("<a task=\"go\" dest=\"%s\"%s%s>%s</a>%s\n",
HAW_specchar($this->url, $deck),
$title_option, $accesskey_option,
HAW_specchar($this->label, $deck), $br);
$deck->hdmlcardset->add_display_content($content);
}
elseif ($deck->ml == HAW_VXML)
{
// remove http:// from link label, as voice browsers complain about :
......@@ -5392,6 +5383,9 @@ class HAW_link
// * / ? and = are not allowed in GSL grammar???
$label = ereg_replace("[\*\/\?=]", "", $label);
// ampersand not allowed in GSL grammar???
$label = ereg_replace("&amp;", "", $label);
if ($this->accesskey != HAW_NO_ACCESSKEY)
$dtmf = sprintf(" dtmf=\"%s\"", $this->accesskey);
else
......@@ -5400,13 +5394,13 @@ class HAW_link
// prepare tag for VoiceXML link (will be written at form end)
$deck->voice_links .= sprintf("<link next=\"%s\"%s><grammar>[%s]</grammar></link>\n",
HAW_specchar($this->url, $deck), $dtmf, $label);
if ($this->voice_text || $this->voice_audio_src)
{
// create audio output for VoiceXML link
echo "<block><prompt>";
if ($deck->voice_jingle)
{
// play jingle before link label is spoken
......@@ -5417,16 +5411,16 @@ class HAW_link
$pause = $this->br * HAW_VOICE_PAUSE; // short pause for each break
else
$pause = HAW_VOICE_PAUSE; // at least a short break to make the link phrase detectable
HAW_voice_audio(HAW_specchar($this->voice_text, $deck),
$this->voice_audio_src, $pause, $deck);
echo "</prompt></block>\n";
}
// update deck timeout
if ($deck->voice_timeout < $this->voice_timeout)
$deck->voice_timeout = $this->voice_timeout;
$deck->voice_timeout = $this->voice_timeout;
}
}
}
......
......@@ -6,7 +6,7 @@ if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
exit;
}
// $Header: /cvsroot/tikiwiki/tiki/lib/hawhaw/hawtikilib.php,v 1.14 2005-06-16 20:11:01 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/lib/hawhaw/hawtikilib.php,v 1.15 2005-06-26 14:28:34 mose Exp $
// HAWHAW function library for TikiWiki
......@@ -238,7 +238,7 @@ function HAWTIKI_list_articles($listpages, $tiki_p_read_article, $offset, $maxRe
$title = new HAW_text(HAWIKI_specchar($article['title']), HAW_TEXTFORMAT_BOLD);
$articleList->add_text($title);
$date = new HAW_text(date(HAWIKI_DATETIME_SHORT, $article['created']));
$date = new HAW_text(date(HAWIKI_DATETIME_SHORT, $article['publishDate']));
$articleList->add_text($date);
$author = new HAW_text(hawtra("By:") . HAWIKI_specchar($article['authorName']), HAW_TEXTFORMAT_SMALL | HAW_TEXTFORMAT_ITALIC);
......@@ -269,7 +269,7 @@ function HAWTIKI_list_articles($listpages, $tiki_p_read_article, $offset, $maxRe
function HAWTIKI_read_article($article_data, $pages)
{
$prefix = sprintf("__~np~%s~/np~__\n__%s ~np~%s~/np~__\n",
date(HAWIKI_DATETIME_SHORT, $article_data['created']),
date(HAWIKI_DATETIME_SHORT, $article_data['publishDate']),
hawtra("By:"), $article_data['authorName']);
$heading = sprintf("\n%s\n---\n", $article_data['heading']);
......
......@@ -76,17 +76,26 @@ class PollLibShared extends TikiLib {
}
function poll_vote($user, $pollId, $optionId) {
global $smarty;
$previous_vote = $this->get_user_vote("poll$pollId",$user);
if (!$previous_vote || $previous_vote == 0) {
$poll = $this->get_poll($pollId);
if( $poll['active'] == 'x' )
{
$smarty->assign('msg', tra("This poll is closed."));
$smarty->display("error.tpl");
die;
} else {
if (!$previous_vote || $previous_vote == 0) {
$query = "update `tiki_polls` set `votes`=`votes`+1 where `pollId`=?";
$result = $this->query($query,array((int)$pollId));
$query = "update `tiki_poll_options` set `votes`=`votes`+1 where `optionId`=?";
$result = $this->query($query,array((int)$optionId));
} elseif ($previous_vote != $optionId) {
} elseif ($previous_vote != $optionId) {
$query = "update `tiki_poll_options` set `votes`=`votes`-1 where `optionId`=?";
$result = $this->query($query,array((int)$previous_vote));
$query = "update `tiki_poll_options` set `votes`=`votes`+1 where `optionId`=?";
$result = $this->query($query,array((int)$optionId));
}
}
}
......
......@@ -42,21 +42,25 @@ function _translate_lang($key) {
$query="select `tran` from `tiki_language` where `source`=? and `lang`=?";
$result=$tikilib->query($query,array($content,$language));
$res=$result->fetchRow();
if(!$res) { return $content; }
if(!isset($res["tran"])) {
global $record_untranslated;
if ($record_untranslated=='y') {
$query="insert into `tiki_untranslated` (`source`,`lang`) values(?,?)";
//No eror checking here
$tikilib->query($query,array($content,$language),-1,-1,false);
}
return $key[1].$content."{/tr}";
}
if ($key[1] == "{tr}") {
return $res["tran"];// no more possible translation in block.tr.php
if(isset($res["tran"])) {
if ($key[1] == "{tr}") {
return $res["tran"];// no more possible translation in block.tr.php
} else {
return $key[1].$res["tran"]."{/tr}";// perhaps variable substituion to do in block.tr.php
}
} else {
return $key[1].$res["tran"]."{/tr}";// perhaps variable substituion to do in block.tr.php
}
}
global $record_untranslated;
if ($record_untranslated=='y') {
$query="insert into `tiki_untranslated` (`source`,`lang`) values(?,?)";
//No eror checking here
$tikilib->query($query,array($content,$language),-1,-1,false);
}
if (strstr($key[2], "{\$")) {
return $key[1].$content."{/tr}";
} else {
return $key[2];
}
}
}
}
?>
// $Header: /cvsroot/tikiwiki/tiki/lib/tiki-js.js,v 1.62 2005-05-18 10:59:49 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/lib/tiki-js.js,v 1.63 2005-06-26 14:28:32 mose Exp $
var feature_no_cookie = 'n';
function browser() {
var b = navigator.appName
if (b=="Netscape") this.b = "ns"
else this.b = b
this.version = navigator.appVersion
this.v = parseInt(this.version)
this.ns = (this.b=="ns" && this.v>=5)
this.op = (navigator.userAgent.indexOf('Opera')>-1)
this.safari = (navigator.userAgent.indexOf('Safari')>-1)
this.op7 = (navigator.userAgent.indexOf('Opera')>-1 && this.v>=7)
this.ie56 = (this.version.indexOf('MSIE 5')>-1||this.version.indexOf('MSIE 6')>-1)
this.iewin = (this.ie56 && navigator.userAgent.indexOf('Windows')>-1)
this.iemac = (this.ie56 && navigator.userAgent.indexOf('Mac')>-1)
this.moz = (navigator.userAgent.indexOf('Mozilla')>-1)
this.moz13 = (navigator.userAgent.indexOf('Mozilla')>-1 && navigator.userAgent.indexOf('1.3')>-1)
this.oldmoz = (navigator.userAgent.indexOf('Mozilla')>-1 && navigator.userAgent.indexOf('1.4')>-1 || navigator.userAgent.indexOf('Mozilla')>-1 && navigator.userAgent.indexOf('1.5')>-1 || navigator.userAgent.indexOf('Mozilla')>-1 && navigator.userAgent.indexOf('1.6')>-1)
this.ns6 = (navigator.userAgent.indexOf('Netscape6')>-1)
this.docom = (this.ie56||this.ns||this.iewin||this.op||this.iemac||this.safari||this.moz||this.oldmoz||this.ns6)
}
function getElementById(id) {
if (document.all) {
return document.getElementById(id);
......@@ -250,6 +270,7 @@ function setUserModuleFromCombo(id) {
//document.getElementById('usermoduledata').value='das';
}
function show(foo,f,section) {
document.getElementById(foo).style.display = "block";
if (f) { setCookie(foo, "o", section); }
......@@ -289,6 +310,15 @@ function toggle(foo) {
}
}
function setopacity(obj,opac){
if (document.all && !is.op){ //ie
obj.filters.alpha.opacity = opac * 100;
}else{
obj.style.MozOpacity = opac;
obj.style.opacity = opac;
}
}
function tikitabs(focus,max) {
for (var i = 1; i < max; i++) {
var tabname = 'tab' + i;
......
<?php
/**
* $Header: /cvsroot/tikiwiki/tiki/lib/tikihelplib.php,v 1.2 2005-05-18 10:59:49 mose Exp $
* $Header: /cvsroot/tikiwiki/tiki/lib/tikihelplib.php,v 1.3 2005-06-26 14:28:32 mose Exp $
* Copyright (c) 2002-2005, 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.
......@@ -46,3 +46,4 @@ function help_doclink($params) {
}
return $ret;
}
?>
\ No newline at end of file
......@@ -2255,7 +2255,7 @@ function add_pageview() {
}
/*shared*/
function list_articles($offset = 0, $maxRecords = -1, $sort_mode = 'publishDate_desc', $find = '', $date = '', $user, $type = '', $topicId = '', $visible_only = 'y', $topic='') {
function list_articles($offset = 0, $maxRecords = -1, $sort_mode = 'publishDate_desc', $find = '', $date = '', $user=false, $type = '', $topicId = '', $visible_only = 'y', $topic='') {
global $userlib, $user;
$mid = " left join `users_users` on `tiki_articles`.`author` = `users_users`.`login` where `tiki_articles`.`type` = `tiki_article_types`.`type` ";
......@@ -2346,17 +2346,23 @@ function add_pageview() {
}
if ($add <> "") { $mid .= " ( ".$add." ) "; }
}
if (($visible_only) && ($visible_only <> 'n')) {
$now = date('U');
$bindvars[]=(int) $now;
$bindvars[]=(int) $now;
$condition = "(`tiki_articles`.`publishDate`<? or `tiki_article_types`.`show_pre_publ`='y') and (`tiki_articles`.`expireDate`>? or `tiki_article_types`.`show_post_expire`='y')";
if ($mid) {
$mid .= " and $condition";
} else {
$mid .= " where $condition";
}
if ($date !== false){ // looking for articles on a specific date (or today)
if ($date === ""){ // show articles published today
$date = date('U');
}
$bindvars[]=(int) $date;
$bindvars[]=(int) date('U');
$condition = "(`tiki_articles`.`publishDate`<? or `tiki_article_types`.`show_pre_publ`='y') and (`tiki_articles`.`expireDate`>? or `tiki_article_types`.`show_post_expire`='y')";
}else{ // looking for all articles not expired
$condition = "(`tiki_articles`.`expireDate`>? or `tiki_article_types`.`show_post_expire`='y')";
$bindvars[]=date('U');
}
if ($mid) {
$mid .= " and $condition";
} else {
$mid .= " where $condition";
}
}
$query = "select `tiki_articles`.*,
`users_users`.`avatarLibName`,
......
<?php
/*
* Tiki-Wiki ALINK plugin. Go to http://www.TikiMODS.com for more TikiWiki Plugins.
*
* DESCRIPTION: Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor.
*
* INSTALLATION: Just put this file into your TikiWiki site's lib/wiki-plugins folder.
*
* USAGE SYNTAX:
*
* {ALINK(
* aname=>anchorname the name of the anchor you created using the ANAME plugin!
* )}
* yourlinktext the text of the link
* {ALINK}
*
* EXAMPLE: {ALINK(aname=myanchor)}click here{ALINK}
*
*/
function wikiplugin_alink_help() {
return tra("Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor").":<br />~np~{ALINK(aname=anchorname)}".tra("linktext")."{ALINK}~/np~";
}
function wikiplugin_alink($data, $params)
{
global $tikilib;
extract ($params, EXTR_SKIP);
if (!isset($aname)) {
return ("<b>missing parameter for aname</b><br />");
}
return "<A HREF=\"#$aname\">$data</A>";
}
?>
<?php
/*
* Tiki-Wiki ALINK plugin. Go to http://www.TikiMODS.com for more TikiWiki Plugins.
*
* DESCRIPTION: Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor.
*
* INSTALLATION: Just put this file into your TikiWiki site's lib/wiki-plugins folder.
*
* USAGE SYNTAX:
*
* {ALINK(
* aname=>anchorname the name of the anchor you created using the ANAME plugin!
* )}
* yourlinktext the text of the link
* {ALINK}
*
* EXAMPLE: {ALINK(aname=myanchor)}click here{ALINK}
*
*/
function wikiplugin_alink_help() {
return tra("Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor").":<br />~np~{ALINK(aname=anchorname,pagename=Wiki Page Name)}".tra("linktext")."{ALINK}~/np~";
}
function wikiplugin_alink($data, $params)
{
global $tikilib;
global $feature_multilingual;
global $feature_best_language;
extract ($params, EXTR_SKIP);
if (!isset($aname)) {
return ("<b>missing parameter for aname</b><br />");
}
if (isset($pagename)) {
// Stolen, with some modifications, from tikilib.php line 4717-4723
if( $desc = $tikilib->page_exists_desc($pagename) )
{
// to choose the best page language
$bestLang = ($feature_multilingual == 'y' && $feature_best_language == 'y')? "&amp;bl" : "";
return "<a title=\"$desc\" href='tiki-index.php?page=" . urlencode($pagename) . \
$bestLang . "#" . $aname . "' class='wiki'>$data</a>";
} else {
return $data . '<a href="tiki-editpage.php?page=' . urlencode($pagename) . \
'" title="' . tra("Create page:") . ' ' . urlencode($page_parse) . \
'" class="wiki wikinew">?</a>';
}
} else {
return "<A HREF=\"#$aname\">$data</A>";
}
}
?>
<?php
/* $Id: wikiplugin_module.php,v 1.27 2005-05-18 11:02:00 mose Exp $
/* $Id: wikiplugin_module.php,v 1.28 2005-06-26 14:28:34 mose Exp $
Displays a module inlined in page
Parameters
......@@ -75,12 +75,12 @@ function wikiplugin_module($data, $params) {
$args = '';
}
$cachefile = 'modules/cache/';
if ($tikidomain) { $cachefile.= "$tikidomain/"; }
$cachefile.= 'mod-' . $module . '.tpl.'.$language.'.cache';
// $cachefile = 'modules/cache/';
// if ($tikidomain) { $cachefile.= "$tikidomain/"; }
// $cachefile.= 'mod-' . $module . '.tpl.'.$language.'.cache';
// $nocache = 'templates/modules/mod-' . $module . '.tpl.nocache';
$phpfile = 'modules/mod-' . $module . '.php';
$template = 'modules/mod-' . $module . '.tpl';
$nocache = 'templates/modules/mod-' . $module . '.tpl.nocache';
$module_rows = $max;
$module_params = $params;
......@@ -107,11 +107,11 @@ function wikiplugin_module($data, $params) {
}
$smarty->clear_assign('module_params'); // ensure params not available outside current module
$smarty->clear_assign('no_module_controls');
if (!file_exists($nocache)) {
$fp = fopen($cachefile, "w+");
fwrite($fp, $data, strlen($data));
fclose ($fp);
}
// if (!file_exists($nocache)) {
// $fp = fopen($cachefile, "w+");
// fwrite($fp, $data, strlen($data));
// fclose ($fp);
// }
// } else {
// $fp = fopen($cachefile, "r");
// $out = fread($fp, filesize($cachefile));
......
......@@ -35,22 +35,22 @@ function wikiplugin_snarf($data, $params)
ob_end_clean();
$snarf = preg_replace( "/.*<[^>]*body[^>]*>(.*)<[^>]*\/[^>]*body[^>]*>.*/si", "$1", $html );
} else {
$ret = "<p>You need php-curl for the SNARF plugin!</p>\n";
}
// If the user specified a more specialized regex
if( isset( $regex ) && isset( $regexres )
and preg_match('/^(.)(.)+\1[^e]*$/', $regex))
{
//print("<pre>regex: ".htmlspecialchars($regex)."</pre>");
//print("<pre>regexres: ".htmlspecialchars($regexres)."</pre>");
$snarf = preg_replace( $regex, $regexres, $snarf );
}
// If the user specified a more specialized regex
if( isset( $regex ) && isset( $regexres )
and preg_match('/^(.)(.)+\1[^e]*$/', $regex))
{
//print("<pre>regex: ".htmlspecialchars($regex)."</pre>");
//print("<pre>regexres: ".htmlspecialchars($regexres)."</pre>");
$snarf = preg_replace( $regex, $regexres, $snarf );
}
//print("<pre>BODY: " . htmlspecialchars( $snarf ) . "</pre>");
//print("<pre>BODY: " . htmlspecialchars( $snarf ) . "</pre>");
$ret = "{CODE(wrap=>1,caption=>" . $data . ")}" . $snarf . "{CODE}";
$ret = "{CODE(wrap=>1,caption=>" . $data . ")}" . $snarf . "{CODE}";
} else {
$ret = "<p>You need php-curl for the SNARF plugin!</p>\n";
}
return $ret;
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/styles/damian/tiki-show_page.tpl,v 1.12 2005-05-18 11:03:34 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/styles/damian/tiki-show_page.tpl,v 1.13 2005-06-26 14:28:35 mose Exp $ *}
{if $feature_page_title eq 'y'}<h1><a href="tiki-index.php?page={$page|escape:"url"}" class="pagetitle">
{if $structure eq 'y' and $page_info.page_alias ne ''}
......@@ -56,7 +56,7 @@
{if $feature_backlinks eq 'y' and $backlinks}
<td style="text-align:right;">
<form action="tiki-index.php" method="post">
<form action="tiki-index.php" method="get">
<select name="page" onchange="page.form.submit()">
<option value="{$page}">{tr}backlinks{/tr}...</option>
{section name=back loop=$backlinks}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/styles/moreneat/tiki-show_page.tpl,v 1.52 2005-06-16 22:45:35 toggg Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/styles/moreneat/tiki-show_page.tpl,v 1.53 2005-06-26 14:28:35 mose Exp $ *}
{if $feature_page_title eq 'y'}<h1><a href="tiki-index.php?page={$page|escape:"url"}" class="pagetitle">
{if $structure eq 'y' and $page_info.page_alias ne ''}
{$page_info.page_alias}
......@@ -80,7 +80,7 @@
</td>
<td style="text-align:right; width: 1px;">
{if $feature_backlinks eq 'y' and $backlinks}
<form action="tiki-index.php" method="post">
<form action="tiki-index.php" method="get">
<select name="page" onchange="page.form.submit()">
<option>{tr}backlinks{/tr}...</option>
{section name=back loop=$backlinks}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/styles/simple/tiki-show_page.tpl,v 1.5 2005-05-18 11:03:56 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/styles/simple/tiki-show_page.tpl,v 1.6 2005-06-26 14:28:35 mose Exp $ *}
{if $feature_page_title eq 'y'}<h1><a href="tiki-index.php?page={$page|escape:"url"}" class="pagetitle" title="{tr}Refresh{/tr}">
{if $structure eq 'y' and $page_info.page_alias ne ''}
......@@ -48,7 +48,7 @@
{/if}
{/if}
{if $feature_backlinks eq 'y' and $backlinks}
<form action="tiki-index.php" method="post">
<form action="tiki-index.php" method="get">
<select name="page" onchange="page.form.submit()">
<option>{tr}backlinks{/tr}...</option>
{section name=back loop=$backlinks}
......
......@@ -28,7 +28,7 @@
{/if}
{if $feature_backlinks eq 'y' and $backlinks}
<form action="tiki-index.php" method="post">
<form action="tiki-index.php" method="get">
<select name="page" onchange="page.form.submit()">
<option>{tr}backlinks{/tr}...</option>
{section name=back loop=$backlinks}
......
......@@ -32,7 +32,7 @@
{/if}
{if $feature_backlinks eq 'y' and $backlinks}
<form action="tiki-index.php" method="post">
<form action="tiki-index.php" method="get">
<select name="page" onchange="page.form.submit()">
<option>{tr}backlinks{/tr}...</option>
{section name=back loop=$backlinks}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-show_page.tpl,v 1.88 2005-06-16 20:11:14 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-show_page.tpl,v 1.89 2005-06-26 14:28:34 mose Exp $ *}
{breadcrumbs type="trail" loc="page" crumbs=$crumbs}{breadcrumbs type="pagetitle" loc="page" crumbs=$crumbs}
......@@ -43,7 +43,7 @@
{if $feature_backlinks eq 'y' and $backlinks}
<td style="text-align:right;width:42px;">
<form action="tiki-index.php" method="post">
<form action="tiki-index.php" method="get">
<select name="page" onchange="page.form.submit()">
<option>{tr}backlinks{/tr}...</option>
{section name=back loop=$backlinks}
......
......@@ -73,10 +73,10 @@
<tr><td class="form">{tr}Your personal Wiki Page{/tr}:</td><td class="form"><a class="link" href="tiki-index.php?page={$feature_wiki_userpage_prefix}{$userinfo.login}">{$feature_wiki_userpage_prefix}{$userinfo.login}</a>
(<a class="link" href="tiki-editpage.php?page={$feature_wiki_userpage_prefix}{$userinfo.login}">{tr}edit{/tr}</a>)</td></tr>
{/if}
{if $userTracker eq 'y'}
{if $userTracker eq 'y' && $usertrackerId}
<tr><td class="form">{tr}Your personal tracker information{/tr}:</td><td class="form">
{if $useritemId}
<a class="link" href="tiki-view_tracker_item.php?trackerId={$usertrackerId}&amp;itemId={$useritemId}">{tr}Edit information{/tr}</a>
<a class="link" href="tiki-view_tracker_item.php?trackerId={$usertrackerId}&amp;itemId={$useritemId}&amp;show=mod">{tr}Edit information{/tr}</a>
{else}
<a class="link" href="tiki-view_tracker_item.php?view=+user">{tr}View extra information{/tr}</a>
{/if}
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-admin_system.php,v 1.22 2005-05-18 10:58:55 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/tiki-admin_system.php,v 1.23 2005-06-26 14:28:28 mose Exp $
// Copyright (c) 2002-2005, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
......@@ -22,7 +22,7 @@ function du($path, $begin=null) {
} elseif (!is_dir($path.'/'.$file)) {
if (isset($begin) && substr($file, 0, strlen($begin)) != $begin)
continue; // the file name doesn't begin with the good beginning
$stats = stat($path.'/'.$file);