Menu
▾
▴
[Tikiwiki-cvs] tiki tiki-export_wiki_pages.php,1.2,1.3 tiki-galleries.php,1.11,1.12 tiki-import_phpwiki.php,1.4,1.5 tiki-index.php,1.26,1.27 tiki-upload_image.php,1.15,1.16 tiki-view_articles.php,1.6,1.7
Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1:/tmp/cvs-serv12798
Modified Files:
tiki-export_wiki_pages.php tiki-galleries.php
tiki-import_phpwiki.php tiki-index.php tiki-upload_image.php
tiki-view_articles.php
Log Message:
Bugfixes
Index: tiki-export_wiki_pages.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-export_wiki_pages.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tiki-export_wiki_pages.php 21 Mar 2003 15:48:13 -0000 1.2
+++ tiki-export_wiki_pages.php 29 Mar 2003 03:03:19 -0000 1.3
@@ -8,7 +8,7 @@
header("location: dump/export.tar");
} else {
if(isset($_REQUEST["all"])) $all=0; else $all=1;
- $data = $tikilib->export_wiki_page($_REQUEST["page"],$all);
+ $data = $exportlib->export_wiki_page($_REQUEST["page"],$all);
$page=$_REQUEST["page"];
header("Content-type: application/unknown");
header( "Content-Disposition: inline; filename=$page" );
Index: tiki-galleries.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-galleries.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tiki-galleries.php 7 Mar 2003 20:15:14 -0000 1.11
+++ tiki-galleries.php 29 Mar 2003 03:03:20 -0000 1.12
@@ -1,6 +1,7 @@
<?php
// Initialization
require_once('tiki-setup.php');
+include_once("lib/imagegals/imagegallib.php");
// Now check permissions to access this page
/*
@@ -85,7 +86,7 @@
$smarty->assign('edited','y');
if($_REQUEST["galleryId"]>0) {
$info = $tikilib->get_gallery_info($_REQUEST["galleryId"]);
- $scaleinfo = $tikilib->get_gallery_scale_info($_REQUEST["galleryId"]);
+ $scaleinfo = $imagegallib->get_gallery_scale_info($_REQUEST["galleryId"]);
//$smarty->assign_by_ref('theme',$info["theme"]);
$smarty->assign_by_ref('name',$info["name"]);
$smarty->assign_by_ref('description',$info["description"]);
@@ -147,22 +148,22 @@
$public ='n';
}
$smarty->assign_by_ref('public',$public);
- $gid = $tikilib->replace_gallery($_REQUEST["galleryId"],$_REQUEST["name"],$_REQUEST["description"],'',$user,$_REQUEST["maxRows"],$_REQUEST["rowImages"],$_REQUEST["thumbSizeX"],$_REQUEST["thumbSizeY"],$public,$visible);
+ $gid = $imagegallib->replace_gallery($_REQUEST["galleryId"],$_REQUEST["name"],$_REQUEST["description"],'',$user,$_REQUEST["maxRows"],$_REQUEST["rowImages"],$_REQUEST["thumbSizeX"],$_REQUEST["thumbSizeY"],$public,$visible);
#add scales
if (isset($_REQUEST["scaleSizeX"]) && is_numeric($_REQUEST["scaleSizeX"])
&& isset($_REQUEST["scaleSizeY"]) && is_numeric($_REQUEST["scaleSizeY"]))
{
- $tikilib->add_gallery_scale($_REQUEST["galleryId"],$_REQUEST["scaleSizeX"],
+ $imagegallib->add_gallery_scale($_REQUEST["galleryId"],$_REQUEST["scaleSizeX"],
$_REQUEST["scaleSizeY"]);
}
#remove scales
- $scaleinfo = $tikilib->get_gallery_scale_info($_REQUEST["galleryId"]);
+ $scaleinfo = $imagegallib->get_gallery_scale_info($_REQUEST["galleryId"]);
# loop though scales to determine if a scale has to be removed
while (list ($num, $sci) = each ($scaleinfo)) {
$sizestr=$sci["xsize"]."x".$sci["ysize"];
if (isset($_REQUEST[$sizestr]) && $_REQUEST[$sizestr]=='on'){
- $tikilib->remove_gallery_scale($_REQUEST["galleryId"],$sci["xsize"],$sci["ysize"]);
+ $imagegallib->remove_gallery_scale($_REQUEST["galleryId"],$sci["xsize"],$sci["ysize"]);
}
}
@@ -186,7 +187,7 @@
die;
}
}
- $tikilib->remove_gallery($_REQUEST["removegal"]);
+ $imagegallib->remove_gallery($_REQUEST["removegal"]);
}
if(!isset($_REQUEST["sort_mode"])) {
Index: tiki-import_phpwiki.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-import_phpwiki.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tiki-import_phpwiki.php 2 Jan 2003 17:23:37 -0000 1.4
+++ tiki-import_phpwiki.php 29 Mar 2003 03:03:21 -0000 1.5
@@ -42,12 +42,14 @@
$smarty->assign('result','y');
if(isset($_REQUEST["import"])) {
-$h=opendir("phpwikidump/");
+$path = $_REQUEST["path"];
+$h=opendir("$path/");
$lines=Array();
while($file=readdir($h)) {
- if(is_file("phpwikidump/$file")) {
- $fp=fopen("phpwikidump/$file","r");
- $full=fread($fp,filesize("phpwikidump/$file"));
+ if(is_file("$path/$file")) {
+ $fp=fopen("$path/$file","r");
+ $full=fread($fp,filesize("$path/$file"));
+ //$full=htmlspecialchars($full);
fclose($fp);
$params = array('input' => $full,
'crlf' => "\r\n",
@@ -68,9 +70,12 @@
}
if(isset($part["pagename"])) {
// Parse the body replacing links to Tiki links
- //print_r($part);die;
+
$part["body"]=preg_replace("/ (http:\/\/[^ ]+) /"," [$1] ",$part["body"]);
$part["body"]=preg_replace("/\[(http:\/\/[^\]]+)\]/","{img src=$1}",$part["body"]);
+ $part["body"]=preg_replace("/\[([^\|\]]+)\]/","(($1))",$part["body"]);
+ $part["body"]=preg_replace("/\[([^\|]+)\|([^\]]+)\]/","(($1|$2))",$part["body"]);
+
$pagename=urldecode($part["pagename"]);
$version=urldecode($part["version"]);
$author=urldecode($part["author"]);
Index: tiki-index.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-index.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- tiki-index.php 27 Mar 2003 19:50:00 -0000 1.26
+++ tiki-index.php 29 Mar 2003 03:03:21 -0000 1.27
@@ -4,6 +4,7 @@
include_once('lib/structures/structlib.php');
include_once('lib/wiki/wikilib.php');
+
if($feature_wiki != 'y') {
$smarty->assign('msg',tra("This feature is disabled"));
$smarty->display("styles/$style_base/error.tpl");
@@ -38,7 +39,6 @@
-
require_once('tiki-pagesetup.php');
@@ -90,7 +90,6 @@
// Get page data
$info = $tikilib->get_page_info($page);
-
$smarty->assign('page_user',$info['user']);
Index: tiki-upload_image.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-upload_image.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- tiki-upload_image.php 21 Mar 2003 15:48:17 -0000 1.15
+++ tiki-upload_image.php 29 Mar 2003 03:03:21 -0000 1.16
@@ -59,7 +59,7 @@
}
- $gal_info = $tikilib->get_gallery($_REQUEST["galleryId"]);
+ $gal_info = $imagegallib->get_gallery($_REQUEST["galleryId"]);
if($gal_info["thumbSizeX"]==0) $gal_info["thumbSizeX"]=80;
if($gal_info["thumbSizeY"]==0) $gal_info["thumbSizeY"]=80;
// Check the user to be admin or owner or the gallery is public
@@ -161,9 +161,7 @@
} else {
$name=$_REQUEST["name"];
}
-
if(isset($data)) {
-
if(!$up_thumb) {
if(function_exists("ImageCreateFromString")&&(!strstr($type,"gif"))) {
$img = imagecreatefromstring($data);
@@ -180,7 +178,7 @@
imagecopyresampled($t, $img, 0,0,0,0, $tw,$ty, $size_x, $size_y);
} else {
$t = imagecreate($tw,$ty);
- $tikilib->ImageCopyResampleBicubic( $t, $img, 0,0,0,0, $tw,$ty, $size_x, $size_y);
+ $imagegallib->ImageCopyResampleBicubic( $t, $img, 0,0,0,0, $tw,$ty, $size_x, $size_y);
}
// CHECK IF THIS TEMP IS WRITEABLE OR CHANGE THE PATH TO A WRITEABLE DIRECTORY
//$tmpfname = 'temp.jpg';
@@ -194,11 +192,11 @@
$t_pinfo = pathinfo($tmpfname);
$t_type = $t_pinfo["extension"];
$t_type='image/'.$t_type;
-
- $imageId = $tikilib->insert_image($_REQUEST["galleryId"],$name,$_REQUEST["description"],$filename, $type, $data, $size, $size_x, $size_y, $user,$t_data,$t_type);
+
+ $imageId = $imagegallib->insert_image($_REQUEST["galleryId"],$name,$_REQUEST["description"],$filename, $type, $data, $size, $size_x, $size_y, $user,$t_data,$t_type);
} else {
$tmpfname='';
- $imageId = $tikilib->insert_image($_REQUEST["galleryId"],$name,$_REQUEST["description"],$filename, $type, $data, $size, 0, 0, $user,'','');
+ $imageId = $imagegallib->insert_image($_REQUEST["galleryId"],$name,$_REQUEST["description"],$filename, $type, $data, $size, 0, 0, $user,'','');
}
} else {
if(function_exists("ImageCreateFromString")&&(!strstr($type,"gif"))) {
@@ -210,7 +208,7 @@
$size_y = 0;
}
- $imageId = $tikilib->insert_image($_REQUEST["galleryId"],$name,$_REQUEST["description"],$filename, $type, $data, $size, $size_x, $size_y, $user,$thumb_data,$thumb_type);
+ $imageId = $imagegallib->insert_image($_REQUEST["galleryId"],$name,$_REQUEST["description"],$filename, $type, $data, $size, $size_x, $size_y, $user,$thumb_data,$thumb_type);
}
if(!$imageId) {
@@ -234,9 +232,9 @@
$smarty->assign('galleryId','');
}
if($tiki_p_admin_galleries != 'y') {
- $galleries = $tikilib->list_visible_galleries(0,-1,'lastModif_desc', $user,'');
+ $galleries = $imagegallib->list_visible_galleries(0,-1,'lastModif_desc', $user,'');
} else {
- $galleries = $tikilib->list_galleries(0,-1,'lastModif_desc', $user,'');
+ $galleries = $imagegallib->list_galleries(0,-1,'lastModif_desc', $user,'');
}
for($i=0;$i<count($galleries["data"]);$i++) {
if($userlib->object_has_one_permission($galleries["data"][$i]["galleryId"],'image gallery')) {
Index: tiki-view_articles.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-view_articles.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tiki-view_articles.php 1 Jan 2003 23:15:07 -0000 1.6
+++ tiki-view_articles.php 29 Mar 2003 03:03:22 -0000 1.7
@@ -82,7 +82,6 @@
// Get a list of last changes to the Wiki database
$listpages = $tikilib->list_articles(0,$maxArticles,$sort_mode,$find,$pdate,$user);
-
for($i=0;$i<count($listpages["data"]);$i++) {
$listpages["data"][$i]["parsed_heading"] = $tikilib->parse_data($listpages["data"][$i]["heading"]);
}
|