Rename local_import module to server_add

18 files changed, 112 insertions, 114 deletions

diff --git a/modules/local_import/views/local_import_tree_dialog.html.php b/modules/local_import/views/local_import_tree_dialog.html.php
deleted file mode 100644
index 520a2af0..00000000
--- a/modules/local_import/views/local_import_tree_dialog.html.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<link media="screen, projection" rel="stylesheet" type="text/css"
-      href="<?= url::file("modules/local_import/css/local_import.css") ?>" />
-<?= html::script("modules/local_import/js/local_import.js"); ?>
-
-<div id="gLocalImport">
-  <h1 style="display: none;"><?= sprintf(t("Import Photos to '%s'"), $album_title) ?></h1>
-
-  <p id="gDescription"><?= t("Photos will be imported to album:") ?></p>
-  <ul class="gBreadcrumbs">
-    <? foreach ($parents as $parent): ?>
-    <li><?= $parent->title ?></li>
-    <? endforeach ?>
-    <li class="active"><?= $album_title ?></li>
-  </ul>
-
-  <?= form::open($action, array("method" => "post"), $hidden) ?>
-  <div id="gLocalImportTree" >
-    <?= $tree ?>
-  </div>
-  <span>
-    <?= form::submit(array("id" => "gImportButton", "name" => "import", "disabled" => true, "class" => "submit"), t("Import")) ?>
-  </span>
-  <?= form::close() ?>
-  <div id="gProgressBar" ></div>
-</div>
diff --git a/modules/local_import/controllers/admin_local_import.php b/modules/server_add/controllers/admin_server_add.php
index 5b556e13..a340f61a 100644
--- a/modules/local_import/controllers/admin_local_import.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Admin_Local_Import_Controller extends Admin_Controller {
+class Admin_Server_Add_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
-    $view->content = new View("local_import_admin.html");
+    $view->content = new View("server_add_admin.html");
     $view->content->add_form = $this->_get_admin_form();
-    $view->content->path_list = new View("local_import_dir_list.html");
-    $paths = unserialize(module::get_var("local_import", "authorized_paths", "a:0:{}"));
+    $view->content->path_list = new View("server_add_dir_list.html");
+    $paths = unserialize(module::get_var("server_add", "authorized_paths", "a:0:{}"));
     $view->content->path_list->paths = array_keys($paths);
 
     print $view;
@@ -33,12 +33,12 @@ class Admin_Local_Import_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $form = $this->_get_admin_form();
-    $paths = unserialize(module::get_var("local_import", "authorized_paths", "a:0:{}"));
+    $paths = unserialize(module::get_var("server_add", "authorized_paths", "a:0:{}"));
     if ($form->validate()) {
       if (is_readable($form->add_path->path->value)) {
         $paths[$form->add_path->path->value] = 1;
-        module::set_var("local_import", "authorized_paths", serialize($paths));
-        $view = new View("local_import_dir_list.html");
+        module::set_var("server_add", "authorized_paths", serialize($paths));
+        $view = new View("server_add_dir_list.html");
         $view->paths = array_keys($paths);
         $form->add_path->inputs["path"]->value("");
         print json_encode(
@@ -59,11 +59,11 @@ class Admin_Local_Import_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $path = $this->input->post("path");
-    $paths = unserialize(module::get_var("local_import", "authorized_paths"));
+    $paths = unserialize(module::get_var("server_add", "authorized_paths"));
     unset($paths[$path]);
-    module::set_var("local_import", "authorized_paths", serialize($paths));
+    module::set_var("server_add", "authorized_paths", serialize($paths));
 
-    $view = new View("local_import_dir_list.html");
+    $view = new View("server_add_dir_list.html");
     $view->paths = array_keys($paths);
 
     print $view;
@@ -82,8 +82,8 @@ class Admin_Local_Import_Controller extends Admin_Controller {
   }
 
   private function _get_admin_form() {
-    $form = new Forge("admin/local_import/add_path", "", "post",
-                      array("id" => "gLocalImportAdminForm"));
+    $form = new Forge("admin/server_add/add_path", "", "post",
+                      array("id" => "gServerAddAdminForm"));
     $add_path = $form->group("add_path");
     $add_path->input("path")->label(t("Path"))->rules("required")
       ->error_messages("not_readable", t("The directory is not readable by the webserver"));
diff --git a/modules/local_import/controllers/local_import.php b/modules/server_add/controllers/server_add.php
index 8a6ee78a..f269e3f9 100644
--- a/modules/local_import/controllers/local_import.php
+++ b/modules/server_add/controllers/server_add.php
@@ -17,20 +17,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Local_Import_Controller extends Controller {
+class Server_Add_Controller extends Controller {
   public function index($id) {
-    $paths = unserialize(module::get_var("local_import", "authorized_paths"));
+    $paths = unserialize(module::get_var("server_add", "authorized_paths"));
 
     $item = ORM::factory("item", $id);
-    access::required("local_import", $item);
+    access::required("server_add", $item);
 
-    $view = new View("local_import_tree_dialog.html");
-    $view->action = url::site("local_import/add_photo/$id");
+    $view = new View("server_add_tree_dialog.html");
+    $view->action = url::site("server_add/add_photo/$id");
     $view->hidden = array("csrf" => access::csrf_token(), "base_url" => url::base(true));
     $view->parents = $item->parents();
     $view->album_title = $item->title;
 
-    $tree = new View("local_import_tree.html");
+    $tree = new View("server_add_tree.html");
     $tree->data = array();
     $tree->uid = "tree_$id";
     foreach (array_keys($paths) as $path) {
@@ -47,7 +47,7 @@ class Local_Import_Controller extends Controller {
       kohana::show_404();
     }
 
-    $tree = new View("local_import_tree.html");
+    $tree = new View("server_add_tree.html");
     $tree->data = $this->_get_children($path);
     $tree->uid = "tree_" . md5($path);
     print $tree;
@@ -61,14 +61,14 @@ class Local_Import_Controller extends Controller {
     access::verify_csrf();
 
     $parent = ORM::factory("item", $id);
-    access::required("local_import", $parent);
+    access::required("server_add", $parent);
     if (!$parent->is_album() && !$parent->loaded ) {
       throw new Exception("@todo BAD_ALBUM");
     }
 
     $path = $this->input->post("path");
 
-    $paths = unserialize(module::get_var("local_import", "authorized_paths"));
+    $paths = unserialize(module::get_var("server_add", "authorized_paths"));
     if (empty($paths[$path[0]])) {
       throw new Exception("@todo BAD_PATH");
     }
diff --git a/modules/local_import/css/admin.css b/modules/server_add/css/admin.css
index dd5a8ac3..b700919b 100644
--- a/modules/local_import/css/admin.css
+++ b/modules/server_add/css/admin.css
@@ -1,17 +1,17 @@
-#gLocalImportAdmin {
+#gServerAddAdmin {
   margin:auto;
   text-align: left;
 }
 
-#gLocalImportAdmin form fieldset {
+#gServerAddAdmin form fieldset {
   border: medium none;
 }
 
-#gLocalImportAdmin legend {
+#gServerAddAdmin legend {
   display: none;
 }
 
-#gLocalImportAdmin .gWarning {
+#gServerAddAdmin .gWarning {
   background-color: #FFFF99;
 }
 
@@ -20,7 +20,7 @@
   padding: 0.3em 1.5em 0.3em 1em;
 }
 
-#gLocalImportAdmin #path {
+#gServerAdd Admin #path {
   width: 80%;
 }
 
diff --git a/modules/local_import/css/jquery.autocomplete.css b/modules/server_add/css/jquery.autocomplete.css
index 4d50cf43..4d50cf43 100644
--- a/modules/local_import/css/jquery.autocomplete.css
+++ b/modules/server_add/css/jquery.autocomplete.css
diff --git a/modules/local_import/css/local_import.css b/modules/server_add/css/server_add.css
index 23c2449d..16ccc539 100644
--- a/modules/local_import/css/local_import.css
+++ b/modules/server_add/css/server_add.css
@@ -27,7 +27,7 @@
   display: inline-block;
 }
 
-#gLocalImport #gLocalImportTree {
+#gServerAdd #gServerAddTree {
   border: 1px solid #CCCCCC;
   height: 25em;
   overflow: auto;
@@ -36,25 +36,25 @@
   padding-bottom: .5em;
 }
 
-#gLocalImport ul ul li {
+#gServerAdd ul ul li {
   padding-left: 1.2em;
 }
 
-#gLocalImport ul li .gFile {
+#gServerAdd ul li .gFile {
   padding-left: 2.5em;
 }
 
-#gLocalImport .gBreadcrumbs {
+#gServerAdd .gBreadcrumbs {
   font-size: 1em;
   padding: 0;
   margin: 0;
   border-top-width: 0px;
 }
 
-#gLocalImport p {
+#gServerAdd p {
   margin: 0;
 }
 
-#gLocalImport .gBreadcrumbs li {
+#gServerAdd .gBreadcrumbs li {
   padding: 10px 6px 10px 16px;
 }
diff --git a/modules/local_import/helpers/local_import_block.php b/modules/server_add/helpers/server_add_block.php
index b412f338..c2a94e97 100644
--- a/modules/local_import/helpers/local_import_block.php
+++ b/modules/server_add/helpers/server_add_block.php
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class local_import_block_Core {
+class server_add_block_Core {
   static function head($theme) {
-    $head[] = html::script("modules/local_import/js/local_import.js");
+    $head[] = html::script("modules/server_add/js/server_add.js");
 
-    $url = url::file("modules/local_import/css/local_import.css");
+    $url = url::file("modules/server_add/css/server_add.css");
     $head[] = "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" " .
       "media=\"screen,print,projection\" />";
 
diff --git a/modules/local_import/helpers/local_import_installer.php b/modules/server_add/helpers/server_add_installer.php
index df183a11..8b1c4688 100644
--- a/modules/local_import/helpers/local_import_installer.php
+++ b/modules/server_add/helpers/server_add_installer.php
@@ -17,30 +17,31 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class local_import_installer {
+class server_add_installer {
   static function install() {
     $db = Database::instance();
-    $version = module::get_version("local_import");
+    $version = module::get_version("server_add");
     if ($version == 0) {
-      access::register_permission("local_import", t("Import Local Files"));
+      access::register_permission("server_add", t("Add files from server"));
 
       access::allow(user::lookup(2), "view", ORM::factory("item", 1));
 
-      module::set_version("local_import", 1);
-      module::set_var("local_import", "authorized_paths", serialize(array()));
+      module::set_version("server_add", 1);
+      module::set_var("server_add", "authorized_paths", serialize(array()));
       message::warning(
         t("You have no upload directories, click <a href='%url'>here</a> to configure one",
-          array("url" => url::site("/admin/local_import"))));
+          array("url" => url::site("/admin/server_add"))));
     }
   }
 
   static function uninstall() {
-    access::delete_permission("local_import");
-    $module = module::get("local_import");
+    access::delete_permission("server_add");
+    $module = module::get("server_add");
 
     $db = Database::instance();
     $db->delete("vars", array("module_name" => $module->name));
 
     module::delete("local_import");
+    module::delete("server_add");
   }
 }
diff --git a/modules/local_import/helpers/local_import_menu.php b/modules/server_add/helpers/server_add_menu.php
index b940e01e..fe27d6d2 100644
--- a/modules/local_import/helpers/local_import_menu.php
+++ b/modules/server_add/helpers/server_add_menu.php
@@ -17,27 +17,27 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class local_import_menu_Core {
+class server_add_menu_Core {
   static function admin($menu, $theme) {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
-               ->id("local_import")
-               ->label(t("Local Import"))
-               ->url(url::site("admin/local_import")));
+               ->id("server_add")
+               ->label(t("Server Add"))
+               ->url(url::site("admin/server_add")));
   }
 
   static function site($menu, $theme) {
     $item = $theme->item();
 
-    $paths = unserialize(module::get_var("local_import", "authorized_paths"));
+    $paths = unserialize(module::get_var("server_add", "authorized_paths"));
 
-    if ($item && access::can("edit", $item) && access::can("local_import", $item) &&
+    if ($item && access::can("edit", $item) && access::can("server_add", $item) &&
         $item->is_album() && !empty($paths)) {
       $options_menu = $menu->get("options_menu")
         ->append(Menu::factory("dialog")
-                 ->id("local_import")
+                 ->id("server_add")
                  ->label(t("Add from server"))
-                 ->url(url::site("local_import/index/$item->id")));
+                 ->url(url::site("server_add/index/$item->id")));
     }
   }
 }
diff --git a/modules/local_import/helpers/local_import_theme.php b/modules/server_add/helpers/server_add_theme.php
index 69341c72..82c9a951 100644
--- a/modules/local_import/helpers/local_import_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -17,20 +17,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class local_import_theme_Core {
+class server_add_theme_Core {
   static function admin_head($theme) {
     $head = array();
-    if (Router::$current_uri == "admin/local_import") {
+    if (Router::$current_uri == "admin/server_add") {
       $head[] = "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("modules/local_import/css/jquery.autocomplete.css") . "\" />";
+        url::file("modules/server_add/css/jquery.autocomplete.css") . "\" />";
       $head[] = "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("modules/local_import/css/admin.css") . "\" />";
+        url::file("modules/server_add/css/admin.css") . "\" />";
       $base = url::base(true);
       $csrf = access::csrf_token();
       $head[] = "<script> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
-      $head[] = html::script("modules/local_import/js/jquery.autocomplete.pack.js");
-      $head[] = html::script("modules/local_import/js/admin.js");
+      $head[] = html::script("modules/server_add/js/jquery.autocomplete.pack.js");
+      $head[] = html::script("modules/server_add/js/admin.js");
     }
     
     return implode("\n", $head);
diff --git a/modules/local_import/js/admin.js b/modules/server_add/js/admin.js
index 4102a82b..dcd0dde0 100644
--- a/modules/local_import/js/admin.js
+++ b/modules/server_add/js/admin.js
@@ -4,27 +4,27 @@
  */
 $("document").ready(function() {
   add_autocomplete();
-  ajaxify_import_form();
+  ajaxify_add_form();
   add_onclick();
 });
 
 function add_autocomplete() {
-  $("#gLocalImportAdmin input:text").autocomplete(base_url + "admin/local_import/autocomplete", {
+  $("#gServerAddAdmin input:text").autocomplete(base_url + "admin/server_add/autocomplete", {
     extraParams: {csrf: csrf},
     mustMatch: true,
     max: 256});
 }
-function ajaxify_import_form(options) {
-  $("#gLocalImportAdmin form").ajaxForm({
+function ajaxify_add_form(options) {
+  $("#gServerAddAdmin form").ajaxForm({
     dataType: "json",
     success: function(data) {
       if (data.form) {
-	$("#gLocalImportAdmin form").replaceWith(data.form);
-	ajaxify_import_form();
+	$("#gServerAddAdmin form").replaceWith(data.form);
+	ajaxify_add_form();
 	add_autocomplete();
       }
       if (data.result == "success") {
-	$("#gNoImportPaths").css("display", "none");
+	$("#gNoAuthorizedPaths").css("display", "none");
 	$("#gAuthorizedPath").html(data.paths);
 	add_onclick();
       }
diff --git a/modules/local_import/js/jquery.autocomplete.pack.js b/modules/server_add/js/jquery.autocomplete.pack.js
index 271014a2..271014a2 100644
--- a/modules/local_import/js/jquery.autocomplete.pack.js
+++ b/modules/server_add/js/jquery.autocomplete.pack.js
diff --git a/modules/local_import/js/local_import.js b/modules/server_add/js/server_add.js
index c9645bfc..fe8c976a 100644
--- a/modules/local_import/js/local_import.js
+++ b/modules/server_add/js/server_add.js
@@ -1,9 +1,9 @@
-$("#gLocalImport").ready(function() {
-  $("#gLocalImport :submit").click(function(event) {
-    do_import(this, event);
+$("#gServerAdd").ready(function() {
+  $("#gServerAdd :submit").click(function(event) {
+    do_add(this, event);
   });
   $("#gProgressBar").progressbar();
-  $("#gLocalImport ul").css("display", "block");
+  $("#gServerAdd ul").css("display", "block");
 });
 
 function open_close_branch(icon, event) {
@@ -36,13 +36,13 @@ function checkbox_click(checkbox, event) {
   var parents = $(checkbox).parents("li");
   var parent = parents.get(0);
   $(parent).find(".gCheckboxTree :checkbox").attr("checked", checkbox.checked);
-  var checked = $("#gLocalImport :checkbox[checked]");
-  $("#gLocalImport form :submit").attr("disabled", checked.length == 0);
+  var checked = $("#gServerAdd :checkbox[checked]");
+  $("#gServerAdd form :submit").attr("disabled", checked.length == 0);
 }
 
 function load_children(icon, callback) {
-  var csrf = $("#gLocalImport form :hidden[name='csrf']")[0].value;
-  var base_url = $("#gLocalImport form :hidden[name='base_url']")[0].value;
+  var csrf = $("#gServerAdd form :hidden[name='csrf']")[0].value;
+  var base_url = $("#gServerAdd form :hidden[name='base_url']")[0].value;
   var parms = "&csrf=" + csrf;
   var parents = $(icon).parents("li");
   for (var i=parents.length - 1; i >= 0; i--) {
@@ -53,27 +53,24 @@ function load_children(icon, callback) {
           data: parms,
           dataType: "html",
           type: "POST",
-          url: base_url + "local_import/children"
+          url: base_url + "server_add/children"
   });
 }
 
 var current = 0;
 var process_length = 0;
-function do_import(submit, event) {
+function do_add(submit, event) {
   event.preventDefault();
   $("#gProgressBar").progressbar("value", 0);
   $("#gProgressBar").css("visibility", "visible");
-  var check_list = $("#gLocalImport :checkbox[checked]");
+  var check_list = $("#gServerAdd :checkbox[checked]");
   process_length = check_list.length;
   current = 0;
-  var base_url = $("#gLocalImport form :hidden[name='base_url']")[0].value;
+  var base_url = $("#gServerAdd form :hidden[name='base_url']")[0].value;
   $.ajax({async: false,
-    success: function(data, textStatus) {
-      document.location.reload();
-    },
     dataType: "json",
     type: "POST",
-    url: base_url + "local_import/start"
+    url: base_url + "server_add/start"
   });
   $.each(check_list, function () {
     process_checkbox(this);
@@ -84,14 +81,14 @@ function do_import(submit, event) {
     },
     dataType: "json",
     type: "POST",
-    url: base_url + "local_import/finish"
+    url: base_url + "server_add/finish"
   });
   return false;
 }
 
 function process_checkbox(checkbox) {
   var parents = $(checkbox).parents("li");
-  var csrf = $("#gLocalImport form :hidden[name='csrf']")[0].value;
+  var csrf = $("#gServerAdd form :hidden[name='csrf']")[0].value;
   var parms = "&csrf=" + csrf;
   for (var i=parents.length - 1; i > 0; i--) {
     parms += "&path[]=" +  $(parents[i]).children("span").attr("ref");
@@ -126,7 +123,7 @@ function process_file(li_element, parms) {
           data: parms,
           dataType: "html",
           type: "POST",
-          url: $("#gLocalImport form").attr("action")
+          url: $("#gServerAdd form").attr("action")
   });
   current++;
   $("#gProgressBar").progressbar("value", current / process_length * 100);
diff --git a/modules/local_import/module.info b/modules/server_add/module.info
index a2a3d66c..3b0dce31 100644
--- a/modules/local_import/module.info
+++ b/modules/server_add/module.info
@@ -1,3 +1,3 @@
-name = Local Import
+name = Add from Server
 description = Allows authorized users to load images from the local server
 version = 1
diff --git a/modules/local_import/views/local_import_admin.html.php b/modules/server_add/views/server_add_admin.html.php
index f26f57ad..765feeb9 100644
--- a/modules/local_import/views/local_import_admin.html.php
+++ b/modules/server_add/views/server_add_admin.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gLocalImportAdmin">
+<div id="gServerAddAdmin">
   <h2>
-    <?= t("Local Import Admininstration") ?>
+    <?= t("Add From Server Admininstration") ?>
   </h2>
   <div id="gAuthorizedPath">
     <?= $path_list ?>
diff --git a/modules/local_import/views/local_import_dir_list.html.php b/modules/server_add/views/server_add_dir_list.html.php
index 7041fcc2..762b1a4d 100644
--- a/modules/local_import/views/local_import_dir_list.html.php
+++ b/modules/server_add/views/server_add_dir_list.html.php
@@ -8,6 +8,6 @@
   </li>
   <? endforeach ?>
 </ul>
-<div id="gNoImportPaths" <? if (!empty($paths)): ?>style="display:none"<? endif ?>>
-  <span class="gWarning"><?= t("No Authorized upload paths defined") ?></span>
+<div id="gNoAuthorizedPaths" <? if (!empty($paths)): ?>style="display:none"<? endif ?>>
+  <span class="gWarning"><?= t("No Authorized image source paths defined") ?></span>
 </div>
diff --git a/modules/local_import/views/local_import_tree.html.php b/modules/server_add/views/server_add_tree.html.php
index b664c679..b664c679 100644
--- a/modules/local_import/views/local_import_tree.html.php
+++ b/modules/server_add/views/server_add_tree.html.php
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
new file mode 100644
index 00000000..26286e05
--- /dev/null
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -0,0 +1,26 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<link media="screen, projection" rel="stylesheet" type="text/css"
+      href="<?= url::file("modules/server_add/css/server_add.css") ?>" />
+<?= html::script("modules/server_add/js/server_add.js"); ?>
+
+<div id="gServerAdd">
+  <h1 style="display: none;"><?= sprintf(t("Add Photos to '%s'"), $album_title) ?></h1>
+
+  <p id="gDescription"><?= t("Photos will be added to album:") ?></p>
+  <ul class="gBreadcrumbs">
+    <? foreach ($parents as $parent): ?>
+    <li><?= $parent->title ?></li>
+    <? endforeach ?>
+    <li class="active"><?= $album_title ?></li>
+  </ul>
+
+  <?= form::open($action, array("method" => "post"), $hidden) ?>
+  <div id="gServerAddTree" >
+    <?= $tree ?>
+  </div>
+  <span>
+    <?= form::submit(array("id" => "gServerAddButton", "name" => "add", "disabled" => true, "class" => "submit"), t("Add")) ?>
+  </span>
+  <?= form::close() ?>
+  <div id="gProgressBar" ></div>
+</div>