From f5e8d5e9be7873132fbfddf74ef8ff68f01fccae Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Mon, 2 Jan 2012 17:01:18 -0500
Subject: updated the upgrade system

---
 actions/admin/upgrade.php        | 48 --------------------------------------
 actions/photos/admin/upgrade.php | 50 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 48 deletions(-)
 delete mode 100644 actions/admin/upgrade.php
 create mode 100644 actions/photos/admin/upgrade.php

(limited to 'actions')

diff --git a/actions/admin/upgrade.php b/actions/admin/upgrade.php
deleted file mode 100644
index 334e9588e..000000000
--- a/actions/admin/upgrade.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Tidypics upgrade action
- */
-require_once "{$CONFIG->pluginspath}tidypics/version.php";
-
-$local_version = get_plugin_setting('version', 'tidypics');
-
-if ($version <= $local_version) {
-	register_error('No upgrade required');
-	forward($_SERVER['HTTP_REFERER']);
-}
-
-set_time_limit(0);
-
-$base_dir = $CONFIG->pluginspath . 'tidypics/upgrades';
-
-// taken from engine/lib/version.php
-if ($handle = opendir($base_dir)) {
-	$upgrades = array();
-
-	while ($updatefile = readdir($handle)) {
-		// Look for upgrades and add to upgrades list
-		if (!is_dir("$base_dir/$updatefile")) {
-			if (preg_match('/^([0-9]{10})\.(php)$/', $updatefile, $matches)) {
-				$plugin_version = (int) $matches[1];
-				if ($plugin_version > $local_version) {
-					$upgrades[] = "$base_dir/$updatefile";
-				}
-			}
-		}
-	}
-
-	// Sort and execute
-	asort($upgrades);
-
-	if (sizeof($upgrades) > 0) {
-		foreach ($upgrades as $upgrade) {
-			include($upgrade);
-		}
-	}
-}
-
-set_plugin_setting('version', $version, 'tidypics');
-
-system_message("Tidypics has been upgraded");
-
-forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/photos/admin/upgrade.php b/actions/photos/admin/upgrade.php
new file mode 100644
index 000000000..c9ae1da48
--- /dev/null
+++ b/actions/photos/admin/upgrade.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Tidypics upgrade action
+ */
+
+$plugins_path = elgg_get_plugins_path();
+
+require_once "{$plugins_path}tidypics/version.php";
+
+$local_version = elgg_get_plugin_setting('version', 'tidypics');
+
+if ($version <= $local_version) {
+	register_error('No upgrade required');
+	forward(REFERER);
+}
+
+set_time_limit(0);
+
+$base_dir = "{$plugins_path}tidypics/upgrades";
+
+// taken from engine/lib/version.php
+if ($handle = opendir($base_dir)) {
+	$upgrades = array();
+
+	while ($updatefile = readdir($handle)) {
+		// Look for upgrades and add to upgrades list
+		if (!is_dir("$base_dir/$updatefile")) {
+			if (preg_match('/^([0-9]{10})\.(php)$/', $updatefile, $matches)) {
+				$plugin_version = (int) $matches[1];
+				if ($plugin_version > $local_version) {
+					$upgrades[] = "$base_dir/$updatefile";
+				}
+			}
+		}
+	}
+
+	// Sort and execute
+	asort($upgrades);
+
+	if (sizeof($upgrades) > 0) {
+		foreach ($upgrades as $upgrade) {
+			include($upgrade);
+		}
+	}
+}
+
+elgg_set_plugin_setting('version', $version, 'tidypics');
+
+system_message("Tidypics has been upgraded");
+forward(REFERER);
-- 
cgit v1.2.3