data dir is unused, and could be a security hole in the way I'd intended it to be used...
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@854 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
parent
d1ce3db7e2
commit
3f0d6562ef
@ -210,13 +210,12 @@ function insert_defaults($dsn, $admin_name, $admin_pass) { // {{{
|
|||||||
function build_dirs() { // {{{
|
function build_dirs() { // {{{
|
||||||
if(!file_exists("images")) @mkdir("images"); // *try* and make default dirs. Ignore any errors --
|
if(!file_exists("images")) @mkdir("images"); // *try* and make default dirs. Ignore any errors --
|
||||||
if(!file_exists("thumbs")) @mkdir("thumbs"); // if something is amiss, we'll tell the user later
|
if(!file_exists("thumbs")) @mkdir("thumbs"); // if something is amiss, we'll tell the user later
|
||||||
if(!file_exists("data")) @mkdir("data");
|
|
||||||
|
|
||||||
if(
|
if(
|
||||||
((!file_exists("images") || !file_exists("thumbs") || !file_exists("data")) && !is_writable("./")) ||
|
((!file_exists("images") || !file_exists("thumbs")) && !is_writable("./")) ||
|
||||||
(!is_writable("images") || !is_writable("thumbs") || !is_writable("data"))
|
(!is_writable("images") || !is_writable("thumbs"))
|
||||||
) {
|
) {
|
||||||
print "Shimmie needs three folders in it's directory, 'images', 'thumbs', and 'data',
|
print "Shimmie needs two folders in it's directory, 'images' and 'thumbs',
|
||||||
and they need to be writable by the PHP user (if you see this error,
|
and they need to be writable by the PHP user (if you see this error,
|
||||||
if probably means the folders are owned by you, and they need to be
|
if probably means the folders are owned by you, and they need to be
|
||||||
writable by the web server).
|
writable by the web server).
|
||||||
@ -227,7 +226,6 @@ function build_dirs() { // {{{
|
|||||||
else {
|
else {
|
||||||
assert(file_exists("images") && is_writable("images"));
|
assert(file_exists("images") && is_writable("images"));
|
||||||
assert(file_exists("thumbs") && is_writable("thumbs"));
|
assert(file_exists("thumbs") && is_writable("thumbs"));
|
||||||
assert(file_exists("data") && is_writable("data"));
|
|
||||||
|
|
||||||
if(!file_exists("images/ff")) {
|
if(!file_exists("images/ff")) {
|
||||||
for($i=0; $i<256; $i++) {
|
for($i=0; $i<256; $i++) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user