From 60b537a088b2052896447a078948748ea43084a6 Mon Sep 17 00:00:00 2001
From: Pascal Chevrel <pascal@chevrel.org>
Date: Thu, 8 Mar 2012 11:49:38 +0100
Subject: fix install process and admin section which are currently broken
 because of the separation of classes in separate files. Now the files calling
 those classes are including app/app.php, also, I changed the variable name 
 in the installation wizard to  so as to avoid confusion with  already used in
 the admin section

---
 admin/index.php         | 2 +-
 admin/subscriptions.php | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 admin/index.php
 mode change 100644 => 100755 admin/subscriptions.php

(limited to 'admin')

diff --git a/admin/index.php b/admin/index.php
old mode 100644
new mode 100755
index b075206..1a43020
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,7 +1,7 @@
 <?php
 
 require_once dirname(__FILE__) . '/inc/auth.inc.php';
-require_once(dirname(__FILE__) . '/../app/classes/Planet.class.php');
+require_once dirname(__FILE__) . '/../app/app.php';
 
 //Load configuration
 $config_file = dirname(__FILE__) . '/../custom/config.yml';
diff --git a/admin/subscriptions.php b/admin/subscriptions.php
old mode 100644
new mode 100755
index 0b25bde..ea2f113
--- a/admin/subscriptions.php
+++ b/admin/subscriptions.php
@@ -1,10 +1,6 @@
 <?php
-require_once dirname(__FILE__).'/inc/auth.inc.php';
-
-include_once(dirname(__FILE__).'/../app/classes/Planet.class.php');
-include_once(dirname(__FILE__).'/../app/lib/spyc-0.5/spyc.php');
-require_once dirname(__FILE__).'/../app/lib/lib.opml.php';
-require_once dirname(__FILE__).'/../app/lib/simplepie/simplepie.inc';
+require_once dirname(__FILE__) . '/inc/auth.inc.php';
+require_once dirname(__FILE__) . '/../app/app.php';
 
 function removeSlashes(&$item, $key){
     $item = stripslashes($item);
-- 
cgit v1.2.1