X-Git-Url: https://dev.renevier.net/gitweb.cgi?p=syp.git;a=blobdiff_plain;f=inc%2Futils.php;h=84cbeb535ea5018048098a74262367a565d8dfe4;hp=b093b0bae870837ed9d7f64262e27870218d8842;hb=5927a0dc28715b6e5ab297f1f5badd35df15a5b8;hpb=259b6d11bb6d0233343744c0452358293d5be517 diff --git a/inc/utils.php b/inc/utils.php index b093b0b..84cbeb5 100644 --- a/inc/utils.php +++ b/inc/utils.php @@ -2,7 +2,9 @@ /* Copyright (c) 2009 Arnaud Renevier, Inc, published under the modified BSD license. */ -require_once ("inc/settings.php"); +// using include because that file may be sourced even if config file has not +// been created. +@include_once ("inc/settings.php"); function getthumbsdir () { if (THUMBSDIR) { @@ -181,38 +183,33 @@ function create_thumbnail ($filename, $destfile) { return true; } -function safe_create_dir ($dirname) { - if (is_dir ($dirname)) { - return; +function delete_from_ftp ($file) { + $ftp_conn = ftp_connect (FTPSERVER); + $login = ftp_login ($ftp_conn, FTPUSER, FTPPASS); + if ((!$ftp_conn) || (!$login)) { + server_error (); } - if (file_exists ($dirname)) { - par_error ($dirname . ": " . trans ('exist but is not a directory')); - } - if (!mkdir ($dirname)) { - par_error ($dirname . ": " . trans ('could not create directory')); - } else { - par_success ($dirname . ": " . trans ('directory created')); + $target = sprintf ("%s/%s", FTPROOTDIR, $file); + $deleted = ftp_delete ($ftp_conn, $target); + + if (!$deleted) { + server_error (); } + ftp_close ($ftp_conn); } -function safe_create_writable_dir ($dirname) { - safe_create_dir ($dirname); - if (!is_writeable ($dirname) || !is_executable ($dirname)) { - par_error ($dirname . ": " . trans ('could not write in directory')); +function send_to_ftp ($file) { + $ftp_conn = ftp_connect (FTPSERVER); + $login = ftp_login ($ftp_conn, FTPUSER, FTPPASS); + if ((!$ftp_conn) || (!$login)) { + server_error (); } -} + $dest = sprintf ("%s/%s", FTPROOTDIR, $file); + $upload = ftp_put ($ftp_conn, $dest, $file, FTP_BINARY); -function leave () { - exit ("\n"); -} -function par_success ($message) { - printf ("

%s

", $message); -} -function par_error ($message) { - printf ("

%s

", $message); - leave (); -} -function par_warn ($message) { - printf ("

%s

", $message); + if (!$upload) { + server_error (); + } + ftp_close ($ftp_conn); } ?>