From b202816324c3a6bf515a8d938c33e882106f26da Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Fri, 12 Dec 2008 01:46:43 +0000 Subject: Remove the attempt at a local import module --- core/controllers/welcome.php | 6 -- core/views/welcome.html.php | 7 --- modules/local_import/controllers/local_import.php | 34 ---------- .../controllers/local_import_admin.php | 56 ----------------- modules/local_import/css/local_import.css | 70 --------------------- modules/local_import/helpers/local_import.php | 49 --------------- .../local_import/helpers/local_import_block.php | 30 --------- .../helpers/local_import_installer.php | 41 ------------ modules/local_import/images/bin_closed.png | Bin 363 -> 0 bytes modules/local_import/js/local_import.js | 67 -------------------- .../local_import/views/local_import_admin.html.php | 12 ---- .../views/local_import_dir_list.html.php | 9 --- 12 files changed, 381 deletions(-) delete mode 100644 modules/local_import/controllers/local_import.php delete mode 100644 modules/local_import/controllers/local_import_admin.php delete mode 100644 modules/local_import/css/local_import.css delete mode 100644 modules/local_import/helpers/local_import.php delete mode 100644 modules/local_import/helpers/local_import_block.php delete mode 100644 modules/local_import/helpers/local_import_installer.php delete mode 100644 modules/local_import/images/bin_closed.png delete mode 100644 modules/local_import/js/local_import.js delete mode 100644 modules/local_import/views/local_import_admin.html.php delete mode 100644 modules/local_import/views/local_import_dir_list.html.php diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php index 3f70e1dc..b5215a02 100644 --- a/core/controllers/welcome.php +++ b/core/controllers/welcome.php @@ -35,18 +35,12 @@ class Welcome_Controller extends Template_Controller { ->where("type", "photo")->orderby("level", "desc")->find(); $this->template->album_tree = $this->_load_album_tree(); $this->template->add_photo_html = $this->_get_add_photo_html(); - if (module::is_installed("local_import")) { - $this->template->local_import_html = $this->_get_local_import_html(); - } else { - $this->template->local_import_html = ""; - } } catch (Exception $e) { $this->template->album_count = 0; $this->template->photo_count = 0; $this->template->deepest_photo = null; $this->template->album_tree = array(); $this->template->add_photo_html = ""; - $this->template->local_import_html = ""; } $this->_load_user_info(); diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php index d412d119..360dc1ec 100644 --- a/core/views/welcome.html.php +++ b/core/views/welcome.html.php @@ -157,9 +157,6 @@ - - - @@ -263,10 +260,6 @@ ] tags

-
- Local Server Import Admininstration - -
Server Side Photos
"> diff --git a/modules/local_import/controllers/local_import.php b/modules/local_import/controllers/local_import.php deleted file mode 100644 index 2738afef..00000000 --- a/modules/local_import/controllers/local_import.php +++ /dev/null @@ -1,34 +0,0 @@ -validate()) { -// $paths[$form->path->value] = 1; -// module::set_var("local_import", "authorized_paths", serialize($paths)); -// } -// $view = new View("local_import_dir_list.html"); -// $view->paths = array_keys($paths); -// -// print $view; - print "

Hi Therevalidate()) { - $paths[$form->path->value] = 1; - module::set_var("local_import", "authorized_paths", serialize($paths)); - } - $view = new View("local_import_dir_list.html"); - $view->paths = array_keys($paths); - - print $view; - } - - public function remove() { - $path = $this->input->post("path"); - $paths = unserialize(module::get_var("local_import", "authorized_paths")); - unset($paths[$path]); - module::set_var("local_import", "authorized_paths", serialize($paths)); - - $view = new View("local_import_dir_list.html"); - $view->paths = array_keys($paths); - - print $view; - } - - public function autocomplete() { - $files = array(); - - $path_prefix = $this->input->get("q"); - foreach (glob("{$path_prefix}*") as $file) { - $files[] = $file; - } - - print implode("\n", $files); - } -} \ No newline at end of file diff --git a/modules/local_import/css/local_import.css b/modules/local_import/css/local_import.css deleted file mode 100644 index 16f6e68d..00000000 --- a/modules/local_import/css/local_import.css +++ /dev/null @@ -1,70 +0,0 @@ -@CHARSET "UTF-8"; -.ui-autocomplete-results { - padding: 0px; - border: 1px solid black; - background-color: white; - overflow: hidden; - z-index: 99999; -} - -.ui-autocomplete-results ul { - width: 100%; - list-style-position: outside; - list-style: none; - padding: 0; - margin: 0; -} - -.ui-autocomplete-results li { - margin: 0px; - padding: 2px 5px; - cursor: default; - display: block; - /* - if width will be 100% horizontal scrollbar will apear - when scroll mode will be used - */ - /*width: 100%;*/ - font: menu; - font-size: 12px; - /* - it is very important, if line-height not setted or setted - in relative units scroll will be broken in firefox - */ - line-height: 16px; - overflow: hidden; -} - -.ui-autocomplete-loading { - background: white url('../images/spinner.gif') right center no-repeat; -} - -.ui-autocomplete-odd { - background-color: #eee; -} - -.ui-autocomplete-over { - background-color: #0A246A; - color: white; -} - -#gLocalImportAdmin { - margin:auto; - text-align: left; -} - -#gRemoveDir { - background-image: url(../images/bin_closed.png); - background-repeat: no-repeat; - padding-left: 20px; - padding-bottom: 5px; -} - -#gLocalImportAdmin #path { - width: 80%; -} - -#gLocalImportAdmin form li { - display: inline; -} - diff --git a/modules/local_import/helpers/local_import.php b/modules/local_import/helpers/local_import.php deleted file mode 100644 index 045201c7..00000000 --- a/modules/local_import/helpers/local_import.php +++ /dev/null @@ -1,49 +0,0 @@ -admin) { -// throw new Exception("@todo ACCESS DENIED"); -// } - - $template = new View("local_import_admin.html"); - - $paths = unserialize(module::get_var("local_import", "authorized_paths")); - if (!empty($paths)) { - $template->dir_list = new View("local_import_dir_list.html"); - $template->dir_list->paths = array_keys($paths); - } else { - $template->dir_list = ""; - } - - $template->add_form = self::get_admin_form()->render(); - - return $template; - } - - public static function get_admin_form() { - $form = new Forge("admin/local_import/add_path", "", "post", array("id" => "gLocalImportAdminForm")); - $form->input("path")->label(true); - $form->submit(_("Add")); - - return $form; - } -} diff --git a/modules/local_import/helpers/local_import_block.php b/modules/local_import/helpers/local_import_block.php deleted file mode 100644 index c337af41..00000000 --- a/modules/local_import/helpers/local_import_block.php +++ /dev/null @@ -1,30 +0,0 @@ -"; - - return implode("\n", $head); - } -} diff --git a/modules/local_import/helpers/local_import_installer.php b/modules/local_import/helpers/local_import_installer.php deleted file mode 100644 index 72f42c97..00000000 --- a/modules/local_import/helpers/local_import_installer.php +++ /dev/null @@ -1,41 +0,0 @@ -query("DELETE FROM `vars` WHERE `module_id` = {$module->id};"); - - module::delete("local_import"); - } -} diff --git a/modules/local_import/images/bin_closed.png b/modules/local_import/images/bin_closed.png deleted file mode 100644 index afe22ba9..00000000 Binary files a/modules/local_import/images/bin_closed.png and /dev/null differ diff --git a/modules/local_import/js/local_import.js b/modules/local_import/js/local_import.js deleted file mode 100644 index 3ad01ce8..00000000 --- a/modules/local_import/js/local_import.js +++ /dev/null @@ -1,67 +0,0 @@ -/** - * Set up autocomplete on the server path list - * - */ -$("document").ready(function() { - var previous_search = ""; - $("#gLocalImportAdmin input").autocomplete({ - url: base_url + "admin/local_import/autocomplete", - mustMatch: true, - }); - ajaxify_form({ - form: "#gLocalImportAdmin form", - url: "admin/local_import/", - returnCode: 200, - callback: function(xhr, statusText) { - $("#gImportLocalDirList").html(xhr.responseText); - setDroppable("#gImportLocalDirList #gRemoveDir"); - setDraggable("#gImportLocalDirList li"); - } - }); - - setDroppable("#gImportLocalDirList #gRemoveDir"); - setDraggable("#gImportLocalDirList li"); -}); - -function setDraggable(selector) { - $(selector).draggable({ - helper: 'clone', -// containment: "#gImportLocalDirList", - opacity: .6, - revert: "invalid" - }); -} - -function setDroppable(selector) { - $(selector).droppable({ - accept: "#gImportLocalDirList li", - drop: function(ev, ui) { - var element = ui.draggable[0]; - - if (confirm("Do you really want to remove " + element.textContent)) { - $.ajax({ - data: "path=" + element.textContent, - url: base_url + "admin/local_import/remove", - success: function(data, textStatus) { - $("#gImportLocalDirList").html(data); - setDroppable("#gImportLocalDirList #gRemoveDir"); - setDraggable("#gImportLocalDirList li"); - }, - error: function(xhr, textStatus, errorThrown) { - alert("Text Status: " + textStatus + " Http Error Code: " + xhr.status); - }, - type: "POST" - }); - } - } - }); -} - -function ajaxify_form(options) { - $(options.form).ajaxForm({ - complete:function(xhr, statusText) { - options.callback(xhr, statusText); - $(options.form).clearForm(); - } - }); -} diff --git a/modules/local_import/views/local_import_admin.html.php b/modules/local_import/views/local_import_admin.html.php deleted file mode 100644 index 464ab6ec..00000000 --- a/modules/local_import/views/local_import_admin.html.php +++ /dev/null @@ -1,12 +0,0 @@ - - -

-
- -
-
- -
-
diff --git a/modules/local_import/views/local_import_dir_list.html.php b/modules/local_import/views/local_import_dir_list.html.php deleted file mode 100644 index e2baefeb..00000000 --- a/modules/local_import/views/local_import_dir_list.html.php +++ /dev/null @@ -1,9 +0,0 @@ - - -Remove -
    - $path): ?> -
    • - -
- -- cgit v1.2.3