From 44c3bc48b5db7b3dc6517d2b073a55af5d4b52db Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 10 Sep 2008 21:06:49 +0000
Subject: Series: Moved around directory structure

Refs #55
---
 series/core/trunk/admin/addsub.php | 129 ------------------------------------
 series/core/trunk/admin/chpwd.php  | 132 -------------------------------------
 series/core/trunk/admin/login.php  |  95 --------------------------
 series/core/trunk/admin/logout.php |  26 --------
 series/core/trunk/admin/main.php   |  25 -------
 5 files changed, 407 deletions(-)
 delete mode 100644 series/core/trunk/admin/addsub.php
 delete mode 100644 series/core/trunk/admin/chpwd.php
 delete mode 100644 series/core/trunk/admin/login.php
 delete mode 100644 series/core/trunk/admin/logout.php
 delete mode 100644 series/core/trunk/admin/main.php

(limited to 'series/core/trunk/admin')

diff --git a/series/core/trunk/admin/addsub.php b/series/core/trunk/admin/addsub.php
deleted file mode 100644
index f462d3f..0000000
--- a/series/core/trunk/admin/addsub.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/* InstaDisc Series - A Four Island Project */
-
-/** 
- * require_once() is used to ensure
- * the ACP files are being called by
- * admin.php instead of their actual
- * locations admin/.
- * The _once() part ensures no problem
- * arises as includes/instadisc.php has
- * already been included from admin.php
- */
-require_once('includes/instadisc.php');
-
-if (!isset($_SESSION['username']))
-{
-	header('Location: index.php');
-	exit;
-}
-
-if (!isset($_GET['submit']))
-{
-	showForm('','','','','',array());
-} else {
-	$numOfErrors = 0;
-	$errors = array();
-
-	if ($_POST['id'] == '')
-	{
-		addError($numOfErrors, $errors, 'id', 'Subscription ID is a required field');
-	}
-
-	if ($_POST['title'] == '')
-	{
-		addError($numOfErrors, $errors, 'title', 'Title is a required field');
-	}
-
-	if ($_POST['url'] == '')
-	{
-		addError($numOfErrors, $errors, 'url', 'Subscription URL is a required field');
-	}
-
-	if ($_POST['category'] == '')
-	{
-		addError($numOfErrors, $errors, 'category', 'Category is a required field');
-	}
-
-	if ($numOfErrors > 0)
-	{
-		showForm($_POST['id'], $_POST['title'], $_POST['url'], $_POST['category'], $_POST['password'], $errors);
-	} else {
-		instaDisc_addSubscription($_POST['id'], $_POST['title'], $_POST['url'], $_POST['category'], $_POST['password']);
-
-		$template = new FITemplate('addedsub');
-		$template->add('SITENAME', instaDisc_getConfig('siteName'));
-		$template->display();
-	}
-}
-
-function showForm($id, $title, $url, $category, $password, $errors)
-{
-	$template = new FITemplate('addsub');
-	$template->add('SITENAME', instaDisc_getConfig('siteName'));
-
-	if (isset($errors[1]))
-	{
-		$template->adds_block('ERROR', array('ex'=>'1'));
-
-		foreach ($errors as $name => $value)
-		{
-			$template->adds_block('ERRORS', array(	'NAME' => $name,
-								'MSG' => $value['msg']));
-		}
-	}
-
-	$template->add('ID_ERR', ifErrors($errors, 'id'));
-	$template->add('TITLE_ERR', ifErrors($errors, 'title'));
-	$template->add('URL_ERR', ifErrors($errors, 'url'));
-	$template->add('CATEGORY_ERR', ifErrors($errors, 'url'));
-	$template->add('PASSWORD_ERR', ifErrors($errors, 'url'));
-
-	doErrors($template, $errors, 'id');
-	doErrors($template, $errors, 'title');
-	doErrors($template, $errors, 'url');
-	doErrors($template, $errors, 'category');
-	doErrors($template, $errors, 'password');
-
-	$template->add('ID', $id);
-	$template->add('TITLE', $title);
-	$template->add('URL', $url);
-	$template->add('CATEGORY', $category);
-	$template->add('PASSWORD', $password);
-
-	$template->display();
-}
-
-function ifErrors($errors, $id)
-{
-        foreach ($errors as $name => $value)
-        {
-                if ($value['field'] == $id)
-                {
-                        return ' error';
-                }
-        }
-
-	return '';
-}
-
-function doErrors($template, $errors, $id)
-{
-        foreach ($errors as $name => $value)
-        {
-                if ($value['field'] == $id)
-                {
-			$template->adds_block(strtoupper($id) . '_ERRS', array(	'NAME' => $name,
-										'VALUE' => $value['msg']));
-                }
-        }
-}
-
-function addError(&$numOfErrors, &$errors, $field, $msg)
-{
-        $numOfErrors++;
-        $errors[$numOfErrors] = array('field' => $field, 'msg' => $msg);
-}
-
-?>
diff --git a/series/core/trunk/admin/chpwd.php b/series/core/trunk/admin/chpwd.php
deleted file mode 100644
index 2f5368d..0000000
--- a/series/core/trunk/admin/chpwd.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/* InstaDisc Series - A Four Island Project */
-
-/** 
- * require_once() is used to ensure
- * the ACP files are being called by
- * admin.php instead of their actual
- * locations admin/.
- * The _once() part ensures no problem
- * arises as includes/instadisc.php has
- * already been included from admin.php
- */
-require_once('includes/instadisc.php');
-
-if (!isset($_SESSION['username']))
-{
-	header('Location: index.php');
-}
-
-if (isset($_SESSION['username']))
-{
-	if (!isset($_GET['submit']))
-	{
-		showForm('','','',array());
-	} else {
-		$numOfErrors = 0;
-		$errors = array();
-
-		if ($_POST['old'] == '')
-		{
-			addError($numOfErrors, $errors, 'old', 'Old Password is a required field');
-		} else {
-			if (!instaDisc_verifyUser($_SESSION['username'], $_POST['old']))
-			{
-				addError($numOfErrors, $errors, 'old', 'Old password is not correct');
-			}
-		}
-
-		if ($_POST['new'] == '')
-		{
-			addError($numOfErrors, $errors, 'new', 'New Password is a required field');
-		}
-
-		if ($_POST['confirm'] == '')
-		{
-			addError($numOfErrors, $errors, 'confirm', 'Confirm New Password is a required field');
-		}
-
-		if ($_POST['new'] != $_POST['confirm'])
-		{
-			addError($numOfErrors, $errors, 'confirm', 'Passwords do not match');
-		}
-
-		if ($numOfErrors > 0)
-		{
-			showForm($_POST['old'], $_POST['new'], $_POST['confirm'], $errors);
-		} else {
-			instaDisc_changePassword( $_POST['new']);
-
-			$template = new FITemplate('changedpassword');
-			$template->add('SITENAME', instaDisc_getConfig('siteName'));
-			$template->display();
-		}
-	}
-} else {
-	header('Location: index.php');
-}
-
-function showForm($old, $new, $confirm, $errors)
-{
-	$template = new FITemplate('changepassword');
-	$template->add('SITENAME', instaDisc_getConfig('siteName'));
-
-	if (isset($errors[1]))
-	{
-		$template->adds_block('ERROR', array('ex'=>'1'));
-
-		foreach ($errors as $name => $value)
-		{
-			$template->adds_block('ERRORS', array(	'NAME' => $name,
-								'MSG' => $value['msg']));
-		}
-	}
-
-	$template->add('OLD_ERR', ifErrors($errors, 'old'));
-	$template->add('NEW_ERR', ifErrors($errors, 'new'));
-	$template->add('CONFIRM_ERR', ifErrors($errors, 'confirm'));
-
-	doErrors($template, $errors, 'old');
-	doErrors($template, $errors, 'new');
-	doErrors($template, $errors, 'confirm');
-
-	$template->add('OLD', $old);
-	$template->add('NEW', $new);
-	$template->add('CONFIRM', $confirm);
-
-	$template->display();
-}
-
-function ifErrors($errors, $id)
-{
-        foreach ($errors as $name => $value)
-        {
-                if ($value['field'] == $id)
-                {
-                        return ' error';
-                }
-        }
-
-	return '';
-}
-
-function doErrors($template, $errors, $id)
-{
-        foreach ($errors as $name => $value)
-        {
-                if ($value['field'] == $id)
-                {
-			$template->adds_block(strtoupper($id) . '_ERRS', array(	'NAME' => $name,
-										'VALUE' => $value['msg']));
-                }
-        }
-}
-
-function addError(&$numOfErrors, &$errors, $field, $msg)
-{
-        $numOfErrors++;
-        $errors[$numOfErrors] = array('field' => $field, 'msg' => $msg);
-}
-
-?>
diff --git a/series/core/trunk/admin/login.php b/series/core/trunk/admin/login.php
deleted file mode 100644
index fe394a1..0000000
--- a/series/core/trunk/admin/login.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/* InstaDisc Series - A Four Island Project */
-
-/** 
- * require_once() is used to ensure
- * the ACP files are being called by
- * admin.php instead of their actual
- * locations admin/.
- * The _once() part ensures no problem
- * arises as includes/instadisc.php has
- * already been included from admin.php
- */
-require_once('includes/instadisc.php');
-
-if (!isset($_GET['submit']))
-{
-	showForm('','',array());
-} else {
-	$numOfErrors = 0;
-	$errors = array();
-
-	if (instaDisc_verifyUser($_POST['username'], $_POST['password']))
-	{
-		$_SESSION['username'] = $_POST['username'];
-
-		$template = new FITemplate('loggedin');
-		$template->add('SITENAME', instaDisc_getConfig('siteName'));
-		$template->display();
-	} else {
-		addError($numOfErrors, $errors, '', 'Account could not be found');
-		showForm($_POST['username'], $_POST['password'], $errors);
-	}
-}
-
-function showForm($username, $password, $errors)
-{
-	$template = new FITemplate('login');
-	$template->add('SITENAME', instaDisc_getConfig('siteName'));
-
-	if (isset($errors[1]))
-	{
-		$template->adds_block('ERROR', array('ex'=>'1'));
-
-		foreach ($errors as $name => $value)
-		{
-			$template->adds_block('ERRORS', array(	'NAME' => $name,
-								'MSG' => $value['msg']));
-		}
-	}
-
-	$template->add('USERNAME_ERR', ifErrors($errors, 'username'));
-	$template->add('PASSWORD_ERR', ifErrors($errors, 'password'));
-
-	doErrors($template, $errors, 'username');
-	doErrors($template, $errors, 'password');
-
-	$template->add('USERNAME', $username);
-	$template->add('PASSWORD', $password);
-
-	$template->display();
-}
-
-function ifErrors($errors, $id)
-{
-        foreach ($errors as $name => $value)
-        {
-                if ($value['field'] == $id)
-                {
-                        return ' error';
-                }
-        }
-
-	return '';
-}
-
-function doErrors($template, $errors, $id)
-{
-        foreach ($errors as $name => $value)
-        {
-                if ($value['field'] == $id)
-                {
-			$template->adds_block(strtoupper($id) . '_ERRS', array(	'NAME' => $name,
-										'VALUE' => $value['msg']));
-                }
-        }
-}
-
-function addError(&$numOfErrors, &$errors, $field, $msg)
-{
-        $numOfErrors++;
-        $errors[$numOfErrors] = array('field' => $field, 'msg' => $msg);
-}
-
-?>
diff --git a/series/core/trunk/admin/logout.php b/series/core/trunk/admin/logout.php
deleted file mode 100644
index 779a1d2..0000000
--- a/series/core/trunk/admin/logout.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/* InstaDisc Series - A Four Island Project */
-
-/**
- * require_once() is used to ensure
- * the ACP files are being called by
- * admin.php instead of their actual
- * locations admin/.
- * The _once() part ensures no problem
- * arises as includes/instadisc.php has
- * already been included from admin.php
- */
-require_once('includes/instadisc.php');
-
-if (!isset($_SESSION['username']))
-{
-	header('Location: index.php');
-	exit;
-}
-
-unset($_SESSION['username']);
-
-header('Location: index.php');
-
-?>
diff --git a/series/core/trunk/admin/main.php b/series/core/trunk/admin/main.php
deleted file mode 100644
index eb0e35b..0000000
--- a/series/core/trunk/admin/main.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/* InstaDisc Series - A Four Island Project */
-
-/** 
- * require_once() is used to ensure
- * the ACP files are being called by
- * admin.php instead of their actual
- * locations admin/.
- * The _once() part ensures no problem
- * arises as includes/instadisc.php has
- * already been included from admin.php
- */
-require_once('includes/instadisc.php');
-
-if (!isset($_SESSION['username']))
-{
-	header('Location: index.php');
-}
-
-$template = new FITemplate('main');
-$template->add('SITENAME',instaDisc_getConfig('siteName'));
-$template->display();
-
-?>
-- 
cgit 1.4.1