Correct the mkdir for the sub directories in var

3 files changed, 5 insertions, 5 deletions

diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index 99d8010f..af9932d4 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -496,7 +496,7 @@ class Welcome_Controller extends Template_Controller {
 
       $init_g3 = array_merge($init_g3, array(
           "if (!file_exists(VARPATH)) {",
-          "  if (!mkdir(VARPATH)) {",
+          "  if (!@mkdir(VARPATH)) {",
           "    throw new Exception(\"Unable to create directory '\" . VARPATH . \"'\");",
           "  }",
           "  chmod(VARPATH, 0777);",
@@ -515,7 +515,7 @@ class Welcome_Controller extends Template_Controller {
       
       $init_g3 = array_merge($init_g3, array(
          "foreach (array(" . implode(", ", $sub_dirs) . ") as \$dir) {",
-         "  if (!@mkdir(\$dir)) {",
+         "  if (!@mkdir(\"var/\$dir\")) {",
          "    throw new Exception(\"Unable to create directory '\$dir'\");",
          "  }",
          "  chmod(\"var/\$dir\", 0777);",
diff --git a/installer/data/init_var.php b/installer/data/init_var.php
index 5bc619aa..42d50c0a 100644
--- a/installer/data/init_var.php
+++ b/installer/data/init_var.php
@@ -1,12 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 if (!file_exists(VARPATH)) {
-  if (!mkdir(VARPATH)) {
+  if (!@mkdir(VARPATH)) {
     throw new Exception("Unable to create directory '" . VARPATH . "'");
   }
   chmod(VARPATH, 0777);
 }
 foreach (array("resizes", "modules", "uploads", "logs", "albums", "thumbs") as $dir) {
-  if (!@mkdir($dir)) {
+  if (!@mkdir("var/$dir")) {
     throw new Exception("Unable to create directory '$dir'");
   }
   chmod("var/$dir", 0777);
diff --git a/installer/data/install.sql b/installer/data/install.sql
index 77c8d87f..f87b930f 100644
--- a/installer/data/install.sql
+++ b/installer/data/install.sql
@@ -208,7 +208,7 @@ CREATE TABLE `sessions` (
   PRIMARY KEY  (`session_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO `sessions` VALUES ('7d414ede0f86afc6079a90e424b51c41',1232179528,'c2Vzc2lvbl9pZHxzOjMyOiI3ZDQxNGVkZTBmODZhZmM2MDc5YTkwZTQyNGI1MWM0MSI7dG90YWxfaGl0c3xpOjc0O19rZl9mbGFzaF98YTowOnt9dXNlcl9hZ2VudHxzOjkwOiJNb3ppbGxhLzUuMCAoV2luZG93czsgVTsgV2luZG93cyBOVCA1LjE7IGVuLVVTOyBydjoxLjkuMC41KSBHZWNrby8yMDA4MTIwMTIyIEZpcmVmb3gvMy4wLjUiO2lwX2FkZHJlc3N8czoxMzoiMjQuNjkuMjExLjEzNSI7bGFzdF9hY3Rpdml0eXxpOjEyMzIxNzk1MjE7dXNlcnxPOjEwOiJVc2VyX01vZGVsIjo2OntzOjE0OiIAKgBvYmplY3RfbmFtZSI7czo0OiJ1c2VyIjtzOjk6IgAqAG9iamVjdCI7YToxMDp7czoyOiJpZCI7aToyO3M6NDoibmFtZSI7czo1OiJhZG1pbiI7czo5OiJmdWxsX25hbWUiO3M6MjE6IkdhbGxlcnkgQWRtaW5pc3RyYXRvciI7czo4OiJwYXNzd29yZCI7czozNjoiU1VdNjMzMjY3NDhiNTAyNmI0ZDdiNWQ1YzhjODNhMjY2NzQzIjtzOjExOiJsb2dpbl9jb3VudCI7aToxO3M6MTA6Imxhc3RfbG9naW4iO2k6MTIzMjE3MjM1MTtzOjU6ImVtYWlsIjtOO3M6NToiYWRtaW4iO2k6MTtzOjU6Imd1ZXN0IjtpOjA7czozOiJ1cmwiO047fXM6MTA6IgAqAGNoYW5nZWQiO2E6MDp7fXM6OToiACoAbG9hZGVkIjtiOjE7czo4OiIAKgBzYXZlZCI7YjoxO3M6MTA6IgAqAHNvcnRpbmciO2E6MTp7czoyOiJpZCI7czozOiJhc2MiO319Y3NyZnxzOjMyOiI0ZTBiMzllNzcyZmFkOTk1N2E3OGEwMWI3M2UyMzAyYyI7Z3JvdXBfaWRzfGE6Mjp7aTowO2k6MTtpOjE7aToyO30='),('8b2c1f2b8b3155094a69131c6c7d9254',1232120768,'c2Vzc2lvbl9pZHxzOjMyOiI4YjJjMWYyYjhiMzE1NTA5NGE2OTEzMWM2YzdkOTI1NCI7dG90YWxfaGl0c3xpOjQ4O19rZl9mbGFzaF98YTowOnt9dXNlcl9hZ2VudHxzOjExMToiTW96aWxsYS81LjAgKFdpbmRvd3M7IFU7IFdpbmRvd3MgTlQgNi4wOyBlbi1VUzsgcnY6MS45LjAuNSkgR2Vja28vMjAwODEyMDEyMiBGaXJlZm94LzMuMC41ICguTkVUIENMUiAzLjUuMzA3MjkpIjtpcF9hZGRyZXNzfHM6MTQ6IjIwOS41My4yNDEuMjE4IjtsYXN0X2FjdGl2aXR5fGk6MTIzMjEyMDc2Nztjc3JmfHM6MzI6IjZlYzM3MmExYTQ5OTViMzA4OGU3ZmZhMDEyZDRjOWYyIjt1c2VyfE86MTA6IlVzZXJfTW9kZWwiOjY6e3M6MTQ6IgAqAG9iamVjdF9uYW1lIjtzOjQ6InVzZXIiO3M6OToiACoAb2JqZWN0IjthOjEwOntzOjI6ImlkIjtpOjE7czo0OiJuYW1lIjtzOjU6Imd1ZXN0IjtzOjk6ImZ1bGxfbmFtZSI7czoxMDoiR3Vlc3QgVXNlciI7czo4OiJwYXNzd29yZCI7czozNjoibVBgaGY2YmYyNWI5MGUyNzY1ZmZlMmU2NTczN2IxNDJkYmE1IjtzOjExOiJsb2dpbl9jb3VudCI7aTowO3M6MTA6Imxhc3RfbG9naW4iO2k6MDtzOjU6ImVtYWlsIjtOO3M6NToiYWRtaW4iO2k6MDtzOjU6Imd1ZXN0IjtpOjE7czozOiJ1cmwiO047fXM6MTA6IgAqAGNoYW5nZWQiO2E6MDp7fXM6OToiACoAbG9hZGVkIjtiOjE7czo4OiIAKgBzYXZlZCI7YjoxO3M6MTA6IgAqAHNvcnRpbmciO2E6MTp7czoyOiJpZCI7czozOiJhc2MiO319Z3JvdXBfaWRzfGE6MTp7aTowO2k6MTt9'),('9ae63c2205e0eeacd5ed819e6c6e0c0a',1232262647,'c2Vzc2lvbl9pZHxzOjMyOiI5YWU2M2MyMjA1ZTBlZWFjZDVlZDgxOWU2YzZlMGMwYSI7dG90YWxfaGl0c3xpOjY1O19rZl9mbGFzaF98YTowOnt9dXNlcl9hZ2VudHxzOjkwOiJNb3ppbGxhLzUuMCAoV2luZG93czsgVTsgV2luZG93cyBOVCA1LjE7IGVuLVVTOyBydjoxLjkuMC41KSBHZWNrby8yMDA4MTIwMTIyIEZpcmVmb3gvMy4wLjUiO2lwX2FkZHJlc3N8czoxMzoiMTkyLjE2OC4wLjE5OSI7bGFzdF9hY3Rpdml0eXxpOjEyMzIyNjI2NDY7dXNlcnxPOjEwOiJVc2VyX01vZGVsIjo2OntzOjE0OiIAKgBvYmplY3RfbmFtZSI7czo0OiJ1c2VyIjtzOjk6IgAqAG9iamVjdCI7YToxMDp7czoyOiJpZCI7aToxO3M6NDoibmFtZSI7czo1OiJndWVzdCI7czo5OiJmdWxsX25hbWUiO3M6MTA6Ikd1ZXN0IFVzZXIiO3M6ODoicGFzc3dvcmQiO3M6MzY6Im1QYGhmNmJmMjViOTBlMjc2NWZmZTJlNjU3MzdiMTQyZGJhNSI7czoxMToibG9naW5fY291bnQiO2k6MDtzOjEwOiJsYXN0X2xvZ2luIjtpOjA7czo1OiJlbWFpbCI7TjtzOjU6ImFkbWluIjtpOjA7czo1OiJndWVzdCI7aToxO3M6MzoidXJsIjtOO31zOjEwOiIAKgBjaGFuZ2VkIjthOjA6e31zOjk6IgAqAGxvYWRlZCI7YjoxO3M6ODoiACoAc2F2ZWQiO2I6MTtzOjEwOiIAKgBzb3J0aW5nIjthOjE6e3M6MjoiaWQiO3M6MzoiYXNjIjt9fWdyb3VwX2lkc3xhOjE6e2k6MDtpOjE7fWNzcmZ8czozMjoiYzlhZDY2YmFjMzRhYjk5Y2NmOTRiMGEwMjhkNWI3ZWQiOw==');
+INSERT INTO `sessions` VALUES ('7d414ede0f86afc6079a90e424b51c41',1232179528,'c2Vzc2lvbl9pZHxzOjMyOiI3ZDQxNGVkZTBmODZhZmM2MDc5YTkwZTQyNGI1MWM0MSI7dG90YWxfaGl0c3xpOjc0O19rZl9mbGFzaF98YTowOnt9dXNlcl9hZ2VudHxzOjkwOiJNb3ppbGxhLzUuMCAoV2luZG93czsgVTsgV2luZG93cyBOVCA1LjE7IGVuLVVTOyBydjoxLjkuMC41KSBHZWNrby8yMDA4MTIwMTIyIEZpcmVmb3gvMy4wLjUiO2lwX2FkZHJlc3N8czoxMzoiMjQuNjkuMjExLjEzNSI7bGFzdF9hY3Rpdml0eXxpOjEyMzIxNzk1MjE7dXNlcnxPOjEwOiJVc2VyX01vZGVsIjo2OntzOjE0OiIAKgBvYmplY3RfbmFtZSI7czo0OiJ1c2VyIjtzOjk6IgAqAG9iamVjdCI7YToxMDp7czoyOiJpZCI7aToyO3M6NDoibmFtZSI7czo1OiJhZG1pbiI7czo5OiJmdWxsX25hbWUiO3M6MjE6IkdhbGxlcnkgQWRtaW5pc3RyYXRvciI7czo4OiJwYXNzd29yZCI7czozNjoiU1VdNjMzMjY3NDhiNTAyNmI0ZDdiNWQ1YzhjODNhMjY2NzQzIjtzOjExOiJsb2dpbl9jb3VudCI7aToxO3M6MTA6Imxhc3RfbG9naW4iO2k6MTIzMjE3MjM1MTtzOjU6ImVtYWlsIjtOO3M6NToiYWRtaW4iO2k6MTtzOjU6Imd1ZXN0IjtpOjA7czozOiJ1cmwiO047fXM6MTA6IgAqAGNoYW5nZWQiO2E6MDp7fXM6OToiACoAbG9hZGVkIjtiOjE7czo4OiIAKgBzYXZlZCI7YjoxO3M6MTA6IgAqAHNvcnRpbmciO2E6MTp7czoyOiJpZCI7czozOiJhc2MiO319Y3NyZnxzOjMyOiI0ZTBiMzllNzcyZmFkOTk1N2E3OGEwMWI3M2UyMzAyYyI7Z3JvdXBfaWRzfGE6Mjp7aTowO2k6MTtpOjE7aToyO30='),('8b2c1f2b8b3155094a69131c6c7d9254',1232120768,'c2Vzc2lvbl9pZHxzOjMyOiI4YjJjMWYyYjhiMzE1NTA5NGE2OTEzMWM2YzdkOTI1NCI7dG90YWxfaGl0c3xpOjQ4O19rZl9mbGFzaF98YTowOnt9dXNlcl9hZ2VudHxzOjExMToiTW96aWxsYS81LjAgKFdpbmRvd3M7IFU7IFdpbmRvd3MgTlQgNi4wOyBlbi1VUzsgcnY6MS45LjAuNSkgR2Vja28vMjAwODEyMDEyMiBGaXJlZm94LzMuMC41ICguTkVUIENMUiAzLjUuMzA3MjkpIjtpcF9hZGRyZXNzfHM6MTQ6IjIwOS41My4yNDEuMjE4IjtsYXN0X2FjdGl2aXR5fGk6MTIzMjEyMDc2Nztjc3JmfHM6MzI6IjZlYzM3MmExYTQ5OTViMzA4OGU3ZmZhMDEyZDRjOWYyIjt1c2VyfE86MTA6IlVzZXJfTW9kZWwiOjY6e3M6MTQ6IgAqAG9iamVjdF9uYW1lIjtzOjQ6InVzZXIiO3M6OToiACoAb2JqZWN0IjthOjEwOntzOjI6ImlkIjtpOjE7czo0OiJuYW1lIjtzOjU6Imd1ZXN0IjtzOjk6ImZ1bGxfbmFtZSI7czoxMDoiR3Vlc3QgVXNlciI7czo4OiJwYXNzd29yZCI7czozNjoibVBgaGY2YmYyNWI5MGUyNzY1ZmZlMmU2NTczN2IxNDJkYmE1IjtzOjExOiJsb2dpbl9jb3VudCI7aTowO3M6MTA6Imxhc3RfbG9naW4iO2k6MDtzOjU6ImVtYWlsIjtOO3M6NToiYWRtaW4iO2k6MDtzOjU6Imd1ZXN0IjtpOjE7czozOiJ1cmwiO047fXM6MTA6IgAqAGNoYW5nZWQiO2E6MDp7fXM6OToiACoAbG9hZGVkIjtiOjE7czo4OiIAKgBzYXZlZCI7YjoxO3M6MTA6IgAqAHNvcnRpbmciO2E6MTp7czoyOiJpZCI7czozOiJhc2MiO319Z3JvdXBfaWRzfGE6MTp7aTowO2k6MTt9'),('9ae63c2205e0eeacd5ed819e6c6e0c0a',1232263723,'c2Vzc2lvbl9pZHxzOjMyOiI5YWU2M2MyMjA1ZTBlZWFjZDVlZDgxOWU2YzZlMGMwYSI7dG90YWxfaGl0c3xpOjY3O19rZl9mbGFzaF98YTowOnt9dXNlcl9hZ2VudHxzOjkwOiJNb3ppbGxhLzUuMCAoV2luZG93czsgVTsgV2luZG93cyBOVCA1LjE7IGVuLVVTOyBydjoxLjkuMC41KSBHZWNrby8yMDA4MTIwMTIyIEZpcmVmb3gvMy4wLjUiO2lwX2FkZHJlc3N8czoxMzoiMTkyLjE2OC4wLjE5OSI7bGFzdF9hY3Rpdml0eXxpOjEyMzIyNjM3MjM7dXNlcnxPOjEwOiJVc2VyX01vZGVsIjo2OntzOjE0OiIAKgBvYmplY3RfbmFtZSI7czo0OiJ1c2VyIjtzOjk6IgAqAG9iamVjdCI7YToxMDp7czoyOiJpZCI7aToxO3M6NDoibmFtZSI7czo1OiJndWVzdCI7czo5OiJmdWxsX25hbWUiO3M6MTA6Ikd1ZXN0IFVzZXIiO3M6ODoicGFzc3dvcmQiO3M6MzY6Im1QYGhmNmJmMjViOTBlMjc2NWZmZTJlNjU3MzdiMTQyZGJhNSI7czoxMToibG9naW5fY291bnQiO2k6MDtzOjEwOiJsYXN0X2xvZ2luIjtpOjA7czo1OiJlbWFpbCI7TjtzOjU6ImFkbWluIjtpOjA7czo1OiJndWVzdCI7aToxO3M6MzoidXJsIjtOO31zOjEwOiIAKgBjaGFuZ2VkIjthOjA6e31zOjk6IgAqAGxvYWRlZCI7YjoxO3M6ODoiACoAc2F2ZWQiO2I6MTtzOjEwOiIAKgBzb3J0aW5nIjthOjE6e3M6MjoiaWQiO3M6MzoiYXNjIjt9fWdyb3VwX2lkc3xhOjE6e2k6MDtpOjE7fWNzcmZ8czozMjoiYzlhZDY2YmFjMzRhYjk5Y2NmOTRiMGEwMjhkNWI3ZWQiOw==');
 DROP TABLE IF EXISTS `tasks`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;