stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-06 03:29:28 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix gallery2 import with multisite config

Browse Source 
Signed-off-by:  <unostar@danalan.info>
This commit is contained in:
Marc
2009-06-09 19:36:36 +08:00
committed by
parent b0ae9c02d9
commit 24a72aa819
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/g2_import/controllers/admin_g2_import.php
View File

@@ -44,13 +44,20 @@ class Admin_g2_import_Controller extends Admin_Controller {
$form = $this->_get_import_form();
if ($form->validate()) {
$embed_path = $form->configure_g2_import->embed_path->value;
$multi_path = $form->configure_g2_import->multi_path->value;
if (!is_file($embed_path) && file_exists("$embed_path/embed.php")) {
$embed_path = "$embed_path/embed.php";
}
if (!empty($multi_path) && !is_file($multi_path) && file_exists("$multi_path/config.php")) {
$multi_path = "$multi_path/embed.php";
}
if (g2_import::is_valid_embed_path($embed_path)) {
if (g2_import::is_valid_embed_path($embed_path, $multi_path)) {
message::success("Gallery 2 path saved.");
module::set_var("g2_import", "embed_path", $embed_path);
module::set_var("g2_import", "multi_path", $multi_path);
url::redirect("admin/g2_import");
} else {
$form->configure_g2_import->embed_path->add_error("invalid", 1);
@@ -67,11 +74,16 @@ class Admin_g2_import_Controller extends Admin_Controller {
$form = new Forge(
"admin/g2_import/save", "", "post", array("id" => "gAdminConfigureG2ImportForm"));
$group = $form->group("configure_g2_import")->label(t("Configure Gallery 2 Import"));
$group->input("embed_path")->label(t("Filesystem path to your Gallery 2 embed.php file"))
$group->input("embed_path")->label(t("Filesystem path to your Gallery 2 embed.php file (in case of multisite config, use the path to the 'master')"))
->value(module::get_var("g2_import", "embed_path", ""));
$group->input("multi_path")->label(t("Filesystem path to your Gallery 2 multisite instance config (leave empty if not applicable)"))
->value(module::get_var("g2_import", "multi_path", ""));
$group->embed_path->error_messages(
"invalid", t("The path you entered is not a Gallery 2 installation."));
$group->submit("")->value(t("Save"));
return $form;
}
}
}