Split Class-Package into its two classes.

Signed-off-by: Norv <a.w.norv@gmail.com>
elkarte · Jan 19, 2013 · 0ebe024 · 0ebe024
1 parent c1eae05
commit 0ebe024
Show file tree

Hide file tree

Showing 6 changed files with 490 additions and 467 deletions.
diff --git a/Sources/admin/Admin.php b/Sources/admin/Admin.php
@@ -937,7 +937,7 @@ function AdminSearchOM()
 
 	// Otherwise we simply walk through the XML and stick it in context for display.
 	$context['search_results'] = array();
-	require_once($sourcedir . '/Package.class.php');
+	require_once($sourcedir . '/subs/XmlArray.class.php');
 
 	// Get the results loaded into an array for processing!
 	$results = new xmlArray($search_results, false);

diff --git a/Sources/admin/ManageLanguages.php b/Sources/admin/ManageLanguages.php
@@ -153,7 +153,7 @@ function list_getLanguagesList()
 	$url = 'http://download.elkarte.net/fetch_language.php?version=' . urlencode(strtr($forum_version, array('ELKARTE ' => '')));
 
 	// Load the class file and stick it into an array.
-	require_once($sourcedir . '/Package.class.php');
+	require_once($sourcedir . '/subs/XmlArray.class.php');
 	$language_list = new xmlArray(fetch_web_data($url), true);
 
 	// Check that the site responded and that the language exists.

diff --git a/Sources/admin/PackageServers.php b/Sources/admin/PackageServers.php
@@ -127,7 +127,7 @@ function action_servers()
 	{
 		if (isset($_POST['ftp_username']))
 		{
-			require_once($sourcedir . '/Package.class.php');
+			require_once($sourcedir . '/subs/FTPConnection.class.php');
 			$ftp = new ftp_connection($_POST['ftp_server'], $_POST['ftp_port'], $_POST['ftp_username'], $_POST['ftp_password']);
 
 			if ($ftp->error === false)
@@ -145,7 +145,7 @@ function action_servers()
 		{
 			if (!isset($ftp))
 			{
-				require_once($sourcedir . '/Package.class.php');
+				require_once($sourcedir . '/subs/FTPConnection.class.php');
 				$ftp = new ftp_connection(null);
 			}
 			elseif ($ftp->error !== false && !isset($ftp_error))
@@ -256,7 +256,7 @@ function action_browseserver()
 	@set_time_limit(600);
 
 	// Read packages.xml and parse into xmlArray. (the true tells it to trim things ;).)
-	require_once($sourcedir . '/Package.class.php');
+	require_once($sourcedir . '/subs/XmlArray.class.php');
 	$listing = new xmlArray(fetch_web_data($_GET['package']), true);
 
 	// Errm.... empty file?  Try the URL....