summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/controllers/welcome.php8
-rw-r--r--core/views/welcome.html.php2
2 files changed, 9 insertions, 1 deletions
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index 9ac22318..55ec9164 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -190,11 +190,17 @@ class Welcome_Controller extends Template_Controller {
function add_photos() {
$path = $this->input->post("path");
+ $parent_id = (int)$this->input->post("parent_id");
+ $parent = ORM::factory("item", $parent_id);
+ if (!$parent->loaded) {
+ throw new Exception("@todo BAD_ALBUM");
+ }
+
cookie::set("add_photos_path", $path);
foreach (glob("$path/*.[Jj][Pp][Gg]") as $file) {
set_time_limit(30);
- photo::create(1, $file, basename($file), basename($file));
+ photo::create($parent->id, $file, basename($file), basename($file));
}
url::redirect("welcome");
}
diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php
index 7f3d27a9..82043499 100644
--- a/core/views/welcome.html.php
+++ b/core/views/welcome.html.php
@@ -268,6 +268,8 @@
<input type="submit" value="upload"/>
<input type="text" name="path" size="70"
value="<?= cookie::get("add_photos_path") ?>" />
+ <br>
+ Album id: <input name="parent_id" type="text" size="3" value="1"/>
</form>
</fieldset>
<fieldset>