finished moving lists to pages/lists/

16 files changed, 25 insertions, 24 deletions

diff --git a/friendmostviewed.php b/pages/lists/friendmostviewed.php
index 5c4ec91f4..793304edc 100644
--- a/friendmostviewed.php
+++ b/pages/lists/friendmostviewed.php
@@ -4,7 +4,7 @@
 	 * 
 	 */
 
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	//if no friends were requested, see world pictures instead, or redirect to user's friends
 /*	if (is_null(get_input('username')) || get_input('username')=='') {
diff --git a/pages/lists/highestrated.php b/pages/lists/highestrated.php
index e9f0296e2..bacb7ba86 100644
--- a/pages/lists/highestrated.php
+++ b/pages/lists/highestrated.php
@@ -4,7 +4,7 @@
 	 * 
 	 */
 
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	//if no friends were requested, see world pictures instead, or redirect to user's friends
 /*	if (is_null(get_input('username')) || get_input('username')=='') {
diff --git a/pages/lists/highestvotecount.php b/pages/lists/highestvotecount.php
index 694afb32d..26b907144 100644
--- a/pages/lists/highestvotecount.php
+++ b/pages/lists/highestvotecount.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/pages/lists/mostcommentedimages.php b/pages/lists/mostcommentedimages.php
index b3a36a9ac..e22d3863e 100644
--- a/pages/lists/mostcommentedimages.php
+++ b/pages/lists/mostcommentedimages.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/pages/lists/mostcommentedimagesthismonth.php b/pages/lists/mostcommentedimagesthismonth.php
index c47cee2da..88b8371ee 100644
--- a/pages/lists/mostcommentedimagesthismonth.php
+++ b/pages/lists/mostcommentedimagesthismonth.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/pages/lists/mostcommentedimagestoday.php b/pages/lists/mostcommentedimagestoday.php
index 066feb45e..d35ac468d 100644
--- a/pages/lists/mostcommentedimagestoday.php
+++ b/pages/lists/mostcommentedimagestoday.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/mostviewedimages.php b/pages/lists/mostviewedimages.php
index 66266f5e7..bd1b3ee92 100644
--- a/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/mostviewedimageslastmonth.php b/pages/lists/mostviewedimageslastmonth.php
index c57a74233..c5edec3d9 100644
--- a/mostviewedimageslastmonth.php
+++ b/pages/lists/mostviewedimageslastmonth.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/mostviewedimagesthismonth.php b/pages/lists/mostviewedimagesthismonth.php
index e950f0f20..dfdb6136a 100644
--- a/mostviewedimagesthismonth.php
+++ b/pages/lists/mostviewedimagesthismonth.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/mostviewedimagesthisyear.php b/pages/lists/mostviewedimagesthisyear.php
index 807260769..e6c8a53db 100644
--- a/mostviewedimagesthisyear.php
+++ b/pages/lists/mostviewedimagesthisyear.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/mostviewedimagestoday.php b/pages/lists/mostviewedimagestoday.php
index b971771ba..9845506eb 100644
--- a/mostviewedimagestoday.php
+++ b/pages/lists/mostviewedimagestoday.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/pages/lists/recentlycommented.php b/pages/lists/recentlycommented.php
index bfb64981d..da0f2a12a 100644
--- a/pages/lists/recentlycommented.php
+++ b/pages/lists/recentlycommented.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/recentlyviewed.php b/pages/lists/recentlyviewed.php
index 4cf3737dd..b8a5531b2 100644
--- a/recentlyviewed.php
+++ b/pages/lists/recentlyviewed.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/pages/lists/recentvotes.php b/pages/lists/recentvotes.php
index f9ddbdc38..3d8eac97e 100644
--- a/pages/lists/recentvotes.php
+++ b/pages/lists/recentvotes.php
@@ -7,7 +7,7 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
diff --git a/yourmostviewed.php b/pages/lists/yourmostviewed.php
index ffcdb50ad..6a2114d19 100644
--- a/yourmostviewed.php
+++ b/pages/lists/yourmostviewed.php
@@ -7,7 +7,8 @@
 	 */
 
 	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
+	
 	$viewer = get_loggedin_user();
 	
 	global $CONFIG;
diff --git a/start.php b/start.php
index 8f99a8212..53b2c17c4 100644
--- a/start.php
+++ b/start.php
@@ -192,14 +192,14 @@
 		global $CONFIG;

 		

 		add_submenu_item(elgg_echo('tidypics:mostvieweddashboard'), $CONFIG->url . "mod/tidypics/mostvieweddashboard.php");

-		add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/mostviewedimagesthisyear.php");

-		add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/mostviewedimagesthismonth.php");

-		add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/mostviewedimageslastmonth.php");

-		add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/mostviewedimagestoday.php");

+		add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthisyear.php");

+		add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthismonth.php");

+		add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimageslastmonth.php");

+		add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagestoday.php");

 		add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimages.php");

 		add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagesthismonth.php");

 		add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagestoday.php");

-		add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'mod/tidypics/pages/lists/recentlycommented');

+		add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented');

 	}

 	/**

 	 * Sets up tidypics admin menu. Triggered on pagesetup.

@@ -282,7 +282,7 @@
 

 				case "mostviewed":

 					if (isset($page[1])) set_input('guid',$page[1]);

-					include($CONFIG->pluginspath . "tidypics/mostviewedimages.php");

+					include($CONFIG->pluginspath . "tidypics/pages/lists/mostviewedimages.php");

 				break;

 				

 				case "mostrecent":

@@ -292,7 +292,7 @@
 				

 				case "yourmostviewed":

 					if (isset($page[1])) set_input('guid',$page[1]);

-					include($CONFIG->pluginspath . "tidypics/yourmostviewed.php");

+					include($CONFIG->pluginspath . "tidypics/pages/lists/yourmostviewed.php");

 				break;

 				

 				case "yourmostrecent":

@@ -302,7 +302,7 @@
 				

 				case "friendmostviewed":

 					if (isset($page[1])) set_input('guid',$page[1]);

-					include($CONFIG->pluginspath . "tidypics/friendmostviewed.php");

+					include($CONFIG->pluginspath . "tidypics/pages/lists/friendmostviewed.php");

 				break;

 				

 				case "friendmostrecent":

@@ -312,7 +312,7 @@
 				

 				case "recentlyviewed":

 					if (isset($page[1])) set_input('guid',$page[1]);

-					include($CONFIG->pluginspath . "tidypics/recentlyviewed.php");

+					include($CONFIG->pluginspath . "tidypics/pages/lists/recentlyviewed.php");

 				break;

 				

 				case "recentlycommented":