diff --git a/3.0/modules/albumpassword/controllers/albumpassword.php b/3.0/modules/albumpassword/controllers/albumpassword.php index e2336f47..dfedcd2c 100644 --- a/3.0/modules/albumpassword/controllers/albumpassword.php +++ b/3.0/modules/albumpassword/controllers/albumpassword.php @@ -49,9 +49,12 @@ class albumpassword_Controller extends Controller { access::required("view", $item); access::required("edit", $item); - // Check for and delete the password. - $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $id)->find(); - if ($existing_password->loaded()) { + // Check for and delete the password and any cached ids assigned to it. + $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $id)->find_all(); + if (count($existing_password) > 0) { + foreach ($existing_password as $one_password) { + db::build()->delete("albumpassword_idcaches")->where("password_id", "=", $one_password->id)->execute(); + } db::build()->delete("items_albumpasswords")->where("album_id", "=", $id)->execute(); message::success(t("Password Removed.")); } @@ -70,9 +73,12 @@ class albumpassword_Controller extends Controller { $album_id = Input::instance()->post("item_id"); $album_password = Input::instance()->post("assignpassword_password"); - // Check for, and remove, any existing passwords. - $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_id)->find(); - if ($existing_password->loaded()) { + // Check for, and remove, any existing passwords and cached ids. + $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_id)->find_all(); + if (count($existing_password) > 0) { + foreach ($existing_password as $one_password) { + db::build()->delete("albumpassword_idcaches")->where("password_id", "=", $one_password->id)->execute(); + } db::build()->delete("items_albumpasswords")->where("album_id", "=", $album_id)->execute(); } @@ -82,6 +88,25 @@ class albumpassword_Controller extends Controller { $new_password->password = $album_password; $new_password->save(); + // Add the album to the id cache. + $cached_album = ORM::factory("albumpassword_idcache"); + $cached_album->password_id = $new_password->id; + $cached_album->item_id = $album_id; + $cached_album->save(); + + // Check for any sub-items within the album, add all of them to the id cache. + $items = ORM::factory("item", $album_id) + ->viewable() + ->descendants(); + if (count($items) > 0) { + foreach ($items as $one_item) { + $cached_item = ORM::factory("albumpassword_idcache"); + $cached_item->password_id = $new_password->id; + $cached_item->item_id = $one_item->id; + $cached_item->save(); + } + } + // Display a success message and close the dialog. message::success(t("Password saved.")); print "\n\n\n\n\n"; diff --git a/3.0/modules/albumpassword/helpers/MY_access.php b/3.0/modules/albumpassword/helpers/MY_access.php index 339426b6..bda1db32 100644 --- a/3.0/modules/albumpassword/helpers/MY_access.php +++ b/3.0/modules/albumpassword/helpers/MY_access.php @@ -21,38 +21,29 @@ class access extends access_Core { static function required($perm_name, $item) { // Original code from the required function in modules/gallery/helpers/access.php. - if (!self::can($perm_name, $item)) { + if (!access::can($perm_name, $item)) { if ($perm_name == "view") { // Treat as if the item didn't exist, don't leak any information. throw new Kohana_404_Exception(); } else { - self::forbidden(); + access::forbidden(); } // Begin rWatcher modifications. // Throw a 404 error when a user attempts to access a protected item, - // unless the password has been provided, or the user is the item's owner. + // unless the password has been provided, or the user is the item's owner. } elseif (module::get_var("albumpassword", "hideonly") == false) { - $album_item = ""; - do { - if ($album_item == "") { - if ($item->is_album()) { - $album_item = $item; - } else { - $album_item = $item->parent(); - } - } else { - $album_item = $album_item->parent(); - } - - $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_item->id)->find(); + $item_protected = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->id)->order_by("cache_id")->find_all(); + if (count($item_protected) > 0) { + $existing_password = ORM::factory("items_albumpassword")->where("id", "=", $item_protected[0]->password_id)->find(); if ($existing_password->loaded()) { if ((cookie::get("g3_albumpassword") != $existing_password->password) && - (identity::active_user()->id != $album_item->owner_id)) { + (identity::active_user()->id != $item->owner_id) && + (!identity::active_user()->admin)) { throw new Kohana_404_Exception(); } } - } while ($album_item->parent_id > 0); + } } } } diff --git a/3.0/modules/albumpassword/helpers/MY_item.php b/3.0/modules/albumpassword/helpers/MY_item.php index 1af98cdc..e26b65c6 100644 --- a/3.0/modules/albumpassword/helpers/MY_item.php +++ b/3.0/modules/albumpassword/helpers/MY_item.php @@ -29,10 +29,21 @@ class item extends item_Core { // If not, hide whatever is restricted by an album password // that the current user is not the owner of. if (!identity::active_user()->admin) { - $model->and_open()->join("items_albumpasswords", "items.id", "items_albumpasswords.album_id", "LEFT OUTER") - ->and_where("items_albumpasswords.album_id", "IS", NULL) - ->or_where("items_albumpasswords.password", "=", cookie::get("g3_albumpassword")) - ->or_where("items.owner_id", "=", identity::active_user()->id)->close(); + + // Display items that are not in idcaches. + $model->and_open()->join("albumpassword_idcaches", "items.id", "albumpassword_idcaches.item_id", "LEFT OUTER") + ->and_where("albumpassword_idcaches.item_id", "IS", NULL); + + // ... Unless their password id corresponds with a valid password. + $existing_password = ORM::factory("items_albumpassword")->where("password", "=", cookie::get("g3_albumpassword"))->find_all(); + if (count($existing_password) > 0) { + foreach ($existing_password as $one_password) { + $model->or_where("albumpassword_idcaches.password_id", "=", $one_password->id); + } + } + + // Or the current user is the owner of the item. + $model->or_where("items.owner_id", "=", identity::active_user()->id)->close(); } return $model; diff --git a/3.0/modules/albumpassword/helpers/albumpassword_event.php b/3.0/modules/albumpassword/helpers/albumpassword_event.php index 72d549a4..0c9210ea 100644 --- a/3.0/modules/albumpassword/helpers/albumpassword_event.php +++ b/3.0/modules/albumpassword/helpers/albumpassword_event.php @@ -81,27 +81,64 @@ class albumpassword_event_Core { ->css_id("g-album-password-remove") ->url(url::site("albumpassword/remove/" . $item->id))); } elseif ($item->id != 1) { - $menu->get("options_menu") - ->append(Menu::factory("dialog") - ->id("albumpassword_assign") - ->label(t("Assign password")) - ->css_id("g-album-password-assign") - ->url(url::site("albumpassword/assign/" . $item->id))); + $passworded_subitems = ORM::factory("item", $item->id) + ->and_open()->join("albumpassword_idcaches", "items.id", "albumpassword_idcaches.item_id", "LEFT OUTER") + ->where("albumpassword_idcaches.item_id", "IS NOT", NULL)->close() + ->descendants(); + + $existing_cacheditem = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->id)->order_by("cache_id")->find_all(); + if ((count($existing_cacheditem) == 0) && count($passworded_subitems) == 0) { + $menu->get("options_menu") + ->append(Menu::factory("dialog") + ->id("albumpassword_assign") + ->label(t("Assign password")) + ->css_id("g-album-password-assign") + ->url(url::site("albumpassword/assign/" . $item->id))); + } } } } } static function item_deleted($item) { - // If an album is deleted, remove any associated passwords. - $existingPasswords = ORM::factory("items_albumpassword") - ->where("album_id", "=", $item->id) - ->find_all(); - if (count($existingPasswords) > 0) { - db::build()->delete("items_albumpassword")->where("album_id", "=", $item->id)->execute(); + // Check for and delete the password and any cached ids assigned to it. + $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $item->id)->find_all(); + if (count($existing_password) > 0) { + foreach ($existing_password as $one_password) { + db::build()->delete("albumpassword_idcaches")->where("password_id", "=", $one_password->id)->execute(); + } + db::build()->delete("items_albumpasswords")->where("album_id", "=", $item->id)->execute(); + message::success(t("Password Removed.")); + } else { + db::build()->delete("albumpassword_idcaches")->where("item_id", "=", $item->id)->execute(); } } + static function item_created($item) { + // Check for any already existing password on parent album(s), if found, generate cache data for the new item. + $existing_password = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->parent_id)->order_by("cache_id")->find_all(); + if (count($existing_password) > 0) { + $new_cachedid = ORM::factory("albumpassword_idcache"); + $new_cachedid->password_id = $existing_password[0]->password_id; + $new_cachedid->item_id = $item->id; + $new_cachedid->save(); + } + } + + static function item_moved($item, $old_parent) { + // Delete any existing cache data. + db::build()->delete("albumpassword_idcaches")->where("item_id", "=", $item->id)->execute(); + + // Check for a password on the new parent, generate cache data if necessary. + $existing_password = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->parent_id)->order_by("cache_id")->find_all(); + if (count($existing_password) > 0) { + $new_cachedid = ORM::factory("albumpassword_idcache"); + $new_cachedid->password_id = $existing_password[0]->password_id; + $new_cachedid->item_id = $item->id; + $new_cachedid->save(); + } + } + static function admin_menu($menu, $theme) { // Add a link to the Album Password admin page to the Content menu. $menu->get("settings_menu") diff --git a/3.0/modules/albumpassword/helpers/albumpassword_installer.php b/3.0/modules/albumpassword/helpers/albumpassword_installer.php index 075f252a..93a6d0c0 100644 --- a/3.0/modules/albumpassword/helpers/albumpassword_installer.php +++ b/3.0/modules/albumpassword/helpers/albumpassword_installer.php @@ -28,25 +28,45 @@ class albumpassword_installer { PRIMARY KEY (`id`)) DEFAULT CHARSET=utf8;"); + // Create a table to store a list of all protected items in. + $db->query("CREATE TABLE IF NOT EXISTS {albumpassword_idcaches} ( + `cache_id` int(9) NOT NULL auto_increment, + `password_id` int(9) NOT NULL, + `item_id` int(9) NOT NULL, + PRIMARY KEY (`cache_id`)) + DEFAULT CHARSET=utf8;"); + // Set the default value for this module's behavior. module::set_var("albumpassword", "hideonly", true); // Set the module's version number. - module::set_version("albumpassword", 2); + module::set_version("albumpassword", 3); } static function upgrade($version) { - // Set the default value for this module's behavior. - module::set_var("albumpassword", "hideonly", true); - - // Set the module's version number. - module::set_version("albumpassword", 2); + $db = Database::instance(); + if ($version == 1) { + // Set the default value for this module's behavior. + module::set_var("albumpassword", "hideonly", true); + module::set_version("albumpassword", $version = 2); + } + if ($version == 2) { + // Create a table to store a list of all protected items in. + $db->query("CREATE TABLE IF NOT EXISTS {albumpassword_idcaches} ( + `cache_id` int(9) NOT NULL auto_increment, + `password_id` int(9) NOT NULL, + `item_id` int(9) NOT NULL, + PRIMARY KEY (`cache_id`)) + DEFAULT CHARSET=utf8;"); + module::set_version("albumpassword", $version = 3); + } } static function uninstall() { // Delete the password table before uninstalling. $db = Database::instance(); - $db->query("DROP TABLE IF EXISTS {items_albumpassword};"); + $db->query("DROP TABLE IF EXISTS {items_albumpasswords};"); + $db->query("DROP TABLE IF EXISTS {albumpassword_idcaches};"); module::delete("albumpassword"); } } diff --git a/3.0/modules/albumpassword/helpers/albumpassword_task.php b/3.0/modules/albumpassword/helpers/albumpassword_task.php new file mode 100644 index 00000000..b6ea007a --- /dev/null +++ b/3.0/modules/albumpassword/helpers/albumpassword_task.php @@ -0,0 +1,138 @@ +join("albumpassword_idcaches", "items_albumpasswords.id", "albumpassword_idcaches.password_id", "LEFT OUTER") + ->and_where("albumpassword_idcaches.password_id", "IS", NULL)->count_all(); + + return array(Task_Definition::factory() + ->callback("albumpassword_task::update_idcaches") + ->name(t("Rebuild Album Password ID Caches DB")) + ->description(t("Logs the contents of all protected albums into the db.")) + ->severity($bad_albums ? log::WARNING : log::SUCCESS)); + } + + static function update_idcaches($task) { + // Populate the idcaches table with the contents of all protected albums. + + $start = microtime(true); + $total = $task->get("total"); + $existing_passwords = ORM::factory("items_albumpassword")->find_all(); + // If this is the first time this function has been run, + // delete and re-create the idcaches table, and set up + // some initial variables. + if (empty($total)) { + // Delete the idcache table and make a new one. + $db = Database::instance(); + $db->query("DROP TABLE IF EXISTS {albumpassword_idcaches};"); + $db->query("CREATE TABLE IF NOT EXISTS {albumpassword_idcaches} ( + `cache_id` int(9) NOT NULL auto_increment, + `password_id` int(9) NOT NULL, + `item_id` int(9) NOT NULL, + PRIMARY KEY (`cache_id`)) + DEFAULT CHARSET=utf8;"); + + // Set the initial values for all variables. + $task->set("total", count($existing_passwords)); + $total = $task->get("total"); + $task->set("last_album_counter", 0); + $task->set("last_id", 0); + $task->set("completed_albums", 0); + $task->set("completed_items", 0); + $task->set("total_items", 0); + } + + // Retrieve the values for variables from the last time this + // function was run. + $last_album_counter = $task->get("last_album_counter"); + $completed_albums = $task->get("completed_albums"); + $completed_items = $task->get("completed_items"); + $total_items = $task->get("total_items"); + $last_id = $task->get("last_id"); + + // If completed_items is 0, then we're just starting to process this + // album. Add the album to idcaches before adding it's contents. + if ($completed_items == 0) { + // Add the album to the id cache. + $cached_album = ORM::factory("albumpassword_idcache"); + $cached_album->password_id = $existing_passwords[$last_album_counter]->id; + $cached_album->item_id = $existing_passwords[$last_album_counter]->album_id; + $cached_album->save(); + + // Set total_items to the number of items in this album. + $total_items = ORM::factory("item", $existing_passwords[$last_album_counter]->album_id) + ->descendants_count(); + $task->set("total_items", $total_items); + } + + // Add each item in the album to idcaches. + foreach (ORM::factory("item", $existing_passwords[$last_album_counter]->album_id) + ->where("id", ">", $last_id) + ->order_by("id") + ->descendants(100) as $item) { + + $cached_item = ORM::factory("albumpassword_idcache"); + $cached_item->password_id =$existing_passwords[$last_album_counter]->id; + $cached_item->item_id = $item->id; + $cached_item->save(); + + $last_id = $item->id; + $completed_items++; + + // Set a time limit so the script doesn't time out. + if (microtime(true) - $start > 1.5) { + break; + } + } // end foreach + + // If completed_items equals total_items, then we've + // processed everything in the current album. + // Increase variables and set everything up for the + // next album. + if ($completed_items == $total_items) { + $completed_items = 0; + $last_album_counter++; + $completed_albums++; + $last_id = 0; + } + + // Store the current values of the variables for the next + // time this function is called. + $task->set("last_album_counter", $last_album_counter); + $task->set("last_id", $last_id); + $task->set("completed_albums", $completed_albums); + $task->set("completed_items", $completed_items); + + // Display the number of albums that have been completed before exiting. + if ($total == $completed_albums) { + $task->done = true; + $task->state = "success"; + $task->percent_complete = 100; + $task->status = t("Scanning Protected Album $completed_albums of $total"); + } else { + $task->percent_complete = round(100 * $completed / $total); + $task->status = t("Scanning Protected Album $completed_albums of $total -- $completed_items / $total_items files"); + } + } +} diff --git a/3.0/modules/albumpassword/models/albumpassword_idcache.php b/3.0/modules/albumpassword/models/albumpassword_idcache.php new file mode 100644 index 00000000..e3d80667 --- /dev/null +++ b/3.0/modules/albumpassword/models/albumpassword_idcache.php @@ -0,0 +1,21 @@ +order_by("exif_coordinates.latitude", "ASC") ->descendants(); $curr_album = ORM::factory("item")->where("id", "=", $type_id)->find_all(); - $map_title = $curr_album[0]->name; + $map_title = $curr_album[0]->title; } elseif ($map_type == "user") { // Generate an array of all items uploaded by the current user that // have exif gps coordinates and order by latitude (to group items diff --git a/3.0/modules/exif_gps/helpers/exif_gps_task.php b/3.0/modules/exif_gps/helpers/exif_gps_task.php index c3bcc73c..b07646ad 100644 --- a/3.0/modules/exif_gps/helpers/exif_gps_task.php +++ b/3.0/modules/exif_gps/helpers/exif_gps_task.php @@ -50,16 +50,18 @@ class exif_gps_task_Core { $completed = $task->get("completed"); // Generate an array of the next 100 photos to check. - $all_photos = ORM::factory("item") - ->where("id", ">", $last_id) - ->where("type", "=", "photo") - ->find_all(100); + //$all_photos = ORM::factory("item") + // ->where("id", ">", $last_id) + // ->where("type", "=", "photo") + // ->order_by("id") + // ->find_all(100); // Check each photo in the array to see if it already has exif gps data associated with it. // If it doesn't, attempt to extract gps coordinates. foreach (ORM::factory("item") ->where("id", ">", $last_id) ->where("type", "=", "photo") + ->order_by("id") ->find_all(100) as $item) { $record = ORM::factory("exif_coordinate")->where("item_id", "=", $item->id)->find(); diff --git a/3.0/modules/gwtorganise/.classpath b/3.0/modules/gwtorganize/.classpath similarity index 100% rename from 3.0/modules/gwtorganise/.classpath rename to 3.0/modules/gwtorganize/.classpath diff --git a/3.0/modules/gwtorganise/.externalToolBuilders/New_Builder.launch b/3.0/modules/gwtorganize/.externalToolBuilders/New_Builder.launch similarity index 100% rename from 3.0/modules/gwtorganise/.externalToolBuilders/New_Builder.launch rename to 3.0/modules/gwtorganize/.externalToolBuilders/New_Builder.launch diff --git a/3.0/modules/gwtorganise/.project b/3.0/modules/gwtorganize/.project similarity index 100% rename from 3.0/modules/gwtorganise/.project rename to 3.0/modules/gwtorganize/.project diff --git a/3.0/modules/gwtorganise/.settings/com.google.appengine.eclipse.core.prefs b/3.0/modules/gwtorganize/.settings/com.google.appengine.eclipse.core.prefs similarity index 100% rename from 3.0/modules/gwtorganise/.settings/com.google.appengine.eclipse.core.prefs rename to 3.0/modules/gwtorganize/.settings/com.google.appengine.eclipse.core.prefs diff --git a/3.0/modules/gwtorganise/.settings/com.google.gdt.eclipse.core.prefs b/3.0/modules/gwtorganize/.settings/com.google.gdt.eclipse.core.prefs similarity index 100% rename from 3.0/modules/gwtorganise/.settings/com.google.gdt.eclipse.core.prefs rename to 3.0/modules/gwtorganize/.settings/com.google.gdt.eclipse.core.prefs diff --git a/3.0/modules/gwtorganise/.settings/com.google.gwt.eclipse.core.prefs b/3.0/modules/gwtorganize/.settings/com.google.gwt.eclipse.core.prefs similarity index 100% rename from 3.0/modules/gwtorganise/.settings/com.google.gwt.eclipse.core.prefs rename to 3.0/modules/gwtorganize/.settings/com.google.gwt.eclipse.core.prefs diff --git a/3.0/modules/gwtorganise/build.xml b/3.0/modules/gwtorganize/build.xml similarity index 100% rename from 3.0/modules/gwtorganise/build.xml rename to 3.0/modules/gwtorganize/build.xml diff --git a/3.0/modules/gwtorganise/controllers/admin_gwtorganise.php b/3.0/modules/gwtorganize/controllers/admin_gwtorganise.php similarity index 100% rename from 3.0/modules/gwtorganise/controllers/admin_gwtorganise.php rename to 3.0/modules/gwtorganize/controllers/admin_gwtorganise.php diff --git a/3.0/modules/gwtorganise/controllers/admin_upload_configure.php b/3.0/modules/gwtorganize/controllers/admin_upload_configure.php similarity index 100% rename from 3.0/modules/gwtorganise/controllers/admin_upload_configure.php rename to 3.0/modules/gwtorganize/controllers/admin_upload_configure.php diff --git a/3.0/modules/gwtorganise/controllers/json_album.php b/3.0/modules/gwtorganize/controllers/json_album.php similarity index 100% rename from 3.0/modules/gwtorganise/controllers/json_album.php rename to 3.0/modules/gwtorganize/controllers/json_album.php diff --git a/3.0/modules/gwtorganise/helpers/gwtorganise_event.php b/3.0/modules/gwtorganize/helpers/gwtorganise_event.php similarity index 100% rename from 3.0/modules/gwtorganise/helpers/gwtorganise_event.php rename to 3.0/modules/gwtorganize/helpers/gwtorganise_event.php diff --git a/3.0/modules/gwtorganise/helpers/gwtorganise_installer.php b/3.0/modules/gwtorganize/helpers/gwtorganise_installer.php similarity index 100% rename from 3.0/modules/gwtorganise/helpers/gwtorganise_installer.php rename to 3.0/modules/gwtorganize/helpers/gwtorganise_installer.php diff --git a/3.0/modules/gwtorganise/helpers/revision.php b/3.0/modules/gwtorganize/helpers/revision.php similarity index 100% rename from 3.0/modules/gwtorganise/helpers/revision.php rename to 3.0/modules/gwtorganize/helpers/revision.php diff --git a/3.0/modules/gwtorganise/helpers/upload_configuration.php b/3.0/modules/gwtorganize/helpers/upload_configuration.php similarity index 100% rename from 3.0/modules/gwtorganise/helpers/upload_configuration.php rename to 3.0/modules/gwtorganize/helpers/upload_configuration.php diff --git a/3.0/modules/gwtorganise/module.info b/3.0/modules/gwtorganize/module.info similarity index 100% rename from 3.0/modules/gwtorganise/module.info rename to 3.0/modules/gwtorganize/module.info diff --git a/3.0/modules/gwtorganise/src/META-INF/jdoconfig.xml b/3.0/modules/gwtorganize/src/META-INF/jdoconfig.xml similarity index 100% rename from 3.0/modules/gwtorganise/src/META-INF/jdoconfig.xml rename to 3.0/modules/gwtorganize/src/META-INF/jdoconfig.xml diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/G3viewer.gwt.xml b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/G3viewer.gwt.xml similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/G3viewer.gwt.xml rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/G3viewer.gwt.xml diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/Album.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/Album.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/Album.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/Album.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumItemDropContainer.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumItemDropContainer.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumItemDropContainer.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumItemDropContainer.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumTree.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumTree.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumTree.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumTree.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumTreeDropController.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumTreeDropController.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumTreeDropController.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumTreeDropController.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/AsyncResizer.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/AsyncResizer.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/AsyncResizer.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/AsyncResizer.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/AsyncRunner.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/AsyncRunner.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/AsyncRunner.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/AsyncRunner.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/ConfirmDialogBox.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/ConfirmDialogBox.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/ConfirmDialogBox.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/ConfirmDialogBox.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/DropZoneController.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/DropZoneController.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/DropZoneController.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/DropZoneController.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/G3Viewer.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/G3Viewer.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/G3Viewer.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/G3Viewer.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpDialogBox.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpDialogBox.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpDialogBox.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpDialogBox.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpDialogHandler.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpDialogHandler.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpDialogHandler.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpDialogHandler.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpSuccessHandler.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpSuccessHandler.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpSuccessHandler.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpSuccessHandler.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/ImageDialogBox.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/ImageDialogBox.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/ImageDialogBox.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/ImageDialogBox.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/InformationBar.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/InformationBar.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/InformationBar.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/InformationBar.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/Item.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/Item.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/Item.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/Item.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/JSONResponseCallback.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/JSONResponseCallback.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/JSONResponseCallback.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/JSONResponseCallback.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/JSONResponseTextHandler.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/JSONResponseTextHandler.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/JSONResponseTextHandler.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/JSONResponseTextHandler.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/Loading.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/Loading.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/Loading.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/Loading.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/MyPickupDragController.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/MyPickupDragController.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/MyPickupDragController.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/MyPickupDragController.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/ResizeOptions.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/ResizeOptions.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/ResizeOptions.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/ResizeOptions.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadControl.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadControl.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadControl.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadControl.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadControlNoGears.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadControlNoGears.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadControlNoGears.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadControlNoGears.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadFile.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadFile.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadFile.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadFile.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/Utils.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/Utils.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/Utils.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/Utils.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/View.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/View.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/View.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/View.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/Canvas.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/Canvas.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/Canvas.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/Canvas.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/Factory.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/Factory.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/Factory.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/Factory.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/ResizeFilter.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/ResizeFilter.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/ResizeFilter.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/ResizeFilter.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.java b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.java similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.java rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.java diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/public/G3viewer.css b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/public/G3viewer.css similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/public/G3viewer.css rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/public/G3viewer.css diff --git a/3.0/modules/gwtorganise/src/com/gloopics/g3viewer/public/loading.gif b/3.0/modules/gwtorganize/src/com/gloopics/g3viewer/public/loading.gif similarity index 100% rename from 3.0/modules/gwtorganise/src/com/gloopics/g3viewer/public/loading.gif rename to 3.0/modules/gwtorganize/src/com/gloopics/g3viewer/public/loading.gif diff --git a/3.0/modules/gwtorganise/src/log4j.properties b/3.0/modules/gwtorganize/src/log4j.properties similarity index 100% rename from 3.0/modules/gwtorganise/src/log4j.properties rename to 3.0/modules/gwtorganize/src/log4j.properties diff --git a/3.0/modules/gwtorganise/views/gwtorganise_view.html.php b/3.0/modules/gwtorganize/views/gwtorganise_view.html.php similarity index 100% rename from 3.0/modules/gwtorganise/views/gwtorganise_view.html.php rename to 3.0/modules/gwtorganize/views/gwtorganise_view.html.php diff --git a/3.0/modules/gwtorganise/war/.htaccess b/3.0/modules/gwtorganize/war/.htaccess similarity index 100% rename from 3.0/modules/gwtorganise/war/.htaccess rename to 3.0/modules/gwtorganize/war/.htaccess diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/META-INF/jdoconfig.xml b/3.0/modules/gwtorganize/war/WEB-INF/classes/META-INF/jdoconfig.xml similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/META-INF/jdoconfig.xml rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/META-INF/jdoconfig.xml diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/G3viewer.gwt.xml b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/G3viewer.gwt.xml similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/G3viewer.gwt.xml rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/G3viewer.gwt.xml diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$10.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$10.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$10.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$10.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$11.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$11.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$11.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$11.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$12.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$12.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$12.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$12.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$5.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$5.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$5.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$5.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$6.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$6.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$6.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$6.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$7.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$7.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$7.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$7.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$8.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$8.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$8.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$8.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$9.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$9.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$9.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$9.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumItemDropContainer.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumItemDropContainer.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumItemDropContainer.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumItemDropContainer.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTreeDropController.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTreeDropController.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTreeDropController.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTreeDropController.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncResizer.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncResizer.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncResizer.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncResizer.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncRunner.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncRunner.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncRunner.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncRunner.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$2.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$2.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$2.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$2.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$ConfirmCallBack.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$ConfirmCallBack.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$ConfirmCallBack.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$ConfirmCallBack.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/DropZoneController.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/DropZoneController.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/DropZoneController.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/DropZoneController.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$2.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$2.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$2.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$2.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$SimplePanelEx.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$SimplePanelEx.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$SimplePanelEx.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$SimplePanelEx.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$2.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$2.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$2.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$2.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$3.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$3.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$3.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$3.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$4.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$4.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$4.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$4.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$5.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$5.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$5.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$5.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$RequestCallbackImpl.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$RequestCallbackImpl.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$RequestCallbackImpl.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$RequestCallbackImpl.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogHandler.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogHandler.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogHandler.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogHandler.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpSuccessHandler.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpSuccessHandler.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpSuccessHandler.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpSuccessHandler.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$2.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$2.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$2.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$2.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$3.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$3.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$3.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$3.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$2.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$2.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$2.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$2.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$3.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$3.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$3.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$3.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$9.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$9.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$9.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$9.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseCallback.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseCallback.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseCallback.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseCallback.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseTextHandler.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseTextHandler.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseTextHandler.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseTextHandler.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Loading.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Loading.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Loading.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Loading.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/MyPickupDragController.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/MyPickupDragController.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/MyPickupDragController.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/MyPickupDragController.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ResizeOptions.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ResizeOptions.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ResizeOptions.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ResizeOptions.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControl.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControl.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControl.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControl.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControlNoGears.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControlNoGears.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControlNoGears.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControlNoGears.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$2.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$2.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$2.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$2.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$3.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$3.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$3.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$3.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$ProgressBar.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$ProgressBar.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$ProgressBar.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$ProgressBar.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Utils.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Utils.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Utils.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Utils.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Canvas.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Canvas.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Canvas.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Canvas.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Factory.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Factory.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Factory.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Factory.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$2.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$2.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$2.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$2.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears$1.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears$1.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears$1.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears$1.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.class b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.class similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.class rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.class diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/public/G3viewer.css b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/public/G3viewer.css similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/public/G3viewer.css rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/public/G3viewer.css diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/public/loading.gif b/3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/public/loading.gif similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/public/loading.gif rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/public/loading.gif diff --git a/3.0/modules/gwtorganise/war/WEB-INF/classes/log4j.properties b/3.0/modules/gwtorganize/war/WEB-INF/classes/log4j.properties similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/classes/log4j.properties rename to 3.0/modules/gwtorganize/war/WEB-INF/classes/log4j.properties diff --git a/3.0/modules/gwtorganise/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar b/3.0/modules/gwtorganize/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar rename to 3.0/modules/gwtorganize/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar diff --git a/3.0/modules/gwtorganise/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar b/3.0/modules/gwtorganize/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar rename to 3.0/modules/gwtorganize/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar diff --git a/3.0/modules/gwtorganise/war/WEB-INF/lib/datanucleus-appengine-1.0.3.jar b/3.0/modules/gwtorganize/war/WEB-INF/lib/datanucleus-appengine-1.0.3.jar similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/lib/datanucleus-appengine-1.0.3.jar rename to 3.0/modules/gwtorganize/war/WEB-INF/lib/datanucleus-appengine-1.0.3.jar diff --git a/3.0/modules/gwtorganise/war/WEB-INF/lib/datanucleus-core-1.1.5.jar b/3.0/modules/gwtorganize/war/WEB-INF/lib/datanucleus-core-1.1.5.jar similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/lib/datanucleus-core-1.1.5.jar rename to 3.0/modules/gwtorganize/war/WEB-INF/lib/datanucleus-core-1.1.5.jar diff --git a/3.0/modules/gwtorganise/war/WEB-INF/lib/datanucleus-jpa-1.1.5.jar b/3.0/modules/gwtorganize/war/WEB-INF/lib/datanucleus-jpa-1.1.5.jar similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/lib/datanucleus-jpa-1.1.5.jar rename to 3.0/modules/gwtorganize/war/WEB-INF/lib/datanucleus-jpa-1.1.5.jar diff --git a/3.0/modules/gwtorganise/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar b/3.0/modules/gwtorganize/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar rename to 3.0/modules/gwtorganize/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar diff --git a/3.0/modules/gwtorganise/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar b/3.0/modules/gwtorganize/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar rename to 3.0/modules/gwtorganize/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar diff --git a/3.0/modules/gwtorganise/war/WEB-INF/lib/gwt-servlet.jar b/3.0/modules/gwtorganize/war/WEB-INF/lib/gwt-servlet.jar similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/lib/gwt-servlet.jar rename to 3.0/modules/gwtorganize/war/WEB-INF/lib/gwt-servlet.jar diff --git a/3.0/modules/gwtorganise/war/WEB-INF/lib/jdo2-api-2.3-eb.jar b/3.0/modules/gwtorganize/war/WEB-INF/lib/jdo2-api-2.3-eb.jar similarity index 100% rename from 3.0/modules/gwtorganise/war/WEB-INF/lib/jdo2-api-2.3-eb.jar rename to 3.0/modules/gwtorganize/war/WEB-INF/lib/jdo2-api-2.3-eb.jar diff --git a/3.0/modules/gwtorganise/war/g3viewer/0A9476898799A150D840F0B1C3672921.cache.png b/3.0/modules/gwtorganize/war/g3viewer/0A9476898799A150D840F0B1C3672921.cache.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/0A9476898799A150D840F0B1C3672921.cache.png rename to 3.0/modules/gwtorganize/war/g3viewer/0A9476898799A150D840F0B1C3672921.cache.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html b/3.0/modules/gwtorganize/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html b/3.0/modules/gwtorganize/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/396F806CD63ABD414BFBB9D57429F05B.cache.png b/3.0/modules/gwtorganize/war/g3viewer/396F806CD63ABD414BFBB9D57429F05B.cache.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/396F806CD63ABD414BFBB9D57429F05B.cache.png rename to 3.0/modules/gwtorganize/war/g3viewer/396F806CD63ABD414BFBB9D57429F05B.cache.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html b/3.0/modules/gwtorganize/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html b/3.0/modules/gwtorganize/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html b/3.0/modules/gwtorganize/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html b/3.0/modules/gwtorganize/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html b/3.0/modules/gwtorganize/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/8603379B5088782D2C0620FAE856E112.cache.png b/3.0/modules/gwtorganize/war/g3viewer/8603379B5088782D2C0620FAE856E112.cache.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/8603379B5088782D2C0620FAE856E112.cache.png rename to 3.0/modules/gwtorganize/war/g3viewer/8603379B5088782D2C0620FAE856E112.cache.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html b/3.0/modules/gwtorganize/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html b/3.0/modules/gwtorganize/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html b/3.0/modules/gwtorganize/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html b/3.0/modules/gwtorganize/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html b/3.0/modules/gwtorganize/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html rename to 3.0/modules/gwtorganize/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/DF7764EEC1903CD03C9545B354D8D8E4.cache.png b/3.0/modules/gwtorganize/war/g3viewer/DF7764EEC1903CD03C9545B354D8D8E4.cache.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/DF7764EEC1903CD03C9545B354D8D8E4.cache.png rename to 3.0/modules/gwtorganize/war/g3viewer/DF7764EEC1903CD03C9545B354D8D8E4.cache.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/E44767377485D18D6B6864F65BA8EF73.cache.png b/3.0/modules/gwtorganize/war/g3viewer/E44767377485D18D6B6864F65BA8EF73.cache.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/E44767377485D18D6B6864F65BA8EF73.cache.png rename to 3.0/modules/gwtorganize/war/g3viewer/E44767377485D18D6B6864F65BA8EF73.cache.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/EDC7827FEEA59EE44AD790B1C6430C45.cache.png b/3.0/modules/gwtorganize/war/g3viewer/EDC7827FEEA59EE44AD790B1C6430C45.cache.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/EDC7827FEEA59EE44AD790B1C6430C45.cache.png rename to 3.0/modules/gwtorganize/war/g3viewer/EDC7827FEEA59EE44AD790B1C6430C45.cache.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/G3viewer.css b/3.0/modules/gwtorganize/war/g3viewer/G3viewer.css similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/G3viewer.css rename to 3.0/modules/gwtorganize/war/g3viewer/G3viewer.css diff --git a/3.0/modules/gwtorganise/war/g3viewer/clear.cache.gif b/3.0/modules/gwtorganize/war/g3viewer/clear.cache.gif similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/clear.cache.gif rename to 3.0/modules/gwtorganize/war/g3viewer/clear.cache.gif diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js b/3.0/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js rename to 3.0/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/g3viewer.nocache.js b/3.0/modules/gwtorganize/war/g3viewer/g3viewer.nocache.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/g3viewer.nocache.js rename to 3.0/modules/gwtorganize/war/g3viewer/g3viewer.nocache.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/gears_init.js b/3.0/modules/gwtorganize/war/g3viewer/gears_init.js similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gears_init.js rename to 3.0/modules/gwtorganize/war/g3viewer/gears_init.js diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/corner.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/corner.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/corner.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/corner.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/corner_ie6.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/corner_ie6.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/corner_ie6.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/corner_ie6.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/hborder.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/hborder.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/hborder.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/hborder.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/hborder_ie6.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/hborder_ie6.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/hborder_ie6.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/hborder_ie6.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topleft.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topleft.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topleft.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topleft.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topright.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topright.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topright.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topright.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/hborder_blue_shadow.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/hborder_blue_shadow.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/hborder_blue_shadow.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/hborder_blue_shadow.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/hborder_gray_shadow.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/hborder_gray_shadow.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/hborder_gray_shadow.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/hborder_gray_shadow.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/vborder_blue_shadow.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/vborder_blue_shadow.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/vborder_blue_shadow.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/vborder_blue_shadow.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/vborder_gray_shadow.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/vborder_gray_shadow.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/vborder_gray_shadow.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/vborder_gray_shadow.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/vborder.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/vborder.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/vborder.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/vborder.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/vborder_ie6.png b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/vborder_ie6.png similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/images/vborder_ie6.png rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/images/vborder_ie6.png diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/standard.css b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/standard.css similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/standard.css rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/standard.css diff --git a/3.0/modules/gwtorganise/war/g3viewer/gwt/standard/standard_rtl.css b/3.0/modules/gwtorganize/war/g3viewer/gwt/standard/standard_rtl.css similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/gwt/standard/standard_rtl.css rename to 3.0/modules/gwtorganize/war/g3viewer/gwt/standard/standard_rtl.css diff --git a/3.0/modules/gwtorganise/war/g3viewer/hosted.html b/3.0/modules/gwtorganize/war/g3viewer/hosted.html similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/hosted.html rename to 3.0/modules/gwtorganize/war/g3viewer/hosted.html diff --git a/3.0/modules/gwtorganise/war/g3viewer/loading.gif b/3.0/modules/gwtorganize/war/g3viewer/loading.gif similarity index 100% rename from 3.0/modules/gwtorganise/war/g3viewer/loading.gif rename to 3.0/modules/gwtorganize/war/g3viewer/loading.gif diff --git a/3.0/modules/gwtorganise/war/index.php b/3.0/modules/gwtorganize/war/index.php similarity index 100% rename from 3.0/modules/gwtorganise/war/index.php rename to 3.0/modules/gwtorganize/war/index.php diff --git a/3.0/modules/photoannotation/controllers/admin_photoannotation.php b/3.0/modules/photo_annotation/controllers/admin_photoannotation.php old mode 100755 new mode 100644 similarity index 100% rename from 3.0/modules/photoannotation/controllers/admin_photoannotation.php rename to 3.0/modules/photo_annotation/controllers/admin_photoannotation.php diff --git a/3.0/modules/photoannotation/controllers/photoannotation.php b/3.0/modules/photo_annotation/controllers/photoannotation.php similarity index 100% rename from 3.0/modules/photoannotation/controllers/photoannotation.php rename to 3.0/modules/photo_annotation/controllers/photoannotation.php diff --git a/3.0/modules/photoannotation/css/colorpicker.css b/3.0/modules/photo_annotation/css/colorpicker.css similarity index 94% rename from 3.0/modules/photoannotation/css/colorpicker.css rename to 3.0/modules/photo_annotation/css/colorpicker.css index 05b02b48..0b3d5d93 100644 --- a/3.0/modules/photoannotation/css/colorpicker.css +++ b/3.0/modules/photo_annotation/css/colorpicker.css @@ -1,161 +1,161 @@ -.colorpicker { - width: 356px; - height: 176px; - overflow: hidden; - position: absolute; - background: url(../images/colorpicker_background.png); - font-family: Arial, Helvetica, sans-serif; - display: none; -} -.colorpicker_color { - width: 150px; - height: 150px; - left: 14px; - top: 13px; - position: absolute; - background: #f00; - overflow: hidden; - cursor: crosshair; -} -.colorpicker_color div { - position: absolute; - top: 0; - left: 0; - width: 150px; - height: 150px; - background: url(../images/colorpicker_overlay.png); -} -.colorpicker_color div div { - position: absolute; - top: 0; - left: 0; - width: 11px; - height: 11px; - overflow: hidden; - background: url(../images/colorpicker_select.gif); - margin: -5px 0 0 -5px; -} -.colorpicker_hue { - position: absolute; - top: 13px; - left: 171px; - width: 35px; - height: 150px; - cursor: n-resize; -} -.colorpicker_hue div { - position: absolute; - width: 35px; - height: 9px; - overflow: hidden; - background: url(../images/colorpicker_indic.gif) left top; - margin: -4px 0 0 0; - left: 0px; -} -.colorpicker_new_color { - position: absolute; - width: 60px; - height: 30px; - left: 213px; - top: 13px; - background: #f00; -} -.colorpicker_current_color { - position: absolute; - width: 60px; - height: 30px; - left: 283px; - top: 13px; - background: #f00; -} -.colorpicker input { - background-color: transparent; - border: 1px solid transparent; - position: absolute; - font-size: 10px; - font-family: Arial, Helvetica, sans-serif; - color: #898989; - top: 4px; - right: 11px; - text-align: right; - margin: 0; - padding: 0; - height: 11px; -} -.colorpicker_hex { - position: absolute; - width: 72px; - height: 22px; - background: url(../images/colorpicker_hex.png) top; - left: 212px; - top: 142px; -} -.colorpicker_hex input { - right: 6px; -} -.colorpicker_field { - height: 22px; - width: 62px; - background-position: top; - position: absolute; -} -.colorpicker_field span { - position: absolute; - width: 12px; - height: 22px; - overflow: hidden; - top: 0; - right: 0; - cursor: n-resize; -} -.colorpicker_rgb_r { - background-image: url(../images/colorpicker_rgb_r.png); - top: 52px; - left: 212px; -} -.colorpicker_rgb_g { - background-image: url(../images/colorpicker_rgb_g.png); - top: 82px; - left: 212px; -} -.colorpicker_rgb_b { - background-image: url(../images/colorpicker_rgb_b.png); - top: 112px; - left: 212px; -} -.colorpicker_hsb_h { - background-image: url(../images/colorpicker_hsb_h.png); - top: 52px; - left: 282px; -} -.colorpicker_hsb_s { - background-image: url(../images/colorpicker_hsb_s.png); - top: 82px; - left: 282px; -} -.colorpicker_hsb_b { - background-image: url(../images/colorpicker_hsb_b.png); - top: 112px; - left: 282px; -} -.colorpicker_submit { - position: absolute; - width: 22px; - height: 22px; - background: url(../images/colorpicker_submit.png) top; - left: 322px; - top: 142px; - overflow: hidden; -} -.colorpicker_focus { - background-position: center; -} -.colorpicker_hex.colorpicker_focus { - background-position: bottom; -} -.colorpicker_submit.colorpicker_focus { - background-position: bottom; -} -.colorpicker_slider { - background-position: bottom; -} +.colorpicker { + width: 356px; + height: 176px; + overflow: hidden; + position: absolute; + background: url(../images/colorpicker_background.png); + font-family: Arial, Helvetica, sans-serif; + display: none; +} +.colorpicker_color { + width: 150px; + height: 150px; + left: 14px; + top: 13px; + position: absolute; + background: #f00; + overflow: hidden; + cursor: crosshair; +} +.colorpicker_color div { + position: absolute; + top: 0; + left: 0; + width: 150px; + height: 150px; + background: url(../images/colorpicker_overlay.png); +} +.colorpicker_color div div { + position: absolute; + top: 0; + left: 0; + width: 11px; + height: 11px; + overflow: hidden; + background: url(../images/colorpicker_select.gif); + margin: -5px 0 0 -5px; +} +.colorpicker_hue { + position: absolute; + top: 13px; + left: 171px; + width: 35px; + height: 150px; + cursor: n-resize; +} +.colorpicker_hue div { + position: absolute; + width: 35px; + height: 9px; + overflow: hidden; + background: url(../images/colorpicker_indic.gif) left top; + margin: -4px 0 0 0; + left: 0px; +} +.colorpicker_new_color { + position: absolute; + width: 60px; + height: 30px; + left: 213px; + top: 13px; + background: #f00; +} +.colorpicker_current_color { + position: absolute; + width: 60px; + height: 30px; + left: 283px; + top: 13px; + background: #f00; +} +.colorpicker input { + background-color: transparent; + border: 1px solid transparent; + position: absolute; + font-size: 10px; + font-family: Arial, Helvetica, sans-serif; + color: #898989; + top: 4px; + right: 11px; + text-align: right; + margin: 0; + padding: 0; + height: 11px; +} +.colorpicker_hex { + position: absolute; + width: 72px; + height: 22px; + background: url(../images/colorpicker_hex.png) top; + left: 212px; + top: 142px; +} +.colorpicker_hex input { + right: 6px; +} +.colorpicker_field { + height: 22px; + width: 62px; + background-position: top; + position: absolute; +} +.colorpicker_field span { + position: absolute; + width: 12px; + height: 22px; + overflow: hidden; + top: 0; + right: 0; + cursor: n-resize; +} +.colorpicker_rgb_r { + background-image: url(../images/colorpicker_rgb_r.png); + top: 52px; + left: 212px; +} +.colorpicker_rgb_g { + background-image: url(../images/colorpicker_rgb_g.png); + top: 82px; + left: 212px; +} +.colorpicker_rgb_b { + background-image: url(../images/colorpicker_rgb_b.png); + top: 112px; + left: 212px; +} +.colorpicker_hsb_h { + background-image: url(../images/colorpicker_hsb_h.png); + top: 52px; + left: 282px; +} +.colorpicker_hsb_s { + background-image: url(../images/colorpicker_hsb_s.png); + top: 82px; + left: 282px; +} +.colorpicker_hsb_b { + background-image: url(../images/colorpicker_hsb_b.png); + top: 112px; + left: 282px; +} +.colorpicker_submit { + position: absolute; + width: 22px; + height: 22px; + background: url(../images/colorpicker_submit.png) top; + left: 322px; + top: 142px; + overflow: hidden; +} +.colorpicker_focus { + background-position: center; +} +.colorpicker_hex.colorpicker_focus { + background-position: bottom; +} +.colorpicker_submit.colorpicker_focus { + background-position: bottom; +} +.colorpicker_slider { + background-position: bottom; +} diff --git a/3.0/modules/photoannotation/css/photoannotation.css b/3.0/modules/photo_annotation/css/photoannotation.css similarity index 100% rename from 3.0/modules/photoannotation/css/photoannotation.css rename to 3.0/modules/photo_annotation/css/photoannotation.css diff --git a/3.0/modules/photoannotation/helpers/photoannotation.php b/3.0/modules/photo_annotation/helpers/photoannotation.php similarity index 100% rename from 3.0/modules/photoannotation/helpers/photoannotation.php rename to 3.0/modules/photo_annotation/helpers/photoannotation.php diff --git a/3.0/modules/photoannotation/helpers/photoannotation_block.php b/3.0/modules/photo_annotation/helpers/photoannotation_block.php similarity index 100% rename from 3.0/modules/photoannotation/helpers/photoannotation_block.php rename to 3.0/modules/photo_annotation/helpers/photoannotation_block.php diff --git a/3.0/modules/photoannotation/helpers/photoannotation_event.php b/3.0/modules/photo_annotation/helpers/photoannotation_event.php similarity index 100% rename from 3.0/modules/photoannotation/helpers/photoannotation_event.php rename to 3.0/modules/photo_annotation/helpers/photoannotation_event.php diff --git a/3.0/modules/photoannotation/helpers/photoannotation_installer.php b/3.0/modules/photo_annotation/helpers/photoannotation_installer.php similarity index 100% rename from 3.0/modules/photoannotation/helpers/photoannotation_installer.php rename to 3.0/modules/photo_annotation/helpers/photoannotation_installer.php diff --git a/3.0/modules/photoannotation/helpers/photoannotation_theme.php b/3.0/modules/photo_annotation/helpers/photoannotation_theme.php similarity index 100% rename from 3.0/modules/photoannotation/helpers/photoannotation_theme.php rename to 3.0/modules/photo_annotation/helpers/photoannotation_theme.php diff --git a/3.0/modules/photoannotation/images/blank.gif b/3.0/modules/photo_annotation/images/blank.gif similarity index 100% rename from 3.0/modules/photoannotation/images/blank.gif rename to 3.0/modules/photo_annotation/images/blank.gif diff --git a/3.0/modules/photoannotation/images/colorpicker_background.png b/3.0/modules/photo_annotation/images/colorpicker_background.png similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_background.png rename to 3.0/modules/photo_annotation/images/colorpicker_background.png diff --git a/3.0/modules/photoannotation/images/colorpicker_hex.png b/3.0/modules/photo_annotation/images/colorpicker_hex.png similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_hex.png rename to 3.0/modules/photo_annotation/images/colorpicker_hex.png diff --git a/3.0/modules/photoannotation/images/colorpicker_hsb_b.png b/3.0/modules/photo_annotation/images/colorpicker_hsb_b.png similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_hsb_b.png rename to 3.0/modules/photo_annotation/images/colorpicker_hsb_b.png diff --git a/3.0/modules/photoannotation/images/colorpicker_hsb_h.png b/3.0/modules/photo_annotation/images/colorpicker_hsb_h.png similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_hsb_h.png rename to 3.0/modules/photo_annotation/images/colorpicker_hsb_h.png diff --git a/3.0/modules/photoannotation/images/colorpicker_hsb_s.png b/3.0/modules/photo_annotation/images/colorpicker_hsb_s.png similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_hsb_s.png rename to 3.0/modules/photo_annotation/images/colorpicker_hsb_s.png diff --git a/3.0/modules/photoannotation/images/colorpicker_indic.gif b/3.0/modules/photo_annotation/images/colorpicker_indic.gif similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_indic.gif rename to 3.0/modules/photo_annotation/images/colorpicker_indic.gif diff --git a/3.0/modules/photoannotation/images/colorpicker_overlay.png b/3.0/modules/photo_annotation/images/colorpicker_overlay.png similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_overlay.png rename to 3.0/modules/photo_annotation/images/colorpicker_overlay.png diff --git a/3.0/modules/photoannotation/images/colorpicker_rgb_b.png b/3.0/modules/photo_annotation/images/colorpicker_rgb_b.png similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_rgb_b.png rename to 3.0/modules/photo_annotation/images/colorpicker_rgb_b.png diff --git a/3.0/modules/photoannotation/images/colorpicker_rgb_g.png b/3.0/modules/photo_annotation/images/colorpicker_rgb_g.png similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_rgb_g.png rename to 3.0/modules/photo_annotation/images/colorpicker_rgb_g.png diff --git a/3.0/modules/photoannotation/images/colorpicker_rgb_r.png b/3.0/modules/photo_annotation/images/colorpicker_rgb_r.png similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_rgb_r.png rename to 3.0/modules/photo_annotation/images/colorpicker_rgb_r.png diff --git a/3.0/modules/photoannotation/images/colorpicker_select.gif b/3.0/modules/photo_annotation/images/colorpicker_select.gif similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_select.gif rename to 3.0/modules/photo_annotation/images/colorpicker_select.gif diff --git a/3.0/modules/photoannotation/images/colorpicker_submit.png b/3.0/modules/photo_annotation/images/colorpicker_submit.png similarity index 100% rename from 3.0/modules/photoannotation/images/colorpicker_submit.png rename to 3.0/modules/photo_annotation/images/colorpicker_submit.png diff --git a/3.0/modules/photoannotation/images/custom_background.png b/3.0/modules/photo_annotation/images/custom_background.png similarity index 100% rename from 3.0/modules/photoannotation/images/custom_background.png rename to 3.0/modules/photo_annotation/images/custom_background.png diff --git a/3.0/modules/photoannotation/images/custom_hex.png b/3.0/modules/photo_annotation/images/custom_hex.png similarity index 100% rename from 3.0/modules/photoannotation/images/custom_hex.png rename to 3.0/modules/photo_annotation/images/custom_hex.png diff --git a/3.0/modules/photoannotation/images/custom_hsb_b.png b/3.0/modules/photo_annotation/images/custom_hsb_b.png similarity index 100% rename from 3.0/modules/photoannotation/images/custom_hsb_b.png rename to 3.0/modules/photo_annotation/images/custom_hsb_b.png diff --git a/3.0/modules/photoannotation/images/custom_hsb_h.png b/3.0/modules/photo_annotation/images/custom_hsb_h.png similarity index 100% rename from 3.0/modules/photoannotation/images/custom_hsb_h.png rename to 3.0/modules/photo_annotation/images/custom_hsb_h.png diff --git a/3.0/modules/photoannotation/images/custom_hsb_s.png b/3.0/modules/photo_annotation/images/custom_hsb_s.png similarity index 100% rename from 3.0/modules/photoannotation/images/custom_hsb_s.png rename to 3.0/modules/photo_annotation/images/custom_hsb_s.png diff --git a/3.0/modules/photoannotation/images/custom_indic.gif b/3.0/modules/photo_annotation/images/custom_indic.gif similarity index 100% rename from 3.0/modules/photoannotation/images/custom_indic.gif rename to 3.0/modules/photo_annotation/images/custom_indic.gif diff --git a/3.0/modules/photoannotation/images/custom_rgb_b.png b/3.0/modules/photo_annotation/images/custom_rgb_b.png similarity index 100% rename from 3.0/modules/photoannotation/images/custom_rgb_b.png rename to 3.0/modules/photo_annotation/images/custom_rgb_b.png diff --git a/3.0/modules/photoannotation/images/custom_rgb_g.png b/3.0/modules/photo_annotation/images/custom_rgb_g.png similarity index 100% rename from 3.0/modules/photoannotation/images/custom_rgb_g.png rename to 3.0/modules/photo_annotation/images/custom_rgb_g.png diff --git a/3.0/modules/photoannotation/images/custom_rgb_r.png b/3.0/modules/photo_annotation/images/custom_rgb_r.png similarity index 100% rename from 3.0/modules/photoannotation/images/custom_rgb_r.png rename to 3.0/modules/photo_annotation/images/custom_rgb_r.png diff --git a/3.0/modules/photoannotation/images/custom_submit.png b/3.0/modules/photo_annotation/images/custom_submit.png similarity index 100% rename from 3.0/modules/photoannotation/images/custom_submit.png rename to 3.0/modules/photo_annotation/images/custom_submit.png diff --git a/3.0/modules/photoannotation/images/delete.png b/3.0/modules/photo_annotation/images/delete.png similarity index 100% rename from 3.0/modules/photoannotation/images/delete.png rename to 3.0/modules/photo_annotation/images/delete.png diff --git a/3.0/modules/photoannotation/images/edit.png b/3.0/modules/photo_annotation/images/edit.png similarity index 100% rename from 3.0/modules/photoannotation/images/edit.png rename to 3.0/modules/photo_annotation/images/edit.png diff --git a/3.0/modules/photoannotation/images/select.png b/3.0/modules/photo_annotation/images/select.png similarity index 100% rename from 3.0/modules/photoannotation/images/select.png rename to 3.0/modules/photo_annotation/images/select.png diff --git a/3.0/modules/photoannotation/images/select2.png b/3.0/modules/photo_annotation/images/select2.png similarity index 100% rename from 3.0/modules/photoannotation/images/select2.png rename to 3.0/modules/photo_annotation/images/select2.png diff --git a/3.0/modules/photoannotation/images/slider.png b/3.0/modules/photo_annotation/images/slider.png similarity index 100% rename from 3.0/modules/photoannotation/images/slider.png rename to 3.0/modules/photo_annotation/images/slider.png diff --git a/3.0/modules/photoannotation/js/jquery.annotate.js b/3.0/modules/photo_annotation/js/jquery.annotate.js similarity index 100% rename from 3.0/modules/photoannotation/js/jquery.annotate.js rename to 3.0/modules/photo_annotation/js/jquery.annotate.js diff --git a/3.0/modules/photoannotation/js/jquery.annotate.min.js b/3.0/modules/photo_annotation/js/jquery.annotate.min.js similarity index 100% rename from 3.0/modules/photoannotation/js/jquery.annotate.min.js rename to 3.0/modules/photo_annotation/js/jquery.annotate.min.js diff --git a/3.0/modules/photoannotation/js/jquery.colorpicker.js b/3.0/modules/photo_annotation/js/jquery.colorpicker.js similarity index 100% rename from 3.0/modules/photoannotation/js/jquery.colorpicker.js rename to 3.0/modules/photo_annotation/js/jquery.colorpicker.js diff --git a/3.0/modules/photoannotation/js/jquery.colorpicker.min.js b/3.0/modules/photo_annotation/js/jquery.colorpicker.min.js similarity index 100% rename from 3.0/modules/photoannotation/js/jquery.colorpicker.min.js rename to 3.0/modules/photo_annotation/js/jquery.colorpicker.min.js diff --git a/3.0/modules/photoannotation/models/items_face.php b/3.0/modules/photo_annotation/models/items_face.php similarity index 100% rename from 3.0/modules/photoannotation/models/items_face.php rename to 3.0/modules/photo_annotation/models/items_face.php diff --git a/3.0/modules/photoannotation/models/items_note.php b/3.0/modules/photo_annotation/models/items_note.php similarity index 100% rename from 3.0/modules/photoannotation/models/items_note.php rename to 3.0/modules/photo_annotation/models/items_note.php diff --git a/3.0/modules/photoannotation/models/items_user.php b/3.0/modules/photo_annotation/models/items_user.php similarity index 100% rename from 3.0/modules/photoannotation/models/items_user.php rename to 3.0/modules/photo_annotation/models/items_user.php diff --git a/3.0/modules/photoannotation/models/photoannotation_notification.php b/3.0/modules/photo_annotation/models/photoannotation_notification.php similarity index 100% rename from 3.0/modules/photoannotation/models/photoannotation_notification.php rename to 3.0/modules/photo_annotation/models/photoannotation_notification.php diff --git a/3.0/modules/photoannotation/module.info b/3.0/modules/photo_annotation/module.info similarity index 99% rename from 3.0/modules/photoannotation/module.info rename to 3.0/modules/photo_annotation/module.info index 133c2456..b603a755 100644 --- a/3.0/modules/photoannotation/module.info +++ b/3.0/modules/photo_annotation/module.info @@ -1,3 +1,3 @@ -name = "Photo Annotation" -description = "Allows you to assign tags and notes to areas on your photos. This module is partially compatible with the TagFaces module by rWatcher. This means that notes and faces that you create in either one will be shown and are editable by the other module as well. If you added users to an annotation area though they will only be displayed with the Photo Annotation module. You cannot run both modules at the same time." -version = 4 +name = "Photo Annotation" +description = "Allows you to assign tags and notes to areas on your photos. This module is partially compatible with the TagFaces module by rWatcher. This means that notes and faces that you create in either one will be shown and are editable by the other module as well. If you added users to an annotation area though they will only be displayed with the Photo Annotation module. You cannot run both modules at the same time." +version = 4 diff --git a/3.0/modules/photoannotation/views/admin_photoannotation.html.php b/3.0/modules/photo_annotation/views/admin_photoannotation.html.php similarity index 100% rename from 3.0/modules/photoannotation/views/admin_photoannotation.html.php rename to 3.0/modules/photo_annotation/views/admin_photoannotation.html.php diff --git a/3.0/modules/photoannotation/views/admin_photoannotation_converter.html.php b/3.0/modules/photo_annotation/views/admin_photoannotation_converter.html.php similarity index 100% rename from 3.0/modules/photoannotation/views/admin_photoannotation_converter.html.php rename to 3.0/modules/photo_annotation/views/admin_photoannotation_converter.html.php diff --git a/3.0/modules/photoannotation/views/admin_photoannotation_tagsmaintanance.html.php b/3.0/modules/photo_annotation/views/admin_photoannotation_tagsmaintanance.html.php similarity index 100% rename from 3.0/modules/photoannotation/views/admin_photoannotation_tagsmaintanance.html.php rename to 3.0/modules/photo_annotation/views/admin_photoannotation_tagsmaintanance.html.php diff --git a/3.0/modules/photoannotation/views/photoannotation_block.html.php b/3.0/modules/photo_annotation/views/photoannotation_block.html.php similarity index 100% rename from 3.0/modules/photoannotation/views/photoannotation_block.html.php rename to 3.0/modules/photo_annotation/views/photoannotation_block.html.php diff --git a/3.0/modules/photoannotation/views/photoannotation_cloud.html.php b/3.0/modules/photo_annotation/views/photoannotation_cloud.html.php similarity index 100% rename from 3.0/modules/photoannotation/views/photoannotation_cloud.html.php rename to 3.0/modules/photo_annotation/views/photoannotation_cloud.html.php diff --git a/3.0/modules/photoannotation/views/photoannotation_highlight_block.html.php b/3.0/modules/photo_annotation/views/photoannotation_highlight_block.html.php similarity index 100% rename from 3.0/modules/photoannotation/views/photoannotation_highlight_block.html.php rename to 3.0/modules/photo_annotation/views/photoannotation_highlight_block.html.php diff --git a/3.0/modules/photoannotation/views/photoannotation_user_search.html.php b/3.0/modules/photo_annotation/views/photoannotation_user_search.html.php similarity index 100% rename from 3.0/modules/photoannotation/views/photoannotation_user_search.html.php rename to 3.0/modules/photo_annotation/views/photoannotation_user_search.html.php diff --git a/3.0/modules/tagsinalbum/helpers/tagsinalbum_event.php b/3.0/modules/tagsinalbum/helpers/tagsinalbum_event.php new file mode 100644 index 00000000..fe7339ae --- /dev/null +++ b/3.0/modules/tagsinalbum/helpers/tagsinalbum_event.php @@ -0,0 +1,37 @@ +module == "tag") { + $data->messages["warn"][] = t("The Tags In Album module requires the Tags module."); + } + } + + static function module_change($changes) { + if (!module::is_active("tag") || in_array("tag", $changes->deactivate)) { + site_status::warning( + t("The Tags In Album module requires the Tags module. Activate the Tags module now", + array("url" => html::mark_clean(url::site("admin/modules")))), + "tagsinalbum_needs_tag"); + } else { + site_status::clear("tagsinalbum_needs_tag"); + } + } +} diff --git a/3.0/modules/tagsinalbum/helpers/tagsinalbum_installer.php b/3.0/modules/tagsinalbum/helpers/tagsinalbum_installer.php new file mode 100644 index 00000000..4357ab87 --- /dev/null +++ b/3.0/modules/tagsinalbum/helpers/tagsinalbum_installer.php @@ -0,0 +1,36 @@ +where("album_id", "=", $id)->find(); - if ($existing_password->loaded()) { + // Check for and delete the password and any cached ids assigned to it. + $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $id)->find_all(); + if (count($existing_password) > 0) { + foreach ($existing_password as $one_password) { + db::build()->delete("albumpassword_idcaches")->where("password_id", "=", $one_password->id)->execute(); + } db::build()->delete("items_albumpasswords")->where("album_id", "=", $id)->execute(); message::success(t("Password Removed.")); } @@ -70,9 +73,12 @@ class albumpassword_Controller extends Controller { $album_id = Input::instance()->post("item_id"); $album_password = Input::instance()->post("assignpassword_password"); - // Check for, and remove, any existing passwords. - $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_id)->find(); - if ($existing_password->loaded()) { + // Check for, and remove, any existing passwords and cached ids. + $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_id)->find_all(); + if (count($existing_password) > 0) { + foreach ($existing_password as $one_password) { + db::build()->delete("albumpassword_idcaches")->where("password_id", "=", $one_password->id)->execute(); + } db::build()->delete("items_albumpasswords")->where("album_id", "=", $album_id)->execute(); } @@ -82,6 +88,25 @@ class albumpassword_Controller extends Controller { $new_password->password = $album_password; $new_password->save(); + // Add the album to the id cache. + $cached_album = ORM::factory("albumpassword_idcache"); + $cached_album->password_id = $new_password->id; + $cached_album->item_id = $album_id; + $cached_album->save(); + + // Check for any sub-items within the album, add all of them to the id cache. + $items = ORM::factory("item", $album_id) + ->viewable() + ->descendants(); + if (count($items) > 0) { + foreach ($items as $one_item) { + $cached_item = ORM::factory("albumpassword_idcache"); + $cached_item->password_id = $new_password->id; + $cached_item->item_id = $one_item->id; + $cached_item->save(); + } + } + // Display a success message and close the dialog. message::success(t("Password saved.")); print "\n\n\n\n\n"; diff --git a/3.1/modules/albumpassword/helpers/MY_access.php b/3.1/modules/albumpassword/helpers/MY_access.php index 339426b6..bda1db32 100644 --- a/3.1/modules/albumpassword/helpers/MY_access.php +++ b/3.1/modules/albumpassword/helpers/MY_access.php @@ -21,38 +21,29 @@ class access extends access_Core { static function required($perm_name, $item) { // Original code from the required function in modules/gallery/helpers/access.php. - if (!self::can($perm_name, $item)) { + if (!access::can($perm_name, $item)) { if ($perm_name == "view") { // Treat as if the item didn't exist, don't leak any information. throw new Kohana_404_Exception(); } else { - self::forbidden(); + access::forbidden(); } // Begin rWatcher modifications. // Throw a 404 error when a user attempts to access a protected item, - // unless the password has been provided, or the user is the item's owner. + // unless the password has been provided, or the user is the item's owner. } elseif (module::get_var("albumpassword", "hideonly") == false) { - $album_item = ""; - do { - if ($album_item == "") { - if ($item->is_album()) { - $album_item = $item; - } else { - $album_item = $item->parent(); - } - } else { - $album_item = $album_item->parent(); - } - - $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_item->id)->find(); + $item_protected = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->id)->order_by("cache_id")->find_all(); + if (count($item_protected) > 0) { + $existing_password = ORM::factory("items_albumpassword")->where("id", "=", $item_protected[0]->password_id)->find(); if ($existing_password->loaded()) { if ((cookie::get("g3_albumpassword") != $existing_password->password) && - (identity::active_user()->id != $album_item->owner_id)) { + (identity::active_user()->id != $item->owner_id) && + (!identity::active_user()->admin)) { throw new Kohana_404_Exception(); } } - } while ($album_item->parent_id > 0); + } } } } diff --git a/3.1/modules/albumpassword/helpers/MY_item.php b/3.1/modules/albumpassword/helpers/MY_item.php index 1af98cdc..e26b65c6 100644 --- a/3.1/modules/albumpassword/helpers/MY_item.php +++ b/3.1/modules/albumpassword/helpers/MY_item.php @@ -29,10 +29,21 @@ class item extends item_Core { // If not, hide whatever is restricted by an album password // that the current user is not the owner of. if (!identity::active_user()->admin) { - $model->and_open()->join("items_albumpasswords", "items.id", "items_albumpasswords.album_id", "LEFT OUTER") - ->and_where("items_albumpasswords.album_id", "IS", NULL) - ->or_where("items_albumpasswords.password", "=", cookie::get("g3_albumpassword")) - ->or_where("items.owner_id", "=", identity::active_user()->id)->close(); + + // Display items that are not in idcaches. + $model->and_open()->join("albumpassword_idcaches", "items.id", "albumpassword_idcaches.item_id", "LEFT OUTER") + ->and_where("albumpassword_idcaches.item_id", "IS", NULL); + + // ... Unless their password id corresponds with a valid password. + $existing_password = ORM::factory("items_albumpassword")->where("password", "=", cookie::get("g3_albumpassword"))->find_all(); + if (count($existing_password) > 0) { + foreach ($existing_password as $one_password) { + $model->or_where("albumpassword_idcaches.password_id", "=", $one_password->id); + } + } + + // Or the current user is the owner of the item. + $model->or_where("items.owner_id", "=", identity::active_user()->id)->close(); } return $model; diff --git a/3.1/modules/albumpassword/helpers/albumpassword_event.php b/3.1/modules/albumpassword/helpers/albumpassword_event.php index 72d549a4..0c9210ea 100644 --- a/3.1/modules/albumpassword/helpers/albumpassword_event.php +++ b/3.1/modules/albumpassword/helpers/albumpassword_event.php @@ -81,27 +81,64 @@ class albumpassword_event_Core { ->css_id("g-album-password-remove") ->url(url::site("albumpassword/remove/" . $item->id))); } elseif ($item->id != 1) { - $menu->get("options_menu") - ->append(Menu::factory("dialog") - ->id("albumpassword_assign") - ->label(t("Assign password")) - ->css_id("g-album-password-assign") - ->url(url::site("albumpassword/assign/" . $item->id))); + $passworded_subitems = ORM::factory("item", $item->id) + ->and_open()->join("albumpassword_idcaches", "items.id", "albumpassword_idcaches.item_id", "LEFT OUTER") + ->where("albumpassword_idcaches.item_id", "IS NOT", NULL)->close() + ->descendants(); + + $existing_cacheditem = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->id)->order_by("cache_id")->find_all(); + if ((count($existing_cacheditem) == 0) && count($passworded_subitems) == 0) { + $menu->get("options_menu") + ->append(Menu::factory("dialog") + ->id("albumpassword_assign") + ->label(t("Assign password")) + ->css_id("g-album-password-assign") + ->url(url::site("albumpassword/assign/" . $item->id))); + } } } } } static function item_deleted($item) { - // If an album is deleted, remove any associated passwords. - $existingPasswords = ORM::factory("items_albumpassword") - ->where("album_id", "=", $item->id) - ->find_all(); - if (count($existingPasswords) > 0) { - db::build()->delete("items_albumpassword")->where("album_id", "=", $item->id)->execute(); + // Check for and delete the password and any cached ids assigned to it. + $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $item->id)->find_all(); + if (count($existing_password) > 0) { + foreach ($existing_password as $one_password) { + db::build()->delete("albumpassword_idcaches")->where("password_id", "=", $one_password->id)->execute(); + } + db::build()->delete("items_albumpasswords")->where("album_id", "=", $item->id)->execute(); + message::success(t("Password Removed.")); + } else { + db::build()->delete("albumpassword_idcaches")->where("item_id", "=", $item->id)->execute(); } } + static function item_created($item) { + // Check for any already existing password on parent album(s), if found, generate cache data for the new item. + $existing_password = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->parent_id)->order_by("cache_id")->find_all(); + if (count($existing_password) > 0) { + $new_cachedid = ORM::factory("albumpassword_idcache"); + $new_cachedid->password_id = $existing_password[0]->password_id; + $new_cachedid->item_id = $item->id; + $new_cachedid->save(); + } + } + + static function item_moved($item, $old_parent) { + // Delete any existing cache data. + db::build()->delete("albumpassword_idcaches")->where("item_id", "=", $item->id)->execute(); + + // Check for a password on the new parent, generate cache data if necessary. + $existing_password = ORM::factory("albumpassword_idcache")->where("item_id", "=", $item->parent_id)->order_by("cache_id")->find_all(); + if (count($existing_password) > 0) { + $new_cachedid = ORM::factory("albumpassword_idcache"); + $new_cachedid->password_id = $existing_password[0]->password_id; + $new_cachedid->item_id = $item->id; + $new_cachedid->save(); + } + } + static function admin_menu($menu, $theme) { // Add a link to the Album Password admin page to the Content menu. $menu->get("settings_menu") diff --git a/3.1/modules/albumpassword/helpers/albumpassword_installer.php b/3.1/modules/albumpassword/helpers/albumpassword_installer.php index 075f252a..93a6d0c0 100644 --- a/3.1/modules/albumpassword/helpers/albumpassword_installer.php +++ b/3.1/modules/albumpassword/helpers/albumpassword_installer.php @@ -28,25 +28,45 @@ class albumpassword_installer { PRIMARY KEY (`id`)) DEFAULT CHARSET=utf8;"); + // Create a table to store a list of all protected items in. + $db->query("CREATE TABLE IF NOT EXISTS {albumpassword_idcaches} ( + `cache_id` int(9) NOT NULL auto_increment, + `password_id` int(9) NOT NULL, + `item_id` int(9) NOT NULL, + PRIMARY KEY (`cache_id`)) + DEFAULT CHARSET=utf8;"); + // Set the default value for this module's behavior. module::set_var("albumpassword", "hideonly", true); // Set the module's version number. - module::set_version("albumpassword", 2); + module::set_version("albumpassword", 3); } static function upgrade($version) { - // Set the default value for this module's behavior. - module::set_var("albumpassword", "hideonly", true); - - // Set the module's version number. - module::set_version("albumpassword", 2); + $db = Database::instance(); + if ($version == 1) { + // Set the default value for this module's behavior. + module::set_var("albumpassword", "hideonly", true); + module::set_version("albumpassword", $version = 2); + } + if ($version == 2) { + // Create a table to store a list of all protected items in. + $db->query("CREATE TABLE IF NOT EXISTS {albumpassword_idcaches} ( + `cache_id` int(9) NOT NULL auto_increment, + `password_id` int(9) NOT NULL, + `item_id` int(9) NOT NULL, + PRIMARY KEY (`cache_id`)) + DEFAULT CHARSET=utf8;"); + module::set_version("albumpassword", $version = 3); + } } static function uninstall() { // Delete the password table before uninstalling. $db = Database::instance(); - $db->query("DROP TABLE IF EXISTS {items_albumpassword};"); + $db->query("DROP TABLE IF EXISTS {items_albumpasswords};"); + $db->query("DROP TABLE IF EXISTS {albumpassword_idcaches};"); module::delete("albumpassword"); } } diff --git a/3.1/modules/albumpassword/helpers/albumpassword_task.php b/3.1/modules/albumpassword/helpers/albumpassword_task.php new file mode 100644 index 00000000..b6ea007a --- /dev/null +++ b/3.1/modules/albumpassword/helpers/albumpassword_task.php @@ -0,0 +1,138 @@ +join("albumpassword_idcaches", "items_albumpasswords.id", "albumpassword_idcaches.password_id", "LEFT OUTER") + ->and_where("albumpassword_idcaches.password_id", "IS", NULL)->count_all(); + + return array(Task_Definition::factory() + ->callback("albumpassword_task::update_idcaches") + ->name(t("Rebuild Album Password ID Caches DB")) + ->description(t("Logs the contents of all protected albums into the db.")) + ->severity($bad_albums ? log::WARNING : log::SUCCESS)); + } + + static function update_idcaches($task) { + // Populate the idcaches table with the contents of all protected albums. + + $start = microtime(true); + $total = $task->get("total"); + $existing_passwords = ORM::factory("items_albumpassword")->find_all(); + // If this is the first time this function has been run, + // delete and re-create the idcaches table, and set up + // some initial variables. + if (empty($total)) { + // Delete the idcache table and make a new one. + $db = Database::instance(); + $db->query("DROP TABLE IF EXISTS {albumpassword_idcaches};"); + $db->query("CREATE TABLE IF NOT EXISTS {albumpassword_idcaches} ( + `cache_id` int(9) NOT NULL auto_increment, + `password_id` int(9) NOT NULL, + `item_id` int(9) NOT NULL, + PRIMARY KEY (`cache_id`)) + DEFAULT CHARSET=utf8;"); + + // Set the initial values for all variables. + $task->set("total", count($existing_passwords)); + $total = $task->get("total"); + $task->set("last_album_counter", 0); + $task->set("last_id", 0); + $task->set("completed_albums", 0); + $task->set("completed_items", 0); + $task->set("total_items", 0); + } + + // Retrieve the values for variables from the last time this + // function was run. + $last_album_counter = $task->get("last_album_counter"); + $completed_albums = $task->get("completed_albums"); + $completed_items = $task->get("completed_items"); + $total_items = $task->get("total_items"); + $last_id = $task->get("last_id"); + + // If completed_items is 0, then we're just starting to process this + // album. Add the album to idcaches before adding it's contents. + if ($completed_items == 0) { + // Add the album to the id cache. + $cached_album = ORM::factory("albumpassword_idcache"); + $cached_album->password_id = $existing_passwords[$last_album_counter]->id; + $cached_album->item_id = $existing_passwords[$last_album_counter]->album_id; + $cached_album->save(); + + // Set total_items to the number of items in this album. + $total_items = ORM::factory("item", $existing_passwords[$last_album_counter]->album_id) + ->descendants_count(); + $task->set("total_items", $total_items); + } + + // Add each item in the album to idcaches. + foreach (ORM::factory("item", $existing_passwords[$last_album_counter]->album_id) + ->where("id", ">", $last_id) + ->order_by("id") + ->descendants(100) as $item) { + + $cached_item = ORM::factory("albumpassword_idcache"); + $cached_item->password_id =$existing_passwords[$last_album_counter]->id; + $cached_item->item_id = $item->id; + $cached_item->save(); + + $last_id = $item->id; + $completed_items++; + + // Set a time limit so the script doesn't time out. + if (microtime(true) - $start > 1.5) { + break; + } + } // end foreach + + // If completed_items equals total_items, then we've + // processed everything in the current album. + // Increase variables and set everything up for the + // next album. + if ($completed_items == $total_items) { + $completed_items = 0; + $last_album_counter++; + $completed_albums++; + $last_id = 0; + } + + // Store the current values of the variables for the next + // time this function is called. + $task->set("last_album_counter", $last_album_counter); + $task->set("last_id", $last_id); + $task->set("completed_albums", $completed_albums); + $task->set("completed_items", $completed_items); + + // Display the number of albums that have been completed before exiting. + if ($total == $completed_albums) { + $task->done = true; + $task->state = "success"; + $task->percent_complete = 100; + $task->status = t("Scanning Protected Album $completed_albums of $total"); + } else { + $task->percent_complete = round(100 * $completed / $total); + $task->status = t("Scanning Protected Album $completed_albums of $total -- $completed_items / $total_items files"); + } + } +} diff --git a/3.1/modules/albumpassword/models/albumpassword_idcache.php b/3.1/modules/albumpassword/models/albumpassword_idcache.php new file mode 100644 index 00000000..e3d80667 --- /dev/null +++ b/3.1/modules/albumpassword/models/albumpassword_idcache.php @@ -0,0 +1,21 @@ +relative_url_cache)); + } // Redirect back to the item url::redirect(url::abs_site($item->relative_url_cache)); diff --git a/3.1/modules/bitly/helpers/bitly.php b/3.1/modules/bitly/helpers/bitly.php index 526928fd..f006362e 100644 --- a/3.1/modules/bitly/helpers/bitly.php +++ b/3.1/modules/bitly/helpers/bitly.php @@ -61,8 +61,8 @@ class bitly_Core { /** * Check a login and an API Key against bit.ly to make sure they're valid - * @param string $login the login - * @param string $api_key the API key + * @param string $login bit.ly login + * @param string $api_key bit.ly API key * @return boolean */ static function validate_config($login, $api_key) { @@ -115,15 +115,15 @@ class bitly_Core { } /** - * - * @param $type - * @param $parameters + * Assemble a bitly API request + * @param string $type Type of API request, ex. shorten + * @param array $params Query string key/value pairs * @return string */ - private static function _build_http_request($type, $parameters) { + private static function _build_http_request($type, $params) { $http_request = ''; - if (!empty($type) && count($parameters)) { - foreach($parameters as $k => $v) { + if (!empty($type) && count($params)) { + foreach($params as $k => $v) { $query_string[] = "$k=" . urlencode($v); } $path = "/" . self::$api_version . "/$type?" . implode('&', $query_string); @@ -175,7 +175,6 @@ class bitly_Core { $item = ORM::factory("item", $item_id); $short_url = ''; $long_url = url::abs_site($item->relative_url_cache); - $parameters = array( "login" => module::get_var("bitly", "login"), 'apiKey' => module::get_var("bitly", "api_key"), @@ -183,12 +182,12 @@ class bitly_Core { 'domain' => module::get_var("bitly", "domain"), 'format' => $format, ); - $request = self::_build_http_request('shorten', $parameters); $response = self::_http_post($request, self::$api_host); $json_response = json_decode($response->body[0]); + $status_txt = $json_response->status_txt; - if ('OK' == $json_response->status_txt) { + if ('OK' == $status_txt) { $short_url = $json_response->data->url; // Save the link hash to the database $link = ORM::factory("bitly_link"); @@ -196,14 +195,10 @@ class bitly_Core { $link->hash = $json_response->data->hash; $link->global_hash = $json_response->data->global_hash; $link->save(); - - message::success("$long_url has been shortened to $short_url"); - return $json_response->data->url; - } else { - message::error("Unable to shorten $long_url"); - // @todo log the error + $status_code = $json_response->status_code; + log::error("content", "Shortened URL", "Error: $status_code $status_txt item"); return false; } } diff --git a/3.1/modules/bitly/helpers/bitly_event.php b/3.1/modules/bitly/helpers/bitly_event.php index 62caf6b7..1efeb264 100644 --- a/3.1/modules/bitly/helpers/bitly_event.php +++ b/3.1/modules/bitly/helpers/bitly_event.php @@ -36,7 +36,7 @@ class bitly_event_Core { ->label(t("Shorten link with bit.ly")) ->url(url::site("bitly/shorten/{$theme->item->id}?csrf={$theme->csrf}")) ->css_id("g-bitly-shorten") - ->css_class("g-bitly-shorten ui-icon-link")); + ->css_class("g-bitly-shorten")); } } diff --git a/3.1/modules/exif_gps/controllers/exif_gps.php b/3.1/modules/exif_gps/controllers/exif_gps.php index be6e92ac..52b94b9d 100644 --- a/3.1/modules/exif_gps/controllers/exif_gps.php +++ b/3.1/modules/exif_gps/controllers/exif_gps.php @@ -32,7 +32,7 @@ class EXIF_GPS_Controller extends Controller { ->order_by("exif_coordinates.latitude", "ASC") ->descendants(); $curr_album = ORM::factory("item")->where("id", "=", $type_id)->find_all(); - $map_title = $curr_album[0]->name; + $map_title = $curr_album[0]->title; } elseif ($map_type == "user") { // Generate an array of all items uploaded by the current user that // have exif gps coordinates and order by latitude (to group items diff --git a/3.1/modules/exif_gps/helpers/exif_gps_task.php b/3.1/modules/exif_gps/helpers/exif_gps_task.php index c3bcc73c..b07646ad 100644 --- a/3.1/modules/exif_gps/helpers/exif_gps_task.php +++ b/3.1/modules/exif_gps/helpers/exif_gps_task.php @@ -50,16 +50,18 @@ class exif_gps_task_Core { $completed = $task->get("completed"); // Generate an array of the next 100 photos to check. - $all_photos = ORM::factory("item") - ->where("id", ">", $last_id) - ->where("type", "=", "photo") - ->find_all(100); + //$all_photos = ORM::factory("item") + // ->where("id", ">", $last_id) + // ->where("type", "=", "photo") + // ->order_by("id") + // ->find_all(100); // Check each photo in the array to see if it already has exif gps data associated with it. // If it doesn't, attempt to extract gps coordinates. foreach (ORM::factory("item") ->where("id", ">", $last_id) ->where("type", "=", "photo") + ->order_by("id") ->find_all(100) as $item) { $record = ORM::factory("exif_coordinate")->where("item_id", "=", $item->id)->find(); diff --git a/3.1/modules/gwtorganise/.classpath b/3.1/modules/gwtorganize/.classpath similarity index 100% rename from 3.1/modules/gwtorganise/.classpath rename to 3.1/modules/gwtorganize/.classpath diff --git a/3.1/modules/gwtorganise/.externalToolBuilders/New_Builder.launch b/3.1/modules/gwtorganize/.externalToolBuilders/New_Builder.launch similarity index 100% rename from 3.1/modules/gwtorganise/.externalToolBuilders/New_Builder.launch rename to 3.1/modules/gwtorganize/.externalToolBuilders/New_Builder.launch diff --git a/3.1/modules/gwtorganise/.project b/3.1/modules/gwtorganize/.project similarity index 100% rename from 3.1/modules/gwtorganise/.project rename to 3.1/modules/gwtorganize/.project diff --git a/3.1/modules/gwtorganise/.settings/com.google.appengine.eclipse.core.prefs b/3.1/modules/gwtorganize/.settings/com.google.appengine.eclipse.core.prefs similarity index 100% rename from 3.1/modules/gwtorganise/.settings/com.google.appengine.eclipse.core.prefs rename to 3.1/modules/gwtorganize/.settings/com.google.appengine.eclipse.core.prefs diff --git a/3.1/modules/gwtorganise/.settings/com.google.gdt.eclipse.core.prefs b/3.1/modules/gwtorganize/.settings/com.google.gdt.eclipse.core.prefs similarity index 100% rename from 3.1/modules/gwtorganise/.settings/com.google.gdt.eclipse.core.prefs rename to 3.1/modules/gwtorganize/.settings/com.google.gdt.eclipse.core.prefs diff --git a/3.1/modules/gwtorganise/.settings/com.google.gwt.eclipse.core.prefs b/3.1/modules/gwtorganize/.settings/com.google.gwt.eclipse.core.prefs similarity index 100% rename from 3.1/modules/gwtorganise/.settings/com.google.gwt.eclipse.core.prefs rename to 3.1/modules/gwtorganize/.settings/com.google.gwt.eclipse.core.prefs diff --git a/3.1/modules/gwtorganise/build.xml b/3.1/modules/gwtorganize/build.xml similarity index 100% rename from 3.1/modules/gwtorganise/build.xml rename to 3.1/modules/gwtorganize/build.xml diff --git a/3.1/modules/gwtorganise/controllers/admin_gwtorganise.php b/3.1/modules/gwtorganize/controllers/admin_gwtorganise.php similarity index 100% rename from 3.1/modules/gwtorganise/controllers/admin_gwtorganise.php rename to 3.1/modules/gwtorganize/controllers/admin_gwtorganise.php diff --git a/3.1/modules/gwtorganise/controllers/admin_upload_configure.php b/3.1/modules/gwtorganize/controllers/admin_upload_configure.php similarity index 100% rename from 3.1/modules/gwtorganise/controllers/admin_upload_configure.php rename to 3.1/modules/gwtorganize/controllers/admin_upload_configure.php diff --git a/3.1/modules/gwtorganise/controllers/json_album.php b/3.1/modules/gwtorganize/controllers/json_album.php similarity index 100% rename from 3.1/modules/gwtorganise/controllers/json_album.php rename to 3.1/modules/gwtorganize/controllers/json_album.php diff --git a/3.1/modules/gwtorganise/helpers/gwtorganise_event.php b/3.1/modules/gwtorganize/helpers/gwtorganise_event.php similarity index 100% rename from 3.1/modules/gwtorganise/helpers/gwtorganise_event.php rename to 3.1/modules/gwtorganize/helpers/gwtorganise_event.php diff --git a/3.1/modules/gwtorganise/helpers/gwtorganise_installer.php b/3.1/modules/gwtorganize/helpers/gwtorganise_installer.php similarity index 100% rename from 3.1/modules/gwtorganise/helpers/gwtorganise_installer.php rename to 3.1/modules/gwtorganize/helpers/gwtorganise_installer.php diff --git a/3.1/modules/gwtorganise/helpers/revision.php b/3.1/modules/gwtorganize/helpers/revision.php similarity index 100% rename from 3.1/modules/gwtorganise/helpers/revision.php rename to 3.1/modules/gwtorganize/helpers/revision.php diff --git a/3.1/modules/gwtorganise/helpers/upload_configuration.php b/3.1/modules/gwtorganize/helpers/upload_configuration.php similarity index 100% rename from 3.1/modules/gwtorganise/helpers/upload_configuration.php rename to 3.1/modules/gwtorganize/helpers/upload_configuration.php diff --git a/3.1/modules/gwtorganise/module.info b/3.1/modules/gwtorganize/module.info similarity index 100% rename from 3.1/modules/gwtorganise/module.info rename to 3.1/modules/gwtorganize/module.info diff --git a/3.1/modules/gwtorganise/src/META-INF/jdoconfig.xml b/3.1/modules/gwtorganize/src/META-INF/jdoconfig.xml similarity index 100% rename from 3.1/modules/gwtorganise/src/META-INF/jdoconfig.xml rename to 3.1/modules/gwtorganize/src/META-INF/jdoconfig.xml diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/G3viewer.gwt.xml b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/G3viewer.gwt.xml similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/G3viewer.gwt.xml rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/G3viewer.gwt.xml diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/Album.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/Album.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/Album.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/Album.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumItemDropContainer.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumItemDropContainer.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumItemDropContainer.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumItemDropContainer.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumTree.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumTree.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumTree.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumTree.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumTreeDropController.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumTreeDropController.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/AlbumTreeDropController.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/AlbumTreeDropController.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/AsyncResizer.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/AsyncResizer.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/AsyncResizer.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/AsyncResizer.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/AsyncRunner.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/AsyncRunner.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/AsyncRunner.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/AsyncRunner.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/ConfirmDialogBox.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/ConfirmDialogBox.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/ConfirmDialogBox.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/ConfirmDialogBox.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/DropZoneController.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/DropZoneController.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/DropZoneController.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/DropZoneController.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/G3Viewer.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/G3Viewer.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/G3Viewer.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/G3Viewer.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpDialogBox.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpDialogBox.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpDialogBox.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpDialogBox.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpDialogHandler.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpDialogHandler.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpDialogHandler.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpDialogHandler.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpSuccessHandler.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpSuccessHandler.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/HttpSuccessHandler.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/HttpSuccessHandler.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/ImageDialogBox.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/ImageDialogBox.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/ImageDialogBox.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/ImageDialogBox.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/InformationBar.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/InformationBar.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/InformationBar.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/InformationBar.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/Item.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/Item.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/Item.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/Item.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/JSONResponseCallback.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/JSONResponseCallback.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/JSONResponseCallback.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/JSONResponseCallback.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/JSONResponseTextHandler.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/JSONResponseTextHandler.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/JSONResponseTextHandler.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/JSONResponseTextHandler.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/Loading.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/Loading.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/Loading.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/Loading.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/MyPickupDragController.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/MyPickupDragController.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/MyPickupDragController.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/MyPickupDragController.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/ResizeOptions.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/ResizeOptions.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/ResizeOptions.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/ResizeOptions.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadControl.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadControl.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadControl.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadControl.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadControlNoGears.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadControlNoGears.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadControlNoGears.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadControlNoGears.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadFile.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadFile.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/UploadFile.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/UploadFile.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/Utils.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/Utils.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/Utils.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/Utils.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/View.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/View.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/View.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/View.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/Canvas.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/Canvas.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/Canvas.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/Canvas.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/Factory.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/Factory.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/Factory.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/Factory.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/ResizeFilter.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/ResizeFilter.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/canvas/ResizeFilter.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/canvas/ResizeFilter.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.java b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.java similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.java rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.java diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/public/G3viewer.css b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/public/G3viewer.css similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/public/G3viewer.css rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/public/G3viewer.css diff --git a/3.1/modules/gwtorganise/src/com/gloopics/g3viewer/public/loading.gif b/3.1/modules/gwtorganize/src/com/gloopics/g3viewer/public/loading.gif similarity index 100% rename from 3.1/modules/gwtorganise/src/com/gloopics/g3viewer/public/loading.gif rename to 3.1/modules/gwtorganize/src/com/gloopics/g3viewer/public/loading.gif diff --git a/3.1/modules/gwtorganise/src/log4j.properties b/3.1/modules/gwtorganize/src/log4j.properties similarity index 100% rename from 3.1/modules/gwtorganise/src/log4j.properties rename to 3.1/modules/gwtorganize/src/log4j.properties diff --git a/3.1/modules/gwtorganise/views/gwtorganise_view.html.php b/3.1/modules/gwtorganize/views/gwtorganise_view.html.php similarity index 100% rename from 3.1/modules/gwtorganise/views/gwtorganise_view.html.php rename to 3.1/modules/gwtorganize/views/gwtorganise_view.html.php diff --git a/3.1/modules/gwtorganise/war/.htaccess b/3.1/modules/gwtorganize/war/.htaccess similarity index 100% rename from 3.1/modules/gwtorganise/war/.htaccess rename to 3.1/modules/gwtorganize/war/.htaccess diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/META-INF/jdoconfig.xml b/3.1/modules/gwtorganize/war/WEB-INF/classes/META-INF/jdoconfig.xml similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/META-INF/jdoconfig.xml rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/META-INF/jdoconfig.xml diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/G3viewer.gwt.xml b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/G3viewer.gwt.xml similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/G3viewer.gwt.xml rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/G3viewer.gwt.xml diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$10.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$10.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$10.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$10.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$11.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$11.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$11.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$11.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$12.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$12.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$12.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$12.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$2.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$3.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$4.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$5.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$5.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$5.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$5.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$6.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$6.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$6.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$6.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$7.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$7.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$7.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$7.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$8.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$8.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$8.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$8.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$9.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$9.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$9.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album$9.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Album.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumItemDropContainer.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumItemDropContainer.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumItemDropContainer.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumItemDropContainer.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTree.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTreeDropController.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTreeDropController.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTreeDropController.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AlbumTreeDropController.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncResizer.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncResizer.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncResizer.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncResizer.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncRunner.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncRunner.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncRunner.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/AsyncRunner.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$2.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$2.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$2.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$2.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$ConfirmCallBack.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$ConfirmCallBack.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$ConfirmCallBack.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox$ConfirmCallBack.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ConfirmDialogBox.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/DropZoneController.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/DropZoneController.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/DropZoneController.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/DropZoneController.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$2.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$2.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$2.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$2.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$ErrorDialog.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$SimplePanelEx.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$SimplePanelEx.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$SimplePanelEx.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer$SimplePanelEx.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/G3Viewer.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$2.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$2.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$2.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$2.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$3.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$3.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$3.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$3.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$4.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$4.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$4.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$4.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$5.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$5.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$5.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$5.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$RequestCallbackImpl.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$RequestCallbackImpl.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$RequestCallbackImpl.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox$RequestCallbackImpl.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogBox.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogHandler.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogHandler.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogHandler.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpDialogHandler.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpSuccessHandler.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpSuccessHandler.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpSuccessHandler.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/HttpSuccessHandler.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$2.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$2.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$2.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$2.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$3.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$3.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$3.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox$3.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ImageDialogBox.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/InformationBar.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$2.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$2.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$2.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$2.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$3.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$3.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$3.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$3.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$4.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$5.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$6.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$7.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$8.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$9.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$9.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$9.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item$9.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Item.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseCallback.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseCallback.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseCallback.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseCallback.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseTextHandler.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseTextHandler.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseTextHandler.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/JSONResponseTextHandler.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Loading.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Loading.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Loading.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Loading.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/MyPickupDragController.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/MyPickupDragController.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/MyPickupDragController.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/MyPickupDragController.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ResizeOptions.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ResizeOptions.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/ResizeOptions.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/ResizeOptions.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControl.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControl.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControl.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControl.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControlNoGears.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControlNoGears.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControlNoGears.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadControlNoGears.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$2.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$2.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$2.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$2.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$3.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$3.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$3.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$3.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$ProgressBar.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$ProgressBar.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$ProgressBar.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile$ProgressBar.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/UploadFile.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Utils.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Utils.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/Utils.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/Utils.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$2.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View$3.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/View.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/View.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Canvas.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Canvas.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Canvas.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Canvas.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Factory.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Factory.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Factory.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/Factory.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$2.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$2.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$2.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter$2.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/canvas/ResizeFilter.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDrop.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropBase.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFile.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDropFileIE.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DesktopDroppableWidget.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactory.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryIE.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears$1.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears$1.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears$1.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears$1.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.class b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.class similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.class rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/client/dnddesktop/DndDesktopFactoryNoGears.class diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/public/G3viewer.css b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/public/G3viewer.css similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/public/G3viewer.css rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/public/G3viewer.css diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/public/loading.gif b/3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/public/loading.gif similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/com/gloopics/g3viewer/public/loading.gif rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/com/gloopics/g3viewer/public/loading.gif diff --git a/3.1/modules/gwtorganise/war/WEB-INF/classes/log4j.properties b/3.1/modules/gwtorganize/war/WEB-INF/classes/log4j.properties similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/classes/log4j.properties rename to 3.1/modules/gwtorganize/war/WEB-INF/classes/log4j.properties diff --git a/3.1/modules/gwtorganise/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar b/3.1/modules/gwtorganize/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar rename to 3.1/modules/gwtorganize/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar diff --git a/3.1/modules/gwtorganise/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar b/3.1/modules/gwtorganize/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar rename to 3.1/modules/gwtorganize/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar diff --git a/3.1/modules/gwtorganise/war/WEB-INF/lib/datanucleus-appengine-1.0.3.jar b/3.1/modules/gwtorganize/war/WEB-INF/lib/datanucleus-appengine-1.0.3.jar similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/lib/datanucleus-appengine-1.0.3.jar rename to 3.1/modules/gwtorganize/war/WEB-INF/lib/datanucleus-appengine-1.0.3.jar diff --git a/3.1/modules/gwtorganise/war/WEB-INF/lib/datanucleus-core-1.1.5.jar b/3.1/modules/gwtorganize/war/WEB-INF/lib/datanucleus-core-1.1.5.jar similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/lib/datanucleus-core-1.1.5.jar rename to 3.1/modules/gwtorganize/war/WEB-INF/lib/datanucleus-core-1.1.5.jar diff --git a/3.1/modules/gwtorganise/war/WEB-INF/lib/datanucleus-jpa-1.1.5.jar b/3.1/modules/gwtorganize/war/WEB-INF/lib/datanucleus-jpa-1.1.5.jar similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/lib/datanucleus-jpa-1.1.5.jar rename to 3.1/modules/gwtorganize/war/WEB-INF/lib/datanucleus-jpa-1.1.5.jar diff --git a/3.1/modules/gwtorganise/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar b/3.1/modules/gwtorganize/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar rename to 3.1/modules/gwtorganize/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar diff --git a/3.1/modules/gwtorganise/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar b/3.1/modules/gwtorganize/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar rename to 3.1/modules/gwtorganize/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar diff --git a/3.1/modules/gwtorganise/war/WEB-INF/lib/gwt-servlet.jar b/3.1/modules/gwtorganize/war/WEB-INF/lib/gwt-servlet.jar similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/lib/gwt-servlet.jar rename to 3.1/modules/gwtorganize/war/WEB-INF/lib/gwt-servlet.jar diff --git a/3.1/modules/gwtorganise/war/WEB-INF/lib/jdo2-api-2.3-eb.jar b/3.1/modules/gwtorganize/war/WEB-INF/lib/jdo2-api-2.3-eb.jar similarity index 100% rename from 3.1/modules/gwtorganise/war/WEB-INF/lib/jdo2-api-2.3-eb.jar rename to 3.1/modules/gwtorganize/war/WEB-INF/lib/jdo2-api-2.3-eb.jar diff --git a/3.1/modules/gwtorganise/war/g3viewer/0A9476898799A150D840F0B1C3672921.cache.png b/3.1/modules/gwtorganize/war/g3viewer/0A9476898799A150D840F0B1C3672921.cache.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/0A9476898799A150D840F0B1C3672921.cache.png rename to 3.1/modules/gwtorganize/war/g3viewer/0A9476898799A150D840F0B1C3672921.cache.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html b/3.1/modules/gwtorganize/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html b/3.1/modules/gwtorganize/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/396F806CD63ABD414BFBB9D57429F05B.cache.png b/3.1/modules/gwtorganize/war/g3viewer/396F806CD63ABD414BFBB9D57429F05B.cache.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/396F806CD63ABD414BFBB9D57429F05B.cache.png rename to 3.1/modules/gwtorganize/war/g3viewer/396F806CD63ABD414BFBB9D57429F05B.cache.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html b/3.1/modules/gwtorganize/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html b/3.1/modules/gwtorganize/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html b/3.1/modules/gwtorganize/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html b/3.1/modules/gwtorganize/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html b/3.1/modules/gwtorganize/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/8603379B5088782D2C0620FAE856E112.cache.png b/3.1/modules/gwtorganize/war/g3viewer/8603379B5088782D2C0620FAE856E112.cache.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/8603379B5088782D2C0620FAE856E112.cache.png rename to 3.1/modules/gwtorganize/war/g3viewer/8603379B5088782D2C0620FAE856E112.cache.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html b/3.1/modules/gwtorganize/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html b/3.1/modules/gwtorganize/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html b/3.1/modules/gwtorganize/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html b/3.1/modules/gwtorganize/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html b/3.1/modules/gwtorganize/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html rename to 3.1/modules/gwtorganize/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/DF7764EEC1903CD03C9545B354D8D8E4.cache.png b/3.1/modules/gwtorganize/war/g3viewer/DF7764EEC1903CD03C9545B354D8D8E4.cache.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/DF7764EEC1903CD03C9545B354D8D8E4.cache.png rename to 3.1/modules/gwtorganize/war/g3viewer/DF7764EEC1903CD03C9545B354D8D8E4.cache.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/E44767377485D18D6B6864F65BA8EF73.cache.png b/3.1/modules/gwtorganize/war/g3viewer/E44767377485D18D6B6864F65BA8EF73.cache.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/E44767377485D18D6B6864F65BA8EF73.cache.png rename to 3.1/modules/gwtorganize/war/g3viewer/E44767377485D18D6B6864F65BA8EF73.cache.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/EDC7827FEEA59EE44AD790B1C6430C45.cache.png b/3.1/modules/gwtorganize/war/g3viewer/EDC7827FEEA59EE44AD790B1C6430C45.cache.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/EDC7827FEEA59EE44AD790B1C6430C45.cache.png rename to 3.1/modules/gwtorganize/war/g3viewer/EDC7827FEEA59EE44AD790B1C6430C45.cache.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/G3viewer.css b/3.1/modules/gwtorganize/war/g3viewer/G3viewer.css similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/G3viewer.css rename to 3.1/modules/gwtorganize/war/g3viewer/G3viewer.css diff --git a/3.1/modules/gwtorganise/war/g3viewer/clear.cache.gif b/3.1/modules/gwtorganize/war/g3viewer/clear.cache.gif similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/clear.cache.gif rename to 3.1/modules/gwtorganize/war/g3viewer/clear.cache.gif diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js b/3.1/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js rename to 3.1/modules/gwtorganize/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/g3viewer.nocache.js b/3.1/modules/gwtorganize/war/g3viewer/g3viewer.nocache.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/g3viewer.nocache.js rename to 3.1/modules/gwtorganize/war/g3viewer/g3viewer.nocache.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/gears_init.js b/3.1/modules/gwtorganize/war/g3viewer/gears_init.js similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gears_init.js rename to 3.1/modules/gwtorganize/war/g3viewer/gears_init.js diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/corner.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/corner.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/corner.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/corner.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/corner_ie6.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/corner_ie6.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/corner_ie6.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/corner_ie6.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/hborder.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/hborder.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/hborder.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/hborder.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/hborder_ie6.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/hborder_ie6.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/hborder_ie6.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/hborder_ie6.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topleft.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topleft.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topleft.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topleft.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topright.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topright.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topright.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/corner_dialog_topright.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/hborder_blue_shadow.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/hborder_blue_shadow.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/hborder_blue_shadow.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/hborder_blue_shadow.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/hborder_gray_shadow.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/hborder_gray_shadow.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/hborder_gray_shadow.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/hborder_gray_shadow.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/vborder_blue_shadow.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/vborder_blue_shadow.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/vborder_blue_shadow.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/vborder_blue_shadow.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/vborder_gray_shadow.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/vborder_gray_shadow.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/ie6/vborder_gray_shadow.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/ie6/vborder_gray_shadow.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/vborder.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/vborder.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/vborder.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/vborder.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/vborder_ie6.png b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/vborder_ie6.png similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/images/vborder_ie6.png rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/images/vborder_ie6.png diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/standard.css b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/standard.css similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/standard.css rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/standard.css diff --git a/3.1/modules/gwtorganise/war/g3viewer/gwt/standard/standard_rtl.css b/3.1/modules/gwtorganize/war/g3viewer/gwt/standard/standard_rtl.css similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/gwt/standard/standard_rtl.css rename to 3.1/modules/gwtorganize/war/g3viewer/gwt/standard/standard_rtl.css diff --git a/3.1/modules/gwtorganise/war/g3viewer/hosted.html b/3.1/modules/gwtorganize/war/g3viewer/hosted.html similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/hosted.html rename to 3.1/modules/gwtorganize/war/g3viewer/hosted.html diff --git a/3.1/modules/gwtorganise/war/g3viewer/loading.gif b/3.1/modules/gwtorganize/war/g3viewer/loading.gif similarity index 100% rename from 3.1/modules/gwtorganise/war/g3viewer/loading.gif rename to 3.1/modules/gwtorganize/war/g3viewer/loading.gif diff --git a/3.1/modules/gwtorganise/war/index.php b/3.1/modules/gwtorganize/war/index.php similarity index 100% rename from 3.1/modules/gwtorganise/war/index.php rename to 3.1/modules/gwtorganize/war/index.php diff --git a/3.1/modules/tagsinalbum/helpers/tagsinalbum_event.php b/3.1/modules/tagsinalbum/helpers/tagsinalbum_event.php new file mode 100644 index 00000000..fe7339ae --- /dev/null +++ b/3.1/modules/tagsinalbum/helpers/tagsinalbum_event.php @@ -0,0 +1,37 @@ +module == "tag") { + $data->messages["warn"][] = t("The Tags In Album module requires the Tags module."); + } + } + + static function module_change($changes) { + if (!module::is_active("tag") || in_array("tag", $changes->deactivate)) { + site_status::warning( + t("The Tags In Album module requires the Tags module. Activate the Tags module now", + array("url" => html::mark_clean(url::site("admin/modules")))), + "tagsinalbum_needs_tag"); + } else { + site_status::clear("tagsinalbum_needs_tag"); + } + } +} diff --git a/3.1/modules/tagsinalbum/helpers/tagsinalbum_installer.php b/3.1/modules/tagsinalbum/helpers/tagsinalbum_installer.php new file mode 100644 index 00000000..4357ab87 --- /dev/null +++ b/3.1/modules/tagsinalbum/helpers/tagsinalbum_installer.php @@ -0,0 +1,36 @@ +validate()) { + $consumer_key = $form->twitter_oauth->consumer_key->value; + $consumer_secret = $form->twitter_oauth->consumer_secret->value; + $reset_tweet = $form->twitter_message->reset_tweet->value; + if ($reset_tweet) { + $default_tweet = twitter::reset_default_tweet(); + } else { + $default_tweet = $form->twitter_message->default_tweet->value; + } + $shorten_urls = $form->urls->shorten_urls->value; + + module::set_var("twitter", "consumer_key", $consumer_key); + module::set_var("twitter", "consumer_secret", $consumer_secret); + module::set_var("twitter", "default_tweet", $default_tweet); + module::set_var("twitter", "shorten_urls", $shorten_urls); + + message::success("Twitter settings saved"); + url::redirect("admin/twitter"); + } + } + $is_registered = twitter::is_registered(); + + $v = new Admin_View("admin.html"); + $v->page_title = t("Twitter"); + $v->content = new View("admin_twitter.html"); + $v->content->form = $form; + $v->content->is_registered = $is_registered; + + print $v; + } + +} \ No newline at end of file diff --git a/3.1/modules/twitter/controllers/twitter.php b/3.1/modules/twitter/controllers/twitter.php new file mode 100644 index 00000000..ecd195d6 --- /dev/null +++ b/3.1/modules/twitter/controllers/twitter.php @@ -0,0 +1,255 @@ +get("twitter_oauth_token"); + $oauth_token_secret = Session::instance()->get("twitter_oauth_token_secret"); + $item_url = Session::instance()->get("twitter_item_redirect"); + + // If the oauth_token is old redirect to the connect page + if (isset($_REQUEST['oauth_token']) && $oauth_token !== $_REQUEST['oauth_token']) { + Session::instance()->set("twitter_oauth_status", "old_token"); + $this->_clear_session(); + url::redirect(url::site("twitter/redirect")); + } + + // Create TwitteroAuth object with app key/secret and token key/secret from default phase + $connection = new TwitterOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret); + + // Request access tokens from twitter + $access_token = $connection->getAccessToken($_REQUEST['oauth_verifier']); + + // Save the access tokens + Session::instance()->set("twitter_access_token", $access_token); + + // Remove no longer needed request tokens + Session::instance()->delete("twitter_oauth_token"); + Session::instance()->delete("twitter_oauth_token_secret"); + + // If HTTP response is 200 continue otherwise send to connect page to retry + if (200 == $connection->http_code) { + $this->_save_user($access_token); + $item = ORM::factory("item", $item_id); + url::redirect(url::abs_site($item_url)); + } else { + log::error("content", "Twitter", "Unable to retrieve user access token: " . $connection->http_code); + $this->_clear_session(); + url::redirect(url::site("twitter/redirect")); + } + } + + /** + * Display Twitter status dialog. + * @param int $item_id + */ + public function dialog($item_id) { + $item = ORM::factory("item", $item_id); + $form = twitter::get_tweet_form($item); + + // Ensure user has permission + access::required("view", $item); + + $user_id = identity::active_user()->id; + $token_is_set = $this->_is_token_set($user_id); + + $v = new View("twitter_dialog.html"); + $v->is_registered = twitter::is_registered(); + $v->user_token_set = $token_is_set; + + if ($token_is_set) { + $v->type = $item->type; + $v->title = $item->title; + $v->description = $item->description; + $v->form = $form; + $v->character_count = twitter::$character_count; + } else { + $item_url = urlencode(url::abs_site($item->relative_url_cache)); + $v->user_id = $user_id; + $v->twitter_auth_url = url::site("twitter/redirect?item_url=$item_url"); + } + print $v; + } + + /** + * Redirect user to Twitter authorization page. + */ + public function redirect() { + require_once(MODPATH . "twitter/vendor/twitteroauth/twitteroauth.php"); + + $consumer_key = module::get_var("twitter", "consumer_key"); + $consumer_secret = module::get_var("twitter", "consumer_secret"); + $oauth_callback = url::abs_site("twitter/callback"); + + // We'll want this after Twitter kicks back to our callback + if (!empty($_GET['item_url'])) { + Session::instance()->set("twitter_item_redirect", $_GET['item_url']); + } + + // Build TwitterOAuth object with client credentials + $connection = new TwitterOAuth($consumer_key, $consumer_secret); + + // Get temporary credentials. + $request_token = $connection->getRequestToken($oauth_callback); + + // Save temporary credentials to session. + Session::instance()->set("twitter_oauth_token", $request_token['oauth_token']); + Session::instance()->set("twitter_oauth_token_secret", $request_token['oauth_token_secret']); + + // If last connection failed don't display authorization link + if (200 == $connection->http_code) { + // Build authorize URL and redirect user to Twitter + $url = $connection->getAuthorizeURL($request_token["oauth_token"]); + url::redirect($url); + } else { + // Show notification if something went wrong + message::success(t("Could not connect to Twitter. Refresh the page or try again later.")); + url::redirect(urldecode($_GET['item_url'])); + } + } + + /** + * Post a status update to Twitter + * @param int $item_id + */ + public function tweet($item_id) { + access::verify_csrf(); + + $item = ORM::factory("item", $item_id); + $form = twitter::get_tweet_form($item); + + if ($form->validate()) { + $item_url = url::abs_site($item->relative_url_cache); + $user = $this->_get_twitter_user(identity::active_user()->id); + $consumer_key = module::get_var("twitter", "consumer_key"); + $consumer_secret = module::get_var("twitter", "consumer_secret"); + + require_once(MODPATH . "twitter/vendor/twitteroauth/twitteroauth.php"); + + $connection = new TwitterOAuth( + $consumer_key, + $consumer_secret, + $user->oauth_token, + $user->oauth_token_secret); + + $message = $form->twitter_message->tweet->value; + $response = $connection->post('statuses/update', array('status' => $message)); + + if (200 == $connection->http_code) { + message::success(t("Tweet sent!")); + json::reply(array("result" => "success", "location" => $item->url())); + } else { + message::error(t("Unable to send, your Tweet has been saved. Please try again later.")); + log::error("content", "Twitter", t("Unable to send tweet: %http_code", + array("http_code" => $connection->http_code))); + json::reply(array("result" => "success", "location" => $item->url())); + } + $tweet->item_id = $item_id; + (!empty($response->id)) ? $tweet->twitter_id = $response->id : $tweet->twitter_id = NULL; + $tweet->tweet = $message; + $tweet->id = $form->twitter_message->tweet_id->value; + $this->_save_tweet($tweet); + + } else { + json::reply(array("result" => "error", "html" => (string)$form)); + } + } + + /** + * Clear Twitter module session variables + */ + private function _clear_session() { + Session::instance()->delete("twitter_oauth_token"); + Session::instance()->delete("twitter_oauth_token_secret"); + Session::instance()->delete("twitter_access_token"); + } + + /** + * Get Twitter credentials for the current user. + * @param int $user_id + * @return mixed object|false + */ + private function _get_twitter_user($user_id) { + $twitter_user = ORM::factory("twitter_user")->where("user_id", "=", $user_id)->find(); + if ($twitter_user->loaded()) { + return $twitter_user; + } + return false; + } + + /** + * Check if current user's Twitter credentials have been stored locally. + * @param int $user_id + * @return boolean + */ + private function _is_token_set($user_id) { + $twitter_user = $this->_get_twitter_user($user_id); + if (!empty($twitter_user->oauth_token) && !empty($twitter_user->oauth_token_secret)) { + return true; + } + return false; + } + + /** + * Save new tweets + * @param object $tweet + */ + private function _save_tweet($tweet) { + if (!empty($tweet->item_id) && !empty($tweet->tweet)) { + if ($tweet->id > 0) { + $t = ORM::factory("twitter_tweet")->where("id", "=", $tweet->id)->find(); + } else { + $t = ORM::factory("twitter_tweet"); + } + $t->item_id = $tweet->item_id; + $t->twitter_id = $tweet->twitter_id; + $t->tweet = $tweet->tweet; + $t->sent = (!empty($tweet->twitter_id)) ? time() : NULL; + $t->user_id = identity::active_user()->id; + $t->save(); + } + } + + /** + * Save or update the current user's Twitter credentials. + * @param array $access_token + * @todo Ensure only one record per twitter_screen_name + */ + private function _save_user($access_token) { + $u = ORM::factory("twitter_user"); + $u->oauth_token = $access_token["oauth_token"]; + $u->oauth_token_secret = $access_token["oauth_token_secret"]; + $u->twitter_user_id = $access_token["user_id"]; + $u->screen_name = $access_token["screen_name"]; + $u->user_id = identity::active_user()->id; + $u->save(); + + message::success(t("Success! You may now share Gallery items on Twitter.")); + } + +} diff --git a/3.1/modules/twitter/css/twitter.css b/3.1/modules/twitter/css/twitter.css new file mode 100644 index 00000000..8bb82ccf --- /dev/null +++ b/3.1/modules/twitter/css/twitter.css @@ -0,0 +1,5 @@ +#g-twitter-character-count { + float: right; + font-size: 1.4em; + font-weight: bold; +} diff --git a/3.1/modules/twitter/helpers/twitter.php b/3.1/modules/twitter/helpers/twitter.php new file mode 100644 index 00000000..506da5c4 --- /dev/null +++ b/3.1/modules/twitter/helpers/twitter.php @@ -0,0 +1,150 @@ + "g-configure-twitter-form")); + + $group_oauth = $form->group("twitter_oauth")->label(t("OAuth Settings")); + $group_oauth->input("consumer_key") + ->label(t("Consumer key")) + ->value(module::get_var("twitter", "consumer_key")); + $group_oauth->input("consumer_secret") + ->label(t("Consumer secret")) + ->value(module::get_var("twitter", "consumer_secret")); + + $group_tweet = $form->group("twitter_message")->label(t("Default Tweet")); + $group_tweet->input("default_tweet") + ->label(t("Default Tweet")) + ->value(module::get_var("twitter", "default_tweet")); + $group_tweet->checkbox("reset_tweet") + ->label(t("Reset to default on save")) + ->value(1); + + if (module::is_active("bitly")) { + $group_url = $form->group("urls")->label(t("Shorten URLs")); + $group_url->checkbox("shorten_urls") + ->label(t("Shorten URLs automatically with bit.ly")) + ->checked(module::get_var("twitter", "shorten_urls")); + } + $form->submit("")->value(t("Save")); + return $form; + } + + /** + * Get tweet form + * @param object $item + * @return Forge + * @todo Truncate the $tweet at 140 - strlen($url) + */ + static function get_tweet_form($item) { + $long_url = url::abs_site($item->relative_url_cache); + // Check for saved tweets for this user and item + $saved = self::get_failed($item->id); + if ($saved) { + $default_tweet = $saved->tweet; + $tweet_id = $saved->id; + } else { + $default_tweet = module::get_var("twitter", "default_tweet"); + $tweet_id = 0; + } + $tweet = preg_replace("/%type/", $item->type, $default_tweet); + $tweet = preg_replace("/%title/", $item->title, $tweet); + $tweet = preg_replace("/%description/", $item->description, $tweet); + // If bit.ly module's enabled, get the item's URL and shorten it + if (!empty($item->id) && module::is_active("bitly") && module::get_var("twitter", "shorten_urls")) { + $url = bitly::shorten_url($item->id); + } else { + $url = url::abs_site($item->relative_url_cache); + } + + // Truncate the default tweet if it's too long + $url_length = strlen($url) + 1; + $tweet_length = strlen($tweet); + + if (($tweet_length + $url_length) > self::$character_count) { + $trim_pos = 0 - (($tweet_length + $url_length) - 140); + $tweet = substr($tweet, 0, $trim_pos); + } + $tweet = $tweet . ' ' . $url; + + $form = new Forge("twitter/tweet/$item->id", "", "post", array("id" => "g-twitter-tweet-form")); + $group = $form->group("twitter_message")->label(t("Compose Tweet")); + $group->textarea("tweet") + ->value($tweet) + ->rules("required") + ->error_messages("required", t("Your tweet cannot be empty!")) + ->id("g-tweet"); + $group->hidden("tweet_id")->value($tweet_id)->id("tweet_id"); + $form->submit("")->value(t("Tweet")); + return $form; + } + + /** + * Get the most recent failed tweet for an item + * @param integer $item_id + * @return mixed object|false + */ + function get_failed($item_id) { + $user_id = identity::active_user()->id; + $t = ORM::factory("twitter_tweet") + ->where("item_id", "=", $item_id) + ->where("user_id", "=", $user_id) + ->where("twitter_id", "IS", NULL) + ->find(); + if ($t->loaded()) { + return $t; + } else { + return false; + } + } + + /** + * Has this Gallery been registered at dev.twitter.com/app? + * @return boolean + */ + static function is_registered() { + $consumer_key = module::get_var("twitter", "consumer_key"); + $consumer_secret = module::get_var("twitter", "consumer_secret"); + if (empty($consumer_key) || empty($consumer_secret)) { + site_status::warning( + t("Twitter module requires attention! Set the consumer key and secret.", + array("url" => html::mark_clean(url::site("admin/twitter")))), + "twitter_config"); + return false; + } else { + site_status::clear("twitter_config"); + return true; + } + } + + static function reset_default_tweet() { + return t("Check out this %type, '%title': %description"); + } + +} diff --git a/3.1/modules/twitter/helpers/twitter_event.php b/3.1/modules/twitter/helpers/twitter_event.php new file mode 100644 index 00000000..81b78c28 --- /dev/null +++ b/3.1/modules/twitter/helpers/twitter_event.php @@ -0,0 +1,53 @@ +get("settings_menu") + ->append(Menu::factory("link") + ->id("twitter_menu") + ->label(t("Twitter")) + ->url(url::site("admin/twitter"))); + } + + static function site_menu($menu, $theme) { + $item = $theme->item(); + if ($item && twitter::is_registered() && (identity::active_user()->id > 1)) { + $menu->get("options_menu") + ->append(Menu::factory("dialog") + ->id("twitter") + ->label(t("Share on Twitter")) + ->css_id("g-twitter-link") + ->url(url::site("twitter/dialog/{$item->id}"))); + } + } + + static function context_menu($menu, $theme, $item) { + if ((identity::active_user()->id > 1) && twitter::is_registered()) { + $menu->get("options_menu") + ->append(Menu::factory("dialog") + ->id("twitter") + ->label(t("Share on Twitter")) + ->css_class("ui-icon-link g-twitter-share") + ->url(url::site("twitter/dialog/{$item->id}"))); + } + } + +} diff --git a/3.1/modules/twitter/helpers/twitter_installer.php b/3.1/modules/twitter/helpers/twitter_installer.php new file mode 100644 index 00000000..58016a08 --- /dev/null +++ b/3.1/modules/twitter/helpers/twitter_installer.php @@ -0,0 +1,50 @@ +query("CREATE TABLE {twitter_tweets} ( + `id` int(9) NOT NULL AUTO_INCREMENT, + `item_id` int(9) NOT NULL, + `sent` int(9) NULL, + `twitter_id` decimal(20,0) NULL, + `tweet` varchar(255) NOT NULL, + `user_id` int(9) NOT NULL, + PRIMARY KEY (`id`)) + DEFAULT CHARSET=utf8;"); + Database::instance() + ->query("CREATE TABLE {twitter_users} ( + `id` int(9) NOT NULL AUTO_INCREMENT, + `oauth_token` varchar(64) NOT NULL, + `oauth_token_secret` varchar(64) NOT NULL, + `screen_name` varchar(16) NOT NULL, + `twitter_user_id` int(9) NOT NULL, + `user_id` int(9) NOT NULL, + PRIMARY KEY (`id`)) + DEFAULT CHARSET=utf8;"); + module::set_version("twitter", 1); + twitter::reset_default_tweet(); + } + + static function deactivate() { + site_status::clear("twitter_config"); + } +} diff --git a/3.1/modules/twitter/helpers/twitter_theme.php b/3.1/modules/twitter/helpers/twitter_theme.php new file mode 100644 index 00000000..2862966d --- /dev/null +++ b/3.1/modules/twitter/helpers/twitter_theme.php @@ -0,0 +1,25 @@ +script("twitter.js"); + $theme->css("twitter.css"); + } +} diff --git a/3.1/modules/twitter/js/twitter.js b/3.1/modules/twitter/js/twitter.js new file mode 100644 index 00000000..3a816a9b --- /dev/null +++ b/3.1/modules/twitter/js/twitter.js @@ -0,0 +1,36 @@ +(function($) { + $.widget("ui.gallery_twitter", { + + _init: function() { + this._set_count(); + $(this.element).bind("keyup", this._set_count); + }, + + _set_count: function() { + var character_array = $("#g-tweet").val().split(""); + var count = character_array.length; + var remaining = 140 - count; //self.options.max_count - count; + var count_container = $("#g-twitter-character-count"); + var color = "#000000"; + var warn_color = "#7F0005"; //this.options.warn_color; + var error_color = "#FF0000"; //this.options.error_color; + if (remaining < 10) { + color = error_color; + } else if (remaining < 20) { + color = warn_color; + } + $(count_container).css("color", color); + $(count_container).html(remaining); + } + + }); + + $.extend($.ui.gallery_twitter, { + defaults: { + max_count: 140, + warn_color: "#7F0005", + error_color: "#FF0000" + } + }); + +})(jQuery); diff --git a/3.1/modules/twitter/models/twitter_tweet.php b/3.1/modules/twitter/models/twitter_tweet.php new file mode 100644 index 00000000..9a616cfd --- /dev/null +++ b/3.1/modules/twitter/models/twitter_tweet.php @@ -0,0 +1,21 @@ +key = $key; + $this->secret = $secret; + $this->callback_url = $callback_url; + } + + function __toString() { + return "OAuthConsumer[key=$this->key,secret=$this->secret]"; + } +} + +class OAuthToken { + // access tokens and request tokens + public $key; + public $secret; + + /** + * key = the token + * secret = the token secret + */ + function __construct($key, $secret) { + $this->key = $key; + $this->secret = $secret; + } + + /** + * generates the basic string serialization of a token that a server + * would respond to request_token and access_token calls with + */ + function to_string() { + return "oauth_token=" . + OAuthUtil::urlencode_rfc3986($this->key) . + "&oauth_token_secret=" . + OAuthUtil::urlencode_rfc3986($this->secret); + } + + function __toString() { + return $this->to_string(); + } +} + +/** + * A class for implementing a Signature Method + * See section 9 ("Signing Requests") in the spec + */ +abstract class OAuthSignatureMethod { + /** + * Needs to return the name of the Signature Method (ie HMAC-SHA1) + * @return string + */ + abstract public function get_name(); + + /** + * Build up the signature + * NOTE: The output of this function MUST NOT be urlencoded. + * the encoding is handled in OAuthRequest when the final + * request is serialized + * @param OAuthRequest $request + * @param OAuthConsumer $consumer + * @param OAuthToken $token + * @return string + */ + abstract public function build_signature($request, $consumer, $token); + + /** + * Verifies that a given signature is correct + * @param OAuthRequest $request + * @param OAuthConsumer $consumer + * @param OAuthToken $token + * @param string $signature + * @return bool + */ + public function check_signature($request, $consumer, $token, $signature) { + $built = $this->build_signature($request, $consumer, $token); + return $built == $signature; + } +} + +/** + * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104] + * where the Signature Base String is the text and the key is the concatenated values (each first + * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&' + * character (ASCII code 38) even if empty. + * - Chapter 9.2 ("HMAC-SHA1") + */ +class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod { + function get_name() { + return "HMAC-SHA1"; + } + + public function build_signature($request, $consumer, $token) { + $base_string = $request->get_signature_base_string(); + $request->base_string = $base_string; + + $key_parts = array( + $consumer->secret, + ($token) ? $token->secret : "" + ); + + $key_parts = OAuthUtil::urlencode_rfc3986($key_parts); + $key = implode('&', $key_parts); + + return base64_encode(hash_hmac('sha1', $base_string, $key, true)); + } +} + +/** + * The PLAINTEXT method does not provide any security protection and SHOULD only be used + * over a secure channel such as HTTPS. It does not use the Signature Base String. + * - Chapter 9.4 ("PLAINTEXT") + */ +class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod { + public function get_name() { + return "PLAINTEXT"; + } + + /** + * oauth_signature is set to the concatenated encoded values of the Consumer Secret and + * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is + * empty. The result MUST be encoded again. + * - Chapter 9.4.1 ("Generating Signatures") + * + * Please note that the second encoding MUST NOT happen in the SignatureMethod, as + * OAuthRequest handles this! + */ + public function build_signature($request, $consumer, $token) { + $key_parts = array( + $consumer->secret, + ($token) ? $token->secret : "" + ); + + $key_parts = OAuthUtil::urlencode_rfc3986($key_parts); + $key = implode('&', $key_parts); + $request->base_string = $key; + + return $key; + } +} + +/** + * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in + * [RFC3447] section 8.2 (more simply known as PKCS#1), using SHA-1 as the hash function for + * EMSA-PKCS1-v1_5. It is assumed that the Consumer has provided its RSA public key in a + * verified way to the Service Provider, in a manner which is beyond the scope of this + * specification. + * - Chapter 9.3 ("RSA-SHA1") + */ +abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod { + public function get_name() { + return "RSA-SHA1"; + } + + // Up to the SP to implement this lookup of keys. Possible ideas are: + // (1) do a lookup in a table of trusted certs keyed off of consumer + // (2) fetch via http using a url provided by the requester + // (3) some sort of specific discovery code based on request + // + // Either way should return a string representation of the certificate + protected abstract function fetch_public_cert(&$request); + + // Up to the SP to implement this lookup of keys. Possible ideas are: + // (1) do a lookup in a table of trusted certs keyed off of consumer + // + // Either way should return a string representation of the certificate + protected abstract function fetch_private_cert(&$request); + + public function build_signature($request, $consumer, $token) { + $base_string = $request->get_signature_base_string(); + $request->base_string = $base_string; + + // Fetch the private key cert based on the request + $cert = $this->fetch_private_cert($request); + + // Pull the private key ID from the certificate + $privatekeyid = openssl_get_privatekey($cert); + + // Sign using the key + $ok = openssl_sign($base_string, $signature, $privatekeyid); + + // Release the key resource + openssl_free_key($privatekeyid); + + return base64_encode($signature); + } + + public function check_signature($request, $consumer, $token, $signature) { + $decoded_sig = base64_decode($signature); + + $base_string = $request->get_signature_base_string(); + + // Fetch the public key cert based on the request + $cert = $this->fetch_public_cert($request); + + // Pull the public key ID from the certificate + $publickeyid = openssl_get_publickey($cert); + + // Check the computed signature against the one passed in the query + $ok = openssl_verify($base_string, $decoded_sig, $publickeyid); + + // Release the key resource + openssl_free_key($publickeyid); + + return $ok == 1; + } +} + +class OAuthRequest { + private $parameters; + private $http_method; + private $http_url; + // for debug purposes + public $base_string; + public static $version = '1.0'; + public static $POST_INPUT = 'php://input'; + + function __construct($http_method, $http_url, $parameters=NULL) { + @$parameters or $parameters = array(); + $parameters = array_merge( OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters); + $this->parameters = $parameters; + $this->http_method = $http_method; + $this->http_url = $http_url; + } + + + /** + * attempt to build up a request from what was passed to the server + */ + public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) { + $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") + ? 'http' + : 'https'; + @$http_url or $http_url = $scheme . + '://' . $_SERVER['HTTP_HOST'] . + ':' . + $_SERVER['SERVER_PORT'] . + $_SERVER['REQUEST_URI']; + @$http_method or $http_method = $_SERVER['REQUEST_METHOD']; + + // We weren't handed any parameters, so let's find the ones relevant to + // this request. + // If you run XML-RPC or similar you should use this to provide your own + // parsed parameter-list + if (!$parameters) { + // Find request headers + $request_headers = OAuthUtil::get_headers(); + + // Parse the query-string to find GET parameters + $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']); + + // It's a POST request of the proper content-type, so parse POST + // parameters and add those overriding any duplicates from GET + if ($http_method == "POST" + && @strstr($request_headers["Content-Type"], + "application/x-www-form-urlencoded") + ) { + $post_data = OAuthUtil::parse_parameters( + file_get_contents(self::$POST_INPUT) + ); + $parameters = array_merge($parameters, $post_data); + } + + // We have a Authorization-header with OAuth data. Parse the header + // and add those overriding any duplicates from GET or POST + if (@substr($request_headers['Authorization'], 0, 6) == "OAuth ") { + $header_parameters = OAuthUtil::split_header( + $request_headers['Authorization'] + ); + $parameters = array_merge($parameters, $header_parameters); + } + + } + + return new OAuthRequest($http_method, $http_url, $parameters); + } + + /** + * pretty much a helper function to set up the request + */ + public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) { + @$parameters or $parameters = array(); + $defaults = array("oauth_version" => OAuthRequest::$version, + "oauth_nonce" => OAuthRequest::generate_nonce(), + "oauth_timestamp" => OAuthRequest::generate_timestamp(), + "oauth_consumer_key" => $consumer->key); + if ($token) + $defaults['oauth_token'] = $token->key; + + $parameters = array_merge($defaults, $parameters); + + return new OAuthRequest($http_method, $http_url, $parameters); + } + + public function set_parameter($name, $value, $allow_duplicates = true) { + if ($allow_duplicates && isset($this->parameters[$name])) { + // We have already added parameter(s) with this name, so add to the list + if (is_scalar($this->parameters[$name])) { + // This is the first duplicate, so transform scalar (string) + // into an array so we can add the duplicates + $this->parameters[$name] = array($this->parameters[$name]); + } + + $this->parameters[$name][] = $value; + } else { + $this->parameters[$name] = $value; + } + } + + public function get_parameter($name) { + return isset($this->parameters[$name]) ? $this->parameters[$name] : null; + } + + public function get_parameters() { + return $this->parameters; + } + + public function unset_parameter($name) { + unset($this->parameters[$name]); + } + + /** + * The request parameters, sorted and concatenated into a normalized string. + * @return string + */ + public function get_signable_parameters() { + // Grab all parameters + $params = $this->parameters; + + // Remove oauth_signature if present + // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.") + if (isset($params['oauth_signature'])) { + unset($params['oauth_signature']); + } + + return OAuthUtil::build_http_query($params); + } + + /** + * Returns the base string of this request + * + * The base string defined as the method, the url + * and the parameters (normalized), each urlencoded + * and the concated with &. + */ + public function get_signature_base_string() { + $parts = array( + $this->get_normalized_http_method(), + $this->get_normalized_http_url(), + $this->get_signable_parameters() + ); + + $parts = OAuthUtil::urlencode_rfc3986($parts); + + return implode('&', $parts); + } + + /** + * just uppercases the http method + */ + public function get_normalized_http_method() { + return strtoupper($this->http_method); + } + + /** + * parses the url and rebuilds it to be + * scheme://host/path + */ + public function get_normalized_http_url() { + $parts = parse_url($this->http_url); + + $port = @$parts['port']; + $scheme = $parts['scheme']; + $host = $parts['host']; + $path = @$parts['path']; + + $port or $port = ($scheme == 'https') ? '443' : '80'; + + if (($scheme == 'https' && $port != '443') + || ($scheme == 'http' && $port != '80')) { + $host = "$host:$port"; + } + return "$scheme://$host$path"; + } + + /** + * builds a url usable for a GET request + */ + public function to_url() { + $post_data = $this->to_postdata(); + $out = $this->get_normalized_http_url(); + if ($post_data) { + $out .= '?'.$post_data; + } + return $out; + } + + /** + * builds the data one would send in a POST request + */ + public function to_postdata() { + return OAuthUtil::build_http_query($this->parameters); + } + + /** + * builds the Authorization: header + */ + public function to_header($realm=null) { + $first = true; + if($realm) { + $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"'; + $first = false; + } else + $out = 'Authorization: OAuth'; + + $total = array(); + foreach ($this->parameters as $k => $v) { + if (substr($k, 0, 5) != "oauth") continue; + if (is_array($v)) { + throw new OAuthException('Arrays not supported in headers'); + } + $out .= ($first) ? ' ' : ','; + $out .= OAuthUtil::urlencode_rfc3986($k) . + '="' . + OAuthUtil::urlencode_rfc3986($v) . + '"'; + $first = false; + } + return $out; + } + + public function __toString() { + return $this->to_url(); + } + + + public function sign_request($signature_method, $consumer, $token) { + $this->set_parameter( + "oauth_signature_method", + $signature_method->get_name(), + false + ); + $signature = $this->build_signature($signature_method, $consumer, $token); + $this->set_parameter("oauth_signature", $signature, false); + } + + public function build_signature($signature_method, $consumer, $token) { + $signature = $signature_method->build_signature($this, $consumer, $token); + return $signature; + } + + /** + * util function: current timestamp + */ + private static function generate_timestamp() { + return time(); + } + + /** + * util function: current nonce + */ + private static function generate_nonce() { + $mt = microtime(); + $rand = mt_rand(); + + return md5($mt . $rand); // md5s look nicer than numbers + } +} + +class OAuthServer { + protected $timestamp_threshold = 300; // in seconds, five minutes + protected $version = '1.0'; // hi blaine + protected $signature_methods = array(); + + protected $data_store; + + function __construct($data_store) { + $this->data_store = $data_store; + } + + public function add_signature_method($signature_method) { + $this->signature_methods[$signature_method->get_name()] = + $signature_method; + } + + // high level functions + + /** + * process a request_token request + * returns the request token on success + */ + public function fetch_request_token(&$request) { + $this->get_version($request); + + $consumer = $this->get_consumer($request); + + // no token required for the initial token request + $token = NULL; + + $this->check_signature($request, $consumer, $token); + + // Rev A change + $callback = $request->get_parameter('oauth_callback'); + $new_token = $this->data_store->new_request_token($consumer, $callback); + + return $new_token; + } + + /** + * process an access_token request + * returns the access token on success + */ + public function fetch_access_token(&$request) { + $this->get_version($request); + + $consumer = $this->get_consumer($request); + + // requires authorized request token + $token = $this->get_token($request, $consumer, "request"); + + $this->check_signature($request, $consumer, $token); + + // Rev A change + $verifier = $request->get_parameter('oauth_verifier'); + $new_token = $this->data_store->new_access_token($token, $consumer, $verifier); + + return $new_token; + } + + /** + * verify an api call, checks all the parameters + */ + public function verify_request(&$request) { + $this->get_version($request); + $consumer = $this->get_consumer($request); + $token = $this->get_token($request, $consumer, "access"); + $this->check_signature($request, $consumer, $token); + return array($consumer, $token); + } + + // Internals from here + /** + * version 1 + */ + private function get_version(&$request) { + $version = $request->get_parameter("oauth_version"); + if (!$version) { + // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present. + // Chapter 7.0 ("Accessing Protected Ressources") + $version = '1.0'; + } + if ($version !== $this->version) { + throw new OAuthException("OAuth version '$version' not supported"); + } + return $version; + } + + /** + * figure out the signature with some defaults + */ + private function get_signature_method(&$request) { + $signature_method = + @$request->get_parameter("oauth_signature_method"); + + if (!$signature_method) { + // According to chapter 7 ("Accessing Protected Ressources") the signature-method + // parameter is required, and we can't just fallback to PLAINTEXT + throw new OAuthException('No signature method parameter. This parameter is required'); + } + + if (!in_array($signature_method, + array_keys($this->signature_methods))) { + throw new OAuthException( + "Signature method '$signature_method' not supported " . + "try one of the following: " . + implode(", ", array_keys($this->signature_methods)) + ); + } + return $this->signature_methods[$signature_method]; + } + + /** + * try to find the consumer for the provided request's consumer key + */ + private function get_consumer(&$request) { + $consumer_key = @$request->get_parameter("oauth_consumer_key"); + if (!$consumer_key) { + throw new OAuthException("Invalid consumer key"); + } + + $consumer = $this->data_store->lookup_consumer($consumer_key); + if (!$consumer) { + throw new OAuthException("Invalid consumer"); + } + + return $consumer; + } + + /** + * try to find the token for the provided request's token key + */ + private function get_token(&$request, $consumer, $token_type="access") { + $token_field = @$request->get_parameter('oauth_token'); + $token = $this->data_store->lookup_token( + $consumer, $token_type, $token_field + ); + if (!$token) { + throw new OAuthException("Invalid $token_type token: $token_field"); + } + return $token; + } + + /** + * all-in-one function to check the signature on a request + * should guess the signature method appropriately + */ + private function check_signature(&$request, $consumer, $token) { + // this should probably be in a different method + $timestamp = @$request->get_parameter('oauth_timestamp'); + $nonce = @$request->get_parameter('oauth_nonce'); + + $this->check_timestamp($timestamp); + $this->check_nonce($consumer, $token, $nonce, $timestamp); + + $signature_method = $this->get_signature_method($request); + + $signature = $request->get_parameter('oauth_signature'); + $valid_sig = $signature_method->check_signature( + $request, + $consumer, + $token, + $signature + ); + + if (!$valid_sig) { + throw new OAuthException("Invalid signature"); + } + } + + /** + * check that the timestamp is new enough + */ + private function check_timestamp($timestamp) { + if( ! $timestamp ) + throw new OAuthException( + 'Missing timestamp parameter. The parameter is required' + ); + + // verify that timestamp is recentish + $now = time(); + if (abs($now - $timestamp) > $this->timestamp_threshold) { + throw new OAuthException( + "Expired timestamp, yours $timestamp, ours $now" + ); + } + } + + /** + * check that the nonce is not repeated + */ + private function check_nonce($consumer, $token, $nonce, $timestamp) { + if( ! $nonce ) + throw new OAuthException( + 'Missing nonce parameter. The parameter is required' + ); + + // verify that the nonce is uniqueish + $found = $this->data_store->lookup_nonce( + $consumer, + $token, + $nonce, + $timestamp + ); + if ($found) { + throw new OAuthException("Nonce already used: $nonce"); + } + } + +} + +class OAuthDataStore { + function lookup_consumer($consumer_key) { + // implement me + } + + function lookup_token($consumer, $token_type, $token) { + // implement me + } + + function lookup_nonce($consumer, $token, $nonce, $timestamp) { + // implement me + } + + function new_request_token($consumer, $callback = null) { + // return a new token attached to this consumer + } + + function new_access_token($token, $consumer, $verifier = null) { + // return a new access token attached to this consumer + // for the user associated with this token if the request token + // is authorized + // should also invalidate the request token + } + +} + +class OAuthUtil { + public static function urlencode_rfc3986($input) { + if (is_array($input)) { + return array_map(array('OAuthUtil', 'urlencode_rfc3986'), $input); + } else if (is_scalar($input)) { + return str_replace( + '+', + ' ', + str_replace('%7E', '~', rawurlencode($input)) + ); + } else { + return ''; + } +} + + + // This decode function isn't taking into consideration the above + // modifications to the encoding process. However, this method doesn't + // seem to be used anywhere so leaving it as is. + public static function urldecode_rfc3986($string) { + return urldecode($string); + } + + // Utility function for turning the Authorization: header into + // parameters, has to do some unescaping + // Can filter out any non-oauth parameters if needed (default behaviour) + public static function split_header($header, $only_allow_oauth_parameters = true) { + $pattern = '/(([-_a-z]*)=("([^"]*)"|([^,]*)),?)/'; + $offset = 0; + $params = array(); + while (preg_match($pattern, $header, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) { + $match = $matches[0]; + $header_name = $matches[2][0]; + $header_content = (isset($matches[5])) ? $matches[5][0] : $matches[4][0]; + if (preg_match('/^oauth_/', $header_name) || !$only_allow_oauth_parameters) { + $params[$header_name] = OAuthUtil::urldecode_rfc3986($header_content); + } + $offset = $match[1] + strlen($match[0]); + } + + if (isset($params['realm'])) { + unset($params['realm']); + } + + return $params; + } + + // helper to try to sort out headers for people who aren't running apache + public static function get_headers() { + if (function_exists('apache_request_headers')) { + // we need this to get the actual Authorization: header + // because apache tends to tell us it doesn't exist + $headers = apache_request_headers(); + + // sanitize the output of apache_request_headers because + // we always want the keys to be Cased-Like-This and arh() + // returns the headers in the same case as they are in the + // request + $out = array(); + foreach( $headers AS $key => $value ) { + $key = str_replace( + " ", + "-", + ucwords(strtolower(str_replace("-", " ", $key))) + ); + $out[$key] = $value; + } + } else { + // otherwise we don't have apache and are just going to have to hope + // that $_SERVER actually contains what we need + $out = array(); + if( isset($_SERVER['CONTENT_TYPE']) ) + $out['Content-Type'] = $_SERVER['CONTENT_TYPE']; + if( isset($_ENV['CONTENT_TYPE']) ) + $out['Content-Type'] = $_ENV['CONTENT_TYPE']; + + foreach ($_SERVER as $key => $value) { + if (substr($key, 0, 5) == "HTTP_") { + // this is chaos, basically it is just there to capitalize the first + // letter of every word that is not an initial HTTP and strip HTTP + // code from przemek + $key = str_replace( + " ", + "-", + ucwords(strtolower(str_replace("_", " ", substr($key, 5)))) + ); + $out[$key] = $value; + } + } + } + return $out; + } + + // This function takes a input like a=b&a=c&d=e and returns the parsed + // parameters like this + // array('a' => array('b','c'), 'd' => 'e') + public static function parse_parameters( $input ) { + if (!isset($input) || !$input) return array(); + + $pairs = explode('&', $input); + + $parsed_parameters = array(); + foreach ($pairs as $pair) { + $split = explode('=', $pair, 2); + $parameter = OAuthUtil::urldecode_rfc3986($split[0]); + $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : ''; + + if (isset($parsed_parameters[$parameter])) { + // We have already recieved parameter(s) with this name, so add to the list + // of parameters with this name + + if (is_scalar($parsed_parameters[$parameter])) { + // This is the first duplicate, so transform scalar (string) into an array + // so we can add the duplicates + $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]); + } + + $parsed_parameters[$parameter][] = $value; + } else { + $parsed_parameters[$parameter] = $value; + } + } + return $parsed_parameters; + } + + public static function build_http_query($params) { + if (!$params) return ''; + + // Urlencode both keys and values + $keys = OAuthUtil::urlencode_rfc3986(array_keys($params)); + $values = OAuthUtil::urlencode_rfc3986(array_values($params)); + $params = array_combine($keys, $values); + + // Parameters are sorted by name, using lexicographical byte value ordering. + // Ref: Spec: 9.1.1 (1) + uksort($params, 'strcmp'); + + $pairs = array(); + foreach ($params as $parameter => $value) { + if (is_array($value)) { + // If two or more parameters share the same name, they are sorted by their value + // Ref: Spec: 9.1.1 (1) + natsort($value); + foreach ($value as $duplicate_value) { + $pairs[] = $parameter . '=' . $duplicate_value; + } + } else { + $pairs[] = $parameter . '=' . $value; + } + } + // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61) + // Each name-value pair is separated by an '&' character (ASCII code 38) + return implode('&', $pairs); + } +} + +?> diff --git a/3.1/modules/twitter/vendor/twitteroauth/images/darker.png b/3.1/modules/twitter/vendor/twitteroauth/images/darker.png new file mode 100644 index 00000000..746b6b9f Binary files /dev/null and b/3.1/modules/twitter/vendor/twitteroauth/images/darker.png differ diff --git a/3.1/modules/twitter/vendor/twitteroauth/images/lighter.png b/3.1/modules/twitter/vendor/twitteroauth/images/lighter.png new file mode 100644 index 00000000..297bb034 Binary files /dev/null and b/3.1/modules/twitter/vendor/twitteroauth/images/lighter.png differ diff --git a/3.1/modules/twitter/vendor/twitteroauth/twitteroauth.php b/3.1/modules/twitter/vendor/twitteroauth/twitteroauth.php new file mode 100644 index 00000000..674308ae --- /dev/null +++ b/3.1/modules/twitter/vendor/twitteroauth/twitteroauth.php @@ -0,0 +1,245 @@ +http_status; } + function lastAPICall() { return $this->last_api_call; } + + /** + * construct TwitterOAuth object + */ + function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) { + $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1(); + $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret); + if (!empty($oauth_token) && !empty($oauth_token_secret)) { + $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret); + } else { + $this->token = NULL; + } + } + + + /** + * Get a request_token from Twitter + * + * @returns a key/value array containing oauth_token and oauth_token_secret + */ + function getRequestToken($oauth_callback = NULL) { + $parameters = array(); + if (!empty($oauth_callback)) { + $parameters['oauth_callback'] = $oauth_callback; + } + $request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters); + $token = OAuthUtil::parse_parameters($request); + $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']); + return $token; + } + + /** + * Get the authorize URL + * + * @returns a string + */ + function getAuthorizeURL($token, $sign_in_with_twitter = TRUE) { + if (is_array($token)) { + $token = $token['oauth_token']; + } + if (empty($sign_in_with_twitter)) { + return $this->authorizeURL() . "?oauth_token={$token}"; + } else { + return $this->authenticateURL() . "?oauth_token={$token}"; + } + } + + /** + * Exchange request token and secret for an access token and + * secret, to sign API calls. + * + * @returns array("oauth_token" => "the-access-token", + * "oauth_token_secret" => "the-access-secret", + * "user_id" => "9436992", + * "screen_name" => "abraham") + */ + function getAccessToken($oauth_verifier = FALSE) { + $parameters = array(); + if (!empty($oauth_verifier)) { + $parameters['oauth_verifier'] = $oauth_verifier; + } + $request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters); + $token = OAuthUtil::parse_parameters($request); + $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']); + return $token; + } + + /** + * One time exchange of username and password for access token and secret. + * + * @returns array("oauth_token" => "the-access-token", + * "oauth_token_secret" => "the-access-secret", + * "user_id" => "9436992", + * "screen_name" => "abraham", + * "x_auth_expires" => "0") + */ + function getXAuthToken($username, $password) { + $parameters = array(); + $parameters['x_auth_username'] = $username; + $parameters['x_auth_password'] = $password; + $parameters['x_auth_mode'] = 'client_auth'; + $request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters); + $token = OAuthUtil::parse_parameters($request); + $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']); + return $token; + } + + /** + * GET wrapper for oAuthRequest. + */ + function get($url, $parameters = array()) { + $response = $this->oAuthRequest($url, 'GET', $parameters); + if ($this->format === 'json' && $this->decode_json) { + return json_decode($response); + } + return $response; + } + + /** + * POST wrapper for oAuthRequest. + */ + function post($url, $parameters = array()) { + $response = $this->oAuthRequest($url, 'POST', $parameters); + if ($this->format === 'json' && $this->decode_json) { + return json_decode($response); + } + return $response; + } + + /** + * DELETE wrapper for oAuthReqeust. + */ + function delete($url, $parameters = array()) { + $response = $this->oAuthRequest($url, 'DELETE', $parameters); + if ($this->format === 'json' && $this->decode_json) { + return json_decode($response); + } + return $response; + } + + /** + * Format and sign an OAuth / API request + */ + function oAuthRequest($url, $method, $parameters) { + if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) { + $url = "{$this->host}{$url}.{$this->format}"; + } + $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters); + $request->sign_request($this->sha1_method, $this->consumer, $this->token); + switch ($method) { + case 'GET': + return $this->http($request->to_url(), 'GET'); + default: + return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata()); + } + } + + /** + * Make an HTTP request + * + * @return API results + */ + function http($url, $method, $postfields = NULL) { + $this->http_info = array(); + $ci = curl_init(); + /* Curl settings */ + curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent); + curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout); + curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout); + curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE); + curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:')); + curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer); + curl_setopt($ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader')); + curl_setopt($ci, CURLOPT_HEADER, FALSE); + + switch ($method) { + case 'POST': + curl_setopt($ci, CURLOPT_POST, TRUE); + if (!empty($postfields)) { + curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields); + } + break; + case 'DELETE': + curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE'); + if (!empty($postfields)) { + $url = "{$url}?{$postfields}"; + } + } + + curl_setopt($ci, CURLOPT_URL, $url); + $response = curl_exec($ci); + $this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE); + $this->http_info = array_merge($this->http_info, curl_getinfo($ci)); + $this->url = $url; + curl_close ($ci); + return $response; + } + + /** + * Get the header info to store. + */ + function getHeader($ch, $header) { + $i = strpos($header, ':'); + if (!empty($i)) { + $key = str_replace('-', '_', strtolower(substr($header, 0, $i))); + $value = trim(substr($header, $i + 2)); + $this->http_header[$key] = $value; + } + return strlen($header); + } +} diff --git a/3.1/modules/twitter/views/admin_twitter.html.php b/3.1/modules/twitter/views/admin_twitter.html.php new file mode 100644 index 00000000..807a72df --- /dev/null +++ b/3.1/modules/twitter/views/admin_twitter.html.php @@ -0,0 +1,30 @@ + +
+

+ +

dev.twitter.com/apps/new.", + array("twitter_apps_reg" => "http://dev.twitter.com/apps/new")) ?>

+
    +
    • +
    • +
  • url::abs_site())) ?>
    • +
    • +
    • +
  • url::abs_site())) ?>
    • +
    • +
+

+ +

Twitter application settings, if necessary.", + array("twitter_apps" => "http://dev.twitter.com/apps")) ?>

+ +

bit.ly module to shorten + Gallery URLs in tweets.", array("bitly_module_url" => "http://codex.gallery2.org/Gallery3:Modules:bitly")) ?>

+ + +
+ +
+
diff --git a/3.1/modules/twitter/views/twitter_dialog.html.php b/3.1/modules/twitter/views/twitter_dialog.html.php new file mode 100644 index 00000000..b39c7928 --- /dev/null +++ b/3.1/modules/twitter/views/twitter_dialog.html.php @@ -0,0 +1,22 @@ + + +
+

$type, "title"=> $title)) ?>

+ +

+ +

+

" alt="Sign in with Twitter"/>

+ +
+ +
+ +
+
+ +
\ No newline at end of file