Big change, sir. Can now upload any kind of files.

15 files changed, 201 insertions, 209 deletions

diff --git a/lib/conf/apps.php b/lib/conf/apps.php
index 8afeb2d..8e755b1 100644
--- a/lib/conf/apps.php
+++ b/lib/conf/apps.php
@@ -5,7 +5,7 @@ $homepage = "blog";
 $apps = array(
 	
 	// Image upload application
-	"image" => array(
+	"file" => array(
 		"index" => 1,
 		"delete" => 1,
 		"editinfo" => 1,
diff --git a/lib/conf/file.php b/lib/conf/file.php
new file mode 100644
index 0000000..4a8830e
--- /dev/null
+++ b/lib/conf/file.php
@@ -0,0 +1,13 @@
+<?php
+
+$baseurl = "http://localhost/alex.auvolat/files/";
+$savedir = getcwd() . "/files/";
+
+$img_mini_width = 127;
+
+function has_mini($ext) {
+	return $ext == "jpg" || $ext == "jpeg" || $ext == "png" || $ext == "gif";
+}
+
+//$quota = 128;;	//ceil((time() - 1220000000) / (3600 * 24 * 20));
+//$min_priv_for_no_quota = 2;
diff --git a/lib/conf/image.php b/lib/conf/image.php
deleted file mode 100644
index 462300e..0000000
--- a/lib/conf/image.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$baseurl = "http://localhost/alex.auvolat/images/";
-$savedir = getcwd() . "/images/";
-$miniature_width = 127;
-//$quota = 128;;	//ceil((time() - 1220000000) / (3600 * 24 * 20));
-//$min_priv_for_no_quota = 2;
diff --git a/lib/file/delete.php b/lib/file/delete.php
new file mode 100644
index 0000000..1a65058
--- /dev/null
+++ b/lib/file/delete.php
@@ -0,0 +1,21 @@
+<?php
+
+require("lib/conf/file.php");
+
+$title = "Delete a file";
+
+if (count($args) < 3) header("location: index.php");
+$id = intval($args[2]);
+
+$info = mysql_fetch_assoc(sql("SELECT * FROM files WHERE id = $id"));
+
+if ($info["owner"] == $user["id"]) {
+	token_validate("Do you really want to delete this file ?", "file");
+	if (has_mini($info["extension"])) unlink($savedir . $id . "-min." . $info["extension"]);
+	unlink($savedir . $id . "." . $info["extension"]);
+	sql("DELETE FROM files WHERE id = $id");
+	header("location: file");
+} else {
+	$error = "You cannot delete this file.";
+}
+require("tpl/general/empty.php");
diff --git a/lib/image/delfld.php b/lib/file/delfld.php
index a018b7a..c1cacf0 100644
--- a/lib/image/delfld.php
+++ b/lib/file/delfld.php
@@ -1,16 +1,16 @@
 <?php
 
-assert_redir(count($args) >= 3, 'image');
+assert_redir(count($args) >= 3, 'file');
 $fldid = intval($args[2]);
 
 $fld = mysql_fetch_assoc(sql(
 	"SELECT id, name, comment, public, owner ".
-	"FROM img_folders WHERE id = $fldid"
+	"FROM folders WHERE id = $fldid"
 	));
 assert_error($fld && $fld['owner'] == $user['id'],
 	"This folder does not exist, or you are not allowed to edit it.");
 
-token_validate("Do you really want to delete this folder ?", "folder-image-$fldid");
-sql("DELETE FROM img_folders WHERE id = $fldid");
-sql("UPDATE images SET folder = 0 WHERE folder = $fldid");
-header("location: image");
+token_validate("Do you really want to delete this folder ?", "folder-file-$fldid");
+sql("DELETE FROM folders WHERE id = $fldid");
+sql("UPDATE files SET folder = 0 WHERE folder = $fldid");
+header("location: file");
diff --git a/lib/image/editfld.php b/lib/file/editfld.php
index a0bef1f..db5a304 100644
--- a/lib/image/editfld.php
+++ b/lib/file/editfld.php
@@ -2,12 +2,12 @@
 
 require("lib/markdown.php");
 
-assert_redir(count($args) == 3, 'image');
+assert_redir(count($args) == 3, 'file');
 $fldid = intval($args[2]);
 
 $fld = mysql_fetch_assoc(sql(
 	"SELECT id, name, comment, public, owner ".
-	"FROM img_folders WHERE id = $fldid"
+	"FROM folders WHERE id = $fldid"
 	));
 assert_error($fld && $fld['owner'] == $user['id'],
 	"This folder does not exist, or you are not allowed to edit it.");
@@ -23,10 +23,10 @@ if (isset($_POST['name']) && isset($_POST['comment'])) {
 	if ($fld_name == "") {
 		$error = "You must enter a name for your folder.";
 	} else {
-		sql("UPDATE img_folders SET name = '" . escs($fld_name) . "', comment = '" . escs($fld_comment) .
+		sql("UPDATE folders SET name = '" . escs($fld_name) . "', comment = '" . escs($fld_comment) .
 			"', comment_html = '" . escs($fld_comment_html) . "', public = " . ($fld_public?'1':'0') .
 			" WHERE id = $fldid");
-		header("Location: folder-image-" . $fldid);
+		header("Location: folder-file-" . $fldid);
 		die();
 	}
 	
@@ -34,7 +34,7 @@ if (isset($_POST['name']) && isset($_POST['comment'])) {
 
 $title = "Edit folder";
 $fields = array(
-	array("label" => "Name : ", "name" => "name", "value" => $fld_name),
+	array("label" => "Folder name : ", "name" => "name", "value" => $fld_name),
 	array("label" => "Public ? ", "name" => "public", "type" => "checkbox", "checked" => $fld_public),
 	array("label" => "Comment : ", "name" => "comment", "type" => "textarea", "value" => $fld_comment),
 	);
diff --git a/lib/image/editinfo.php b/lib/file/editinfo.php
index 8223c18..eea9f35 100644
--- a/lib/image/editinfo.php
+++ b/lib/file/editinfo.php
@@ -2,20 +2,20 @@
 
 require("lib/markdown.php");
 
-require("lib/conf/image.php");
+require("lib/conf/file.php");
 
-$title = "Rename an image";
+$title = "Rename a file";
 
 if (count($args) < 3) header("location: index.php");
 $id = intval($args[2]);
 
 $info = mysql_fetch_assoc(sql(
-	"SELECT images.owner AS owner, images.id AS id, images.name AS name, images.comment AS comment,
-		img_folders.id AS folder_id, img_folders.name AS folder_name
-		FROM images LEFT JOIN img_folders ON images.folder = img_folders.id WHERE images.id = $id"
+	"SELECT files.owner AS owner, files.id AS id, files.name AS name, files.comment AS comment,
+		folders.id AS folder_id, folders.name AS folder_name
+		FROM files LEFT JOIN folders ON files.folder = folders.id WHERE files.id = $id"
 ));
 
-assert_error($info["owner"] == $user["id"], "You cannot rename this image.");
+assert_error($info["owner"] == $user["id"], "You cannot rename this file.");
 
 $name = $info['name'];
 $comment = $info['comment'];
@@ -26,23 +26,23 @@ if (isset($_POST['name']) && isset($_POST['comment']) && isset($_POST['folder'])
 	$comment_html = Markdown($comment);
 	$folder = intval($_POST['folder']);
 	if ($name == "") {
-		$error = "You must give a non-empty name to this image. Please.";
+		$error = "You must give a non-empty name to this file. Please.";
 	} else {
-		sql("UPDATE images SET name = '" . escs($name) . "', comment='" . escs($comment). "',
+		sql("UPDATE files SET name = '" . escs($name) . "', comment='" . escs($comment). "',
 				comment_html = '" . escs($comment_html) . "', folder = $folder WHERE id = $id");
-		header("Location: image");
+		header("Location: file");
 		die();
 	}
 }
 
 $folders = array(0 => "[no folder]");
-$r = sql("SELECT id, name FROM img_folders WHERE owner = " . $user['id'] . " ORDER BY name ASC");
+$r = sql("SELECT id, name FROM folders WHERE owner = " . $user['id'] . " ORDER BY name ASC");
 while ($n = mysql_fetch_array($r))
 	$folders[$n['id']] = $n['name'];
 
-$title = "Edit image info : " . $info['name'];
+$title = "Edit file info : " . $info['name'];
 $fields = array(
-	array("label" => "Name : ", "name" => "name", "value" => $name),
+	array("label" => "File name : ", "name" => "name", "value" => $name),
 	array("label" => "Folder : ", "type" => "select", "name" => "folder", "choices" => $folders, "value" => $folder),
 	array("label" => "Comment : ", "name" => "comment", "value" => $comment, "type" => "textarea"),
 );
diff --git a/lib/file/folder.php b/lib/file/folder.php
new file mode 100644
index 0000000..15e8625
--- /dev/null
+++ b/lib/file/folder.php
@@ -0,0 +1,43 @@
+<?php
+
+require("lib/conf/file.php");
+
+assert_redir(count($args) == 3, 'file');
+$fldid = intval($args[2]);
+
+$fld = mysql_fetch_assoc(sql(
+	"SELECT folders.id AS id, folders.name AS name, folders.comment_html AS comment_html, ".
+	"folders.public AS public, account.id AS owner, account.login AS ownername FROM folders ".
+	"LEFT JOIN account ON account.id = folders.owner ".
+	"WHERE folders.id = $fldid"
+));
+assert_error($fld && ($fld['public'] != 0 || $fld['owner'] == $user['id']),
+	"This folder does not exist, or you are not allowed to see it.");
+
+$can_edit = ($user['priv'] >= $apps['file']['editfld'] && $user['id'] == $fld['owner']);
+$is_owner = ($user['id'] == $fld['owner']);
+
+$filters = array (
+	"order" => array (
+			"name" => "title",
+			"upl_date" => "date uploaded",
+		),
+	"way" => $ord_ways,
+);
+$fdefaults = array (
+	"order" => "name",
+	"way" => "ASC",
+);
+
+$title = $fld["name"];
+
+$files = array();
+$fileq = sql("SELECT files.id AS id, files.name AS name, files.extension AS extension, files.upl_date AS upl_date, ".
+	"files.comment_html AS comment_html FROM files WHERE files.folder = $fldid");
+while ($img = mysql_fetch_assoc($fileq)) $files[] = $img;
+
+$s = sql("SELECT id, name FROM folders WHERE owner = " . $fld['owner'] . ($fld['owner'] == $user['id'] ? '' : " AND public != 0"). " ORDER BY name ASC");
+$folers = array();
+while ($f = mysql_fetch_assoc($s)) $folders[] = $f;
+
+require("tpl/file/folder.php");
diff --git a/lib/file/index.php b/lib/file/index.php
new file mode 100644
index 0000000..34686c5
--- /dev/null
+++ b/lib/file/index.php
@@ -0,0 +1,44 @@
+<?php
+
+require("lib/conf/file.php");
+
+$filters = array (
+	"order" => array (
+			"name" => "title",
+			"upl_date" => "date uploaded",
+			"folder_name" => "folder",
+		),
+	"way" => $ord_ways,
+);
+$fdefaults = array (
+	"order" => "upl_date",
+	"way" => "DESC",
+);
+
+$title = "Image upload";
+
+$files = array();
+$fileq = sql("SELECT files.id AS id, files.name AS name, files.extension AS extension, files.upl_date AS upl_date, ".
+				"files.comment_html AS comment_html, folders.id AS folder_id, folders.name AS folder_name ".
+				" FROM files LEFT JOIN folders ON folders.id = files.folder ".
+				"WHERE files.owner = " . $user['id'] .
+	" ORDER BY " . get_filter('order') . " " . get_filter('way'));
+while ($img = mysql_fetch_assoc($fileq)) $files[] = $img;
+
+if ($user['priv'] < $apps['file']['upload']) {
+	$error = "You don't have the rights to upload files.";
+	$can_upload = false;
+} else {
+	$can_upload = true;
+}
+
+$folders = array();
+$r = sql("SELECT id, name FROM folders WHERE owner = " . $user['id'] . " ORDER BY name ASC");
+while ($f = mysql_fetch_assoc($r)) {
+	$folders[] = $f;
+}
+
+$can_delete = ($user['priv'] >= $apps['file']['delete'] && $user['id'] != 0);
+$can_rename = ($user['priv'] >= $apps['file']['editinfo'] && $user['id'] != 0);
+
+require("tpl/file/index.php");
diff --git a/lib/image/newfld.php b/lib/file/newfld.php
index 63afd17..6b5ba1f 100644
--- a/lib/image/newfld.php
+++ b/lib/file/newfld.php
@@ -13,10 +13,10 @@ if (isset($_POST['name']) && isset($_POST['comment'])) {
 	if ($fld_name == "") {
 		$error = "You must enter a name for your folder.";
 	} else {
-		sql("INSERT INTO img_folders(owner, name, comment, comment_html, public) ".
+		sql("INSERT INTO folders(owner, name, comment, comment_html, public) ".
 			"VALUES(" . $user['id'] . ", '" . escs($fld_name) . "', '" . escs($fld_comment) .
 			"', '" . escs($fld_comment_html) . "', " . ($fld_public ? '1' : '0') . ")");
-		header("Location: folder-image-" . mysql_insert_id());
+		header("Location: folder-file-" . mysql_insert_id());
 		die();
 	}
 }
diff --git a/lib/file/upload.php b/lib/file/upload.php
new file mode 100644
index 0000000..4b5299d
--- /dev/null
+++ b/lib/file/upload.php
@@ -0,0 +1,54 @@
+<?php
+
+$title = "Upload a file";
+
+require("lib/conf/file.php");
+
+
+if (isset($_FILES['file']) && isset($_POST['name'])) {
+	$name = esca($_POST['name']);
+	if ($name == "") $name = $_FILES['file']['name'];
+	if ($_FILES['file']['error'] != 0) {
+		$error = "Sorry, an error occurred while uploading your file. Try with a smaller one.";
+		require("tpl/file/upload.php");
+	}
+	$origname = strtolower(basename($_FILES['file']['name']));
+	$type = preg_replace("#^.+\.([a-z0-9]+)$#", "$1", $origname);
+
+	sql("INSERT INTO files(owner, extension, name, upl_date) VALUES(" . $user['id'] . ", '$type', '" . escs($name) . "', NOW())");
+	$id = mysql_insert_id();
+	$filen = $savedir . $id . "." . $type;
+	if (!copy($_FILES['file']['tmp_name'], $filen)) {
+		$error = "An internal error occurred. You might want to try again later.";
+		sql("DELETE FROM files WHERE id = $id");
+		require("tpl/file/upload.php");
+	}
+
+	if (has_mini($type)) {
+		$minin = $savedir . $id . "-min." . $type;
+		if ($type == "png")
+			$source = imagecreatefrompng($filen); 
+		elseif ($type == "jpg" || $type == "jpeg")
+			$source = imagecreatefromjpeg($filen);
+		elseif ($type == "gif")
+			$source = imagecreatefromgif($filen);
+		$l = imagesx($source);
+		$h = imagesy($source);
+		$l2 = $img_mini_width;
+		$h2 = $l2 * $h / $l;
+		$mini = imagecreatetruecolor($l2, $h2);
+		imagecopyresampled($mini, $source, 0, 0, 0, 0, $l2, $h2, $l, $h);
+		if ($type == "png")
+			imagepng($mini, $minin);
+		elseif ($type == "jpg")
+			imagejpeg($mini, $minin);
+		elseif ($type == "gif")
+			imagegif($mini, $minin);
+		$message = "Your image has been uploaded successfully and a miniature has been created.";
+	} else {
+		$message = "Your file has been uploaded successfully.";
+	}
+	require("tpl/file/upload-ok.php");
+} else {
+	require("tpl/file/upload.php");
+}
diff --git a/lib/image/delete.php b/lib/image/delete.php
deleted file mode 100644
index e6716ec..0000000
--- a/lib/image/delete.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-require("lib/conf/image.php");
-
-$title = "Delete an image";
-
-if (count($args) < 3) header("location: index.php");
-$id = intval($args[2]);
-
-$info = mysql_fetch_assoc(sql("SELECT * FROM images WHERE id = $id"));
-
-if ($info["owner"] == $user["id"]) {
-	token_validate("Do you really want to delete this image ?", "image");
-	unlink($savedir . $id . "-min." . $info["extension"]);
-	unlink($savedir . $id . "." . $info["extension"]);
-	sql("DELETE FROM images WHERE id = $id");
-	header("location: image");
-} else {
-	$error = "You cannot delete this image.";
-}
-require("tpl/general/empty.php");
diff --git a/lib/image/folder.php b/lib/image/folder.php
deleted file mode 100644
index 574531c..0000000
--- a/lib/image/folder.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-require("lib/conf/image.php");
-
-assert_redir(count($args) == 3, 'image');
-$fldid = intval($args[2]);
-
-$fld = mysql_fetch_assoc(sql(
-	"SELECT img_folders.id AS id, img_folders.name AS name, img_folders.comment_html AS comment_html, ".
-	"img_folders.public AS public, account.id AS owner, account.login AS ownername FROM img_folders ".
-	"LEFT JOIN account ON account.id = img_folders.owner ".
-	"WHERE img_folders.id = $fldid"
-));
-assert_error($fld && ($fld['public'] != 0 || $fld['owner'] == $user['id']),
-	"This folder does not exist, or you are not allowed to see it.");
-
-$can_edit = ($user['priv'] >= $apps['image']['editfld'] && $user['id'] == $fld['owner']);
-$is_owner = ($user['id'] == $fld['owner']);
-
-$filters = array (
-	"order" => array (
-			"name" => "title",
-			"upl_date" => "date uploaded",
-		),
-	"way" => $ord_ways,
-);
-$fdefaults = array (
-	"order" => "name",
-	"way" => "ASC",
-);
-
-$title = $fld["name"];
-
-$images = array();
-$files = sql("SELECT images.id AS id, images.name AS name, images.extension AS extension, images.upl_date AS upl_date, ".
-	"images.comment_html AS comment_html FROM images WHERE images.folder = $fldid");
-while ($img = mysql_fetch_assoc($files)) $images[] = $img;
-
-$s = sql("SELECT id, name FROM img_folders WHERE owner = " . $fld['owner'] . ($fld['owner'] == $user['id'] ? '' : " AND public != 0"). " ORDER BY name ASC");
-$folers = array();
-while ($f = mysql_fetch_assoc($s)) $folders[] = $f;
-
-require("tpl/image/folder.php");
diff --git a/lib/image/index.php b/lib/image/index.php
deleted file mode 100644
index b9748dc..0000000
--- a/lib/image/index.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-require("lib/conf/image.php");
-
-$filters = array (
-	"order" => array (
-			"name" => "title",
-			"upl_date" => "date uploaded",
-			"folder_name" => "folder",
-		),
-	"way" => $ord_ways,
-);
-$fdefaults = array (
-	"order" => "name",
-	"way" => "ASC",
-);
-
-$title = "Image upload";
-
-$images = array();
-$files = sql("SELECT images.id AS id, images.name AS name, images.extension AS extension, images.upl_date AS upl_date, ".
-				"images.comment_html AS comment_html, img_folders.id AS folder_id, img_folders.name AS folder_name ".
-				" FROM images LEFT JOIN img_folders ON img_folders.id = images.folder ".
-				"WHERE images.owner = " . $user['id'] .
-	" ORDER BY " . get_filter('order') . " " . get_filter('way'));
-while ($img = mysql_fetch_assoc($files)) $images[] = $img;
-
-/*if (count($images) >= $quota && $user['priv'] < $min_priv_for_no_quota) {
-	$error = "You have already exceeded your quota of $quota uploadable images.";
-	$can_upload = false;
-} else */
-
-if ($user['priv'] < $apps['image']['upload']) {
-	$error = "You don't have the rights to upload images.";
-	$can_upload = false;
-} else {
-	$can_upload = true;
-}
-
-$folders = array();
-$r = sql("SELECT id, name FROM img_folders WHERE owner = " . $user['id'] . " ORDER BY name ASC");
-while ($f = mysql_fetch_assoc($r)) {
-	$folders[] = $f;
-}
-
-$can_delete = ($user['priv'] >= $apps['image']['delete'] && $user['id'] != 0);
-$can_rename = ($user['priv'] >= $apps['image']['editinfo'] && $user['id'] != 0);
-
-require("tpl/image/index.php");
diff --git a/lib/image/upload.php b/lib/image/upload.php
deleted file mode 100644
index 5176a3a..0000000
--- a/lib/image/upload.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-$title = "Upload an image";
-
-require("lib/conf/image.php");
-
-/*
-$number = mysql_fetch_assoc(sql("SELECT count(*) AS count FROM images WHERE owner = " . $user['id']));
-assert_error($number['count'] < $quota || $user['priv'] >= $min_priv_for_no_quota || $user['id'] == 0,
-	"You have already exceeded your upload quota.");
-*/
-
-if (isset($_FILES['image']) && isset($_POST['name'])) {
-	$name = esca($_POST['name']);
-	if ($name == "") $name = $_FILES['image']['name'];
-	if ($_FILES['image']['error'] != 0) {
-		$error = "Sorry, an error occurred while uploading your file. Try with a smaller one.";
-		require("tpl/image/upload.php");
-	}
-	$origname = strtolower(basename($_FILES['image']['name']));
-	if (preg_match("#\.png$#",$origname)) {
-		$type = "png";
-	} elseif (preg_match("#\.gif$#",$origname)) {
-		$type = "gif";
-	} elseif (preg_match("#\.jpg$#",$origname) or preg_match("#\.jpeg$#",$origname)) {
-		$type = "jpg";
-	} else {
-		$error = "Sorry, we only accept GIF, PNG and JPEG images.";
-		require("tpl/image/upload.php");
-	}
-	sql("INSERT INTO images(owner, extension, name, upl_date) VALUES(" . $user['id'] . ", '$type', '" . escs($name) . "', NOW())");
-	$id = mysql_insert_id();
-	$filen = $savedir . $id . "." . $type;
-	$minin = $savedir . $id . "-min." . $type;
-	if (!copy($_FILES['image']['tmp_name'], $filen)) {
-		$error = "An internal error occurred. You might want to try again later.";
-		sql("DELETE FROM images WHERE id = $id");
-		require("tpl/image/upload.php");
-	}
-
-	if ($type == "png")
-		$source = imagecreatefrompng($filen); 
-	elseif ($type == "jpg")
-		$source = imagecreatefromjpeg($filen);
-	elseif ($type == "gif")
-		$source = imagecreatefromgif($filen);
-	$l = imagesx($source);
-	$h = imagesy($source);
-	$l2 = $miniature_width;
-	$h2 = $l2 * $h / $l;
-	$mini = imagecreatetruecolor($l2, $h2);
-	imagecopyresampled($mini, $source, 0, 0, 0, 0, $l2, $h2, $l, $h);
-	if ($type == "png")
-		imagepng($mini, $minin);
-	elseif ($type == "jpg")
-		imagejpeg($mini, $minin);
-	elseif ($type == "gif")
-		imagegif($mini, $minin);
-	$message = "Your image has been uploaded successfully.";
-	require("tpl/image/upload-ok.php");
-} else {
-	require("tpl/image/upload.php");
-}