moved some actions into the admin directory

9 files changed, 10 insertions, 9 deletions

diff --git a/actions/create_thumbnails.php b/actions/admin/create_thumbnails.php
index 18dae6b78..18dae6b78 100644
--- a/actions/create_thumbnails.php
+++ b/actions/admin/create_thumbnails.php
diff --git a/actions/flickrSetup.php b/actions/admin/flickrSetup.php
index ee31b8c34..ee31b8c34 100644
--- a/actions/flickrSetup.php
+++ b/actions/admin/flickrSetup.php
diff --git a/actions/imtest.php b/actions/admin/imtest.php
index 293a9b2e8..293a9b2e8 100644
--- a/actions/imtest.php
+++ b/actions/admin/imtest.php
diff --git a/actions/settings.php b/actions/admin/settings.php
index 2c529d950..2c529d950 100644
--- a/actions/settings.php
+++ b/actions/admin/settings.php
diff --git a/start.php b/start.php
index 52d56d77a..90269d67b 100644
--- a/start.php
+++ b/start.php
@@ -452,13 +452,14 @@ register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus');
 register_elgg_event_handler('pagesetup', 'system', 'tidypics_adminmenu');
 
 // Register actions
-register_action("tidypics/settings", false, $CONFIG->pluginspath . "tidypics/actions/settings.php");
 register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
 register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
 register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
 register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
 register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
-register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
-register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
-register_action("tidypics/flickrSetup", true, $CONFIG->pluginspath . "tidypics/actions/flickrSetup.php");
-register_action("tidypics/admin/upgrade", true, $CONFIG->pluginspath . "tidypics/actions/admin/upgrade.php", true);
+register_action("tidypics/addtag", false, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
+register_action("tidypics/deletetag", false, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
+
+register_action("tidypics/admin/flickrSetup", false, $CONFIG->pluginspath . "tidypics/actions/admin/flickrSetup.php", true);
+register_action("tidypics/admin/settings", false, $CONFIG->pluginspath . "tidypics/actions/admin/settings.php", true);
+register_action("tidypics/admin/upgrade", false, $CONFIG->pluginspath . "tidypics/actions/admin/upgrade.php", true);
diff --git a/views/default/tidypics/admin/imagelib.php b/views/default/tidypics/admin/imagelib.php
index a0d0c19e7..2b7a3a7b0 100644
--- a/views/default/tidypics/admin/imagelib.php
+++ b/views/default/tidypics/admin/imagelib.php
@@ -51,7 +51,7 @@ if (get_plugin_setting('tagging', 'tidypics') != "disabled")
 		$("#im_results").html("");
 		$.ajax({
 			type: "GET",
-			url: "<?php echo $CONFIG->wwwroot . 'mod/tidypics/actions/imtest.php'; ?>",
+			url: "<?php echo $CONFIG->wwwroot . 'mod/tidypics/actions/admin/imtest.php'; ?>",
 			data: {location: loc},
 			cache: false,
 			success: function(html){
diff --git a/views/default/tidypics/admin/thumbnails.php b/views/default/tidypics/admin/thumbnails.php
index 960028fb9..5884b9dc3 100644
--- a/views/default/tidypics/admin/thumbnails.php
+++ b/views/default/tidypics/admin/thumbnails.php
@@ -22,7 +22,7 @@ function TestThumbnailCreation()
 	$("#im_results").html("");
 	$.ajax({
 		type: "GET",
-		url: "<?php echo $CONFIG->wwwroot . 'mod/tidypics/actions/create_thumbnails.php'; ?>",
+		url: "<?php echo $CONFIG->wwwroot . 'mod/tidypics/actions/admin/create_thumbnails.php'; ?>",
 		data: {guid: image_id},
 		cache: false,
 		success: function(html){
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index c102b044e..dc5c02f15 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -5,7 +5,7 @@
 
 
 
-$action = $vars['url'] . 'action/tidypics/settings';
+$action = $vars['url'] . 'action/tidypics/admin/settings';
 
 $plugin = find_plugin_settings('tidypics');
 
diff --git a/views/default/tidypics/forms/setupFlickr.php b/views/default/tidypics/forms/setupFlickr.php
index 3a9c76d11..54f0a37d1 100644
--- a/views/default/tidypics/forms/setupFlickr.php
+++ b/views/default/tidypics/forms/setupFlickr.php
@@ -5,7 +5,7 @@ $user = get_loggedin_user();
 $flickr_username = get_metadata_byname( $user->guid, "flickr_username" );
 $flickr_album_id = get_metadata_byname( $user->guid, "flickr_album_id" );
 
-$action = $vars['url'] . 'action/tidypics/flickrSetup';
+$action = $vars['url'] . 'admin/action/tidypics/flickrSetup';
 
 $form_body = "<p>". elgg_echo( 'flickr:intro' ) . "</p><p>";
 $form_body .= elgg_echo( 'flickr:usernamesetup') . " <input style='width: 20%;' type='text' name='flickr_username' value='$flickr_username->value' ' class='input-text' /> <br />";