made OB_UPLOADs mandatory, added to checker

Author: hinanaya

config.sample.php

@@ -12,6 +12,7 @@
 define('OB_HASH_SALT', 'CHANGEMEPLEASE'); // change to random characters for password salt.
 
 // make sure the following directories are writable by the web server.
+define('OB_UPLOADS', '/where/to/put/uploads');
 define('OB_MEDIA', '/where/to/put/media');
 define('OB_MEDIA_UNAPPROVED', '/where/to/put/media/unapproved'); // can be subdirectory of OB_MEDIA, but doesn't need to be.
 define('OB_MEDIA_ARCHIVE', '/where/to/put/media/archive'); // can be subdirectory of OB_MEDIA, but doesn't need to be.
@@ -53,9 +54,6 @@
 // where to media file versions (default is OB_MEDIA/versions)
 // define('OB_MEDIA_VERSIONS','/where/to/put/media/versions');
 
-// set a custom uploads directory (required for multisite installations)
-// define('OB_UPLOADS', '/where/to/put/uploads');
-
 // disable language/translation demos (translated using Google Translate, will contain many errors)
 // define('OB_DISABLE_LANGUAGE_DEMOS',TRUE);
 

core/init.php

@@ -43,9 +43,6 @@
 }
 
 // set defaults if not set
-if (!defined('OB_UPLOADS')) {
-    define('OB_UPLOADS', OB_LOCAL . '/uploads');
-}
 if (!defined('OB_MEDIA_FILESIZE_LIMIT')) {
     define('OB_MEDIA_FILESIZE_LIMIT', 1024);
 }

public/updates/checker.php

@@ -128,6 +128,9 @@ public function config_file_valid()
         if (!defined('OB_HASH_SALT')) {
             $errors[] = 'OB_HASH_SALT (password hash salt) not set.';
         }
+        if (!defined('OB_UPLOADS')) {
+            $errors[] = 'OB_UPLOADS (uploads directory) not set.';
+        }
         if (!defined('OB_MEDIA')) {
             $errors[] = 'OB_MEDIA (media directory) not set.';
         }
@@ -236,6 +239,12 @@ public function directories_valid()
     {
         $errors = [];
 
+        if (!is_dir(OB_UPLOADS)) {
+            $errors[] = 'OB_UPLOADS (uploads directory) is not a valid directory.';
+        } elseif (!is_writable(OB_UPLOADS)) {
+            $errors[] = 'OB_UPLOADS (uploads directory) is not writable by the server.';
+        }
+
         if (!is_dir(OB_MEDIA)) {
             $errors[] = 'OB_MEDIA (media directory) is not a valid directory.';
         } elseif (!is_writable(OB_MEDIA)) {
@@ -266,16 +275,10 @@ public function directories_valid()
             $errors[] = 'OB_CACHE (cache directory) is not writable by the server.';
         }
 
-        if (!is_dir(OB_UPLOADS)) {
-            $errors[] = 'The uploads directory does not exist.';
-        } elseif (!is_writable(OB_UPLOADS)) {
-            $errors[] = 'The uploads directory is not writable by the server.';
-        }
-
         if (count($errors) == 0) {
             // make sure there are no directories specified within the OB_CACHE directory
             $cache = realpath(OB_CACHE);
-            foreach ([OB_MEDIA, OB_MEDIA_UNAPPROVED, OB_MEDIA_ARCHIVE, OB_THUMBNAILS, OB_UPLOADS] as $dir) {
+            foreach ([OB_UPLOADS, OB_MEDIA, OB_MEDIA_UNAPPROVED, OB_MEDIA_ARCHIVE, OB_THUMBNAILS, OB_UPLOADS] as $dir) {
                 if (strpos(realpath($dir), $cache) === 0) {
                     $errors[] = 'Directory ' . $dir . ' is within the cache directory.';
                 }