From 0f1a2e7981b3506ee4671643822df523b12340bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu@seblu.net>
Date: Mon, 8 Mar 2010 12:25:37 +0000
Subject: [PATCH] merge admin directory and include

---
 admin/.htaccess                            |  2 --
 {admin => include}/admin_blacklist.php     |  0
 {admin => include}/admin_edito.php         |  0
 {admin => include}/admin_home.php          | 20 ++++++++++----------
 {admin => include}/admin_links.php         |  0
 {admin => include}/admin_members.php       |  0
 {admin => include}/admin_menu.php          |  0
 {admin => include}/admin_news.php          |  0
 {admin => include}/admin_tables.php        |  0
 {admin => include}/admin_users.php         |  0
 {admin => include}/admin_videos.php        |  0
 {admin => include}/file_browser.php        |  0
 {admin => include}/functions_sql_admin.php |  0
 index.php                                  |  2 +-
 14 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 admin/.htaccess
 rename {admin => include}/admin_blacklist.php (100%)
 rename {admin => include}/admin_edito.php (100%)
 rename {admin => include}/admin_home.php (94%)
 rename {admin => include}/admin_links.php (100%)
 rename {admin => include}/admin_members.php (100%)
 rename {admin => include}/admin_menu.php (100%)
 rename {admin => include}/admin_news.php (100%)
 rename {admin => include}/admin_tables.php (100%)
 rename {admin => include}/admin_users.php (100%)
 rename {admin => include}/admin_videos.php (100%)
 rename {admin => include}/file_browser.php (100%)
 rename {admin => include}/functions_sql_admin.php (100%)

diff --git a/admin/.htaccess b/admin/.htaccess
deleted file mode 100644
index 471492e..0000000
--- a/admin/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-Order allow,deny
-deny from all
diff --git a/admin/admin_blacklist.php b/include/admin_blacklist.php
similarity index 100%
rename from admin/admin_blacklist.php
rename to include/admin_blacklist.php
diff --git a/admin/admin_edito.php b/include/admin_edito.php
similarity index 100%
rename from admin/admin_edito.php
rename to include/admin_edito.php
diff --git a/admin/admin_home.php b/include/admin_home.php
similarity index 94%
rename from admin/admin_home.php
rename to include/admin_home.php
index 5c78547..ae1d12b 100644
--- a/admin/admin_home.php
+++ b/include/admin_home.php
@@ -2,16 +2,16 @@
 
 function dispAdminHome() {
 
-include_once "admin/admin_tables.php";
-include_once "admin/functions_sql_admin.php";
-include_once "admin/admin_menu.php";
-include_once "admin/admin_videos.php";
-include_once "admin/admin_news.php";
-include_once "admin/admin_edito.php";
-include_once "admin/admin_links.php";
-include_once "admin/admin_members.php";
-include_once "admin/admin_users.php";
-include_once "admin/admin_blacklist.php";
+include_once "include/admin_tables.php";
+include_once "include/functions_sql_admin.php";
+include_once "include/admin_menu.php";
+include_once "include/admin_videos.php";
+include_once "include/admin_news.php";
+include_once "include/admin_edito.php";
+include_once "include/admin_links.php";
+include_once "include/admin_members.php";
+include_once "include/admin_users.php";
+include_once "include/admin_blacklist.php";
 
 if ($_SESSION["user_right"] >= $GLOBALS["REPORTER"] )
 {
diff --git a/admin/admin_links.php b/include/admin_links.php
similarity index 100%
rename from admin/admin_links.php
rename to include/admin_links.php
diff --git a/admin/admin_members.php b/include/admin_members.php
similarity index 100%
rename from admin/admin_members.php
rename to include/admin_members.php
diff --git a/admin/admin_menu.php b/include/admin_menu.php
similarity index 100%
rename from admin/admin_menu.php
rename to include/admin_menu.php
diff --git a/admin/admin_news.php b/include/admin_news.php
similarity index 100%
rename from admin/admin_news.php
rename to include/admin_news.php
diff --git a/admin/admin_tables.php b/include/admin_tables.php
similarity index 100%
rename from admin/admin_tables.php
rename to include/admin_tables.php
diff --git a/admin/admin_users.php b/include/admin_users.php
similarity index 100%
rename from admin/admin_users.php
rename to include/admin_users.php
diff --git a/admin/admin_videos.php b/include/admin_videos.php
similarity index 100%
rename from admin/admin_videos.php
rename to include/admin_videos.php
diff --git a/admin/file_browser.php b/include/file_browser.php
similarity index 100%
rename from admin/file_browser.php
rename to include/file_browser.php
diff --git a/admin/functions_sql_admin.php b/include/functions_sql_admin.php
similarity index 100%
rename from admin/functions_sql_admin.php
rename to include/functions_sql_admin.php
diff --git a/index.php b/index.php
index 8e706e2..1380e74 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,7 @@ include_once "include/videos.php";
 include_once "include/members.php";
 include_once "include/contacts.php";
 include_once "include/dailymotion.php";
-include_once "admin/admin_home.php";
+include_once "include/admin_home.php";
 
 // define user right and id if new session
 if (!$_SESSION["user_id"] or !$_SESSION["user_right"]) {
-- 
GitLab