X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=admin_files.php;h=d32b14d26e00405e867821d9aeefae537d2a711f;hb=9cd73aa3d18a76feb8fe640071c9e7e90abf4f8f;hp=56db7ca98ffc9cc2adf5ecd8675fd461cd53fd25;hpb=be246293072b9e3b10aa10219dbfcb575cc955a8;p=wfpl-cms.git

diff --git a/admin_files.php b/admin_files.php
index 56db7ca..d32b14d 100644
--- a/admin_files.php
+++ b/admin_files.php
@@ -1,21 +1,6 @@
 <?php
 
-# This form requires wfpl. See: http://jasonwoof.org/wfpl
-
-# This form was initially auto-generated. If you would like to alter the
-# parameters and generate a new one try this URL:
-#
-# http://metaform.l/?file_name=admin_files&table_name=files&singular=file&plural=files&opt_email=No&opt_db=Yes&opt_listing=Yes&opt_display=No&opt_pass=Yes&opt_public_form=No&opt_public_display=No&fields=filename+file%0D%0Adescription+textbox&edit=yes
-
-
-# SETUP
-
-# To save results to a database, you'll need to create the files table
-# (the file admin_files.sql should help with this), and create the file
-# 'code/db_connect.php' which calls db_connect() see:
-# code/wfpl/examples/db_connect.php
-#
-# if you rename any of the database fields, you'll need to update this:
+# This form requires wfpl. See: http://sametwice.com/wfpl
 
 define('ADMIN_FILES_DB_FIELDS', 'filename,description');
 
@@ -27,9 +12,9 @@ $GLOBALS['upload_directory'] = 'files/';
 $GLOBALS['filename_file_name'] = uniqid() . getmypid() . '.txt';
 
 
-require_once('code/wfpl/format.php');
-require_once('code/wfpl/email.php');
-require_once('code/wfpl/upload.php');
+require_once(__DIR__.'/'.'inc/wfpl/format.php');
+require_once(__DIR__.'/'.'inc/wfpl/email.php');
+require_once(__DIR__.'/'.'inc/wfpl/upload.php');
 
 function admin_files_get_fields() {
 	$data = array();
@@ -39,7 +24,7 @@ function admin_files_get_fields() {
 	#header('Content-Type: text/plain');
 	#print_r(array($_REQUEST['filename'], $_FILES['filename']));
 	#exit();
-	$filename_filename_tmp = format_filename($_FILES['filename']['name']);
+	$filename_filename_tmp = format_filename($_FILES['filename']['name'], true);
 	if(!$filename_filename_tmp) {
 		$filename_filename_tmp = $GLOBALS['filename_file_name'];
 	}
@@ -49,7 +34,7 @@ function admin_files_get_fields() {
 		if(_REQUEST_cut('delete_filename') == 'Yes') {
 			$data['filename'] = '';
 		} else {
-			$data['filename'] = format_path(_REQUEST_cut('old_filename'));
+			$data['filename'] = format_path(_REQUEST_cut('old_filename'), true);
 		}
 	}
 	unset($_FILES['filename']);
@@ -59,12 +44,7 @@ function admin_files_get_fields() {
 
 
 function admin_files_main() {
-	if(logged_in_as_admin()) {
-		tem_set('admin_privs');
-	} else {
-		$_REQUEST['url'] = this_url();
-		return 'admin_login';
-	}
+	session_auth_must('admin_files');
 
 	$id = _REQUEST_cut('edit_id');
 	if($id) {
@@ -93,8 +73,14 @@ function admin_files_main() {
 }
 
 function admin_files_main_delete($id) {
-	db_delete('files', 'where id=%i', $id);
-	message('File deleted.');
+	$fn = db_get_value('files', 'filename', 'where id=%i', $id);
+	if ($fn) {
+		unlink($fn);
+		db_delete('files', 'where id=%i', $id);
+		message('File deleted.');
+	} else {
+		message("Couldn't find file to delete. Maybe it's already been deleted?");
+	}
 	return './admin_files';
 }