summaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2013-01-26 00:57:06 -0500
committerPaul Arthur <paul.arthur@flowerysong.com>2013-01-26 00:57:40 -0500
commit42133f38d223a2b3b81d309f2d1a983ef2012485 (patch)
treea9a01095cbb54474e83f8ec220a15991542819e1 /admin
parent5f02e4f43cb1423653c156e612da53e4c5938583 (diff)
downloadampache-42133f38d223a2b3b81d309f2d1a983ef2012485.tar.gz
ampache-42133f38d223a2b3b81d309f2d1a983ef2012485.tar.bz2
ampache-42133f38d223a2b3b81d309f2d1a983ef2012485.zip
Move access_denied() from lib/ui.lib.php to UI
Diffstat (limited to 'admin')
-rw-r--r--admin/access.php8
-rw-r--r--admin/catalog.php14
-rw-r--r--admin/duplicates.php2
-rw-r--r--admin/export.php2
-rw-r--r--admin/flag.php2
-rw-r--r--admin/index.php2
-rw-r--r--admin/mail.php4
-rw-r--r--admin/modules.php2
-rw-r--r--admin/shout.php2
-rw-r--r--admin/system.php2
-rw-r--r--admin/users.php8
11 files changed, 24 insertions, 24 deletions
diff --git a/admin/access.php b/admin/access.php
index 8c37d35d..a39d3691 100644
--- a/admin/access.php
+++ b/admin/access.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!Access::check('interface','100')) {
- access_denied();
+ UI::access_denied();
exit();
}
@@ -32,7 +32,7 @@ show_header();
switch ($_REQUEST['action']) {
case 'delete_record':
if (!Core::form_verify('delete_access')) {
- access_denied();
+ UI::access_denied();
exit;
}
Access::delete($_REQUEST['access_id']);
@@ -49,7 +49,7 @@ switch ($_REQUEST['action']) {
// Make sure we've got a valid form submission
if (!Core::form_verify('add_acl','post')) {
- access_denied();
+ UI::access_denied();
exit;
}
@@ -78,7 +78,7 @@ switch ($_REQUEST['action']) {
break;
case 'update_record':
if (!Core::form_verify('edit_acl')) {
- access_denied();
+ UI::access_denied();
exit;
}
$access = new Access($_REQUEST['access_id']);
diff --git a/admin/catalog.php b/admin/catalog.php
index 1df1b0e7..ba2c63aa 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!Access::check('interface','100')) {
- access_denied();
+ UI::access_denied();
exit;
}
@@ -80,7 +80,7 @@ switch ($_REQUEST['action']) {
toggle_visible('ajax-loading');
ob_end_flush();
/* Make sure they aren't in demo mode */
- if (Config::get('demo_mode')) { access_denied(); break; }
+ if (Config::get('demo_mode')) { UI::access_denied(); break; }
if (!$_REQUEST['catalogs']) {
$_REQUEST['catalogs'] = Catalog::get_catalog_ids();
@@ -107,7 +107,7 @@ switch ($_REQUEST['action']) {
if (Config::get('demo_mode')) { break; }
if (!Core::form_verify('delete_catalog')) {
- access_denied();
+ UI::access_denied();
exit;
}
@@ -212,7 +212,7 @@ switch ($_REQUEST['action']) {
}
if (!Core::form_verify('add_catalog','post')) {
- access_denied();
+ UI::access_denied();
exit;
}
@@ -250,7 +250,7 @@ switch ($_REQUEST['action']) {
}
break;
case 'clear_stats':
- if (Config::get('demo_mode')) { access_denied(); break; }
+ if (Config::get('demo_mode')) { UI::access_denied(); break; }
Stats::clear();
$url = Config::get('web_path') . '/admin/catalog.php';
$title = T_('Catalog statistics cleared');
@@ -265,7 +265,7 @@ switch ($_REQUEST['action']) {
require Config::get('prefix') . '/templates/show_add_catalog.inc.php';
break;
case 'clear_now_playing':
- if (Config::get('demo_mode')) { access_denied(); break; }
+ if (Config::get('demo_mode')) { UI::access_denied(); break; }
Stream::clear_now_playing();
show_confirmation(T_('Now Playing Cleared'), T_('All now playing data has been cleared'),Config::get('web_path') . '/admin/catalog.php');
break;
@@ -283,7 +283,7 @@ switch ($_REQUEST['action']) {
break;
case 'show_delete_catalog':
/* Stop the demo hippies */
- if (Config::get('demo_mode')) { access_denied(); break; }
+ if (Config::get('demo_mode')) { UI::access_denied(); break; }
$catalog = new Catalog($_REQUEST['catalog_id']);
$nexturl = Config::get('web_path') . '/admin/catalog.php?action=delete_catalog&amp;catalog_id=' . scrub_out($_REQUEST['catalog_id']);
diff --git a/admin/duplicates.php b/admin/duplicates.php
index 4eb6ebb2..f6100240 100644
--- a/admin/duplicates.php
+++ b/admin/duplicates.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!Access::check('interface','100')) {
- access_denied();
+ UI::access_denied();
exit;
}
diff --git a/admin/export.php b/admin/export.php
index 81c0fc04..972d9211 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!Access::check('interface','100')) {
- access_denied();
+ UI::access_denied();
exit;
}
diff --git a/admin/flag.php b/admin/flag.php
index 9f3d0c28..f7c8adf8 100644
--- a/admin/flag.php
+++ b/admin/flag.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!Access::check('interface','100')) {
- access_denied();
+ UI::access_denied();
exit();
}
diff --git a/admin/index.php b/admin/index.php
index 501d6663..7bd5ea6d 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!Access::check('interface',100)) {
- access_denied();
+ UI::access_denied();
exit();
}
diff --git a/admin/mail.php b/admin/mail.php
index ca974ff2..3db8f48c 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!Access::check('interface','75')) {
- access_denied();
+ UI::access_denied();
exit();
}
@@ -33,7 +33,7 @@ show_header();
switch ($_REQUEST['action']) {
case 'send_mail':
if (Config::get('demo_mode')) {
- access_denied();
+ UI::access_denied();
exit;
}
diff --git a/admin/modules.php b/admin/modules.php
index 168339e6..e7c56b10 100644
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!$GLOBALS['user']->has_access(100)) {
- access_denied();
+ UI::access_denied();
exit();
}
diff --git a/admin/shout.php b/admin/shout.php
index 8d4b78c0..2a5bba04 100644
--- a/admin/shout.php
+++ b/admin/shout.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!Access::check('interface','100')) {
- access_denied();
+ UI::access_denied();
exit;
}
diff --git a/admin/system.php b/admin/system.php
index 76ad6836..7f7fe9de 100644
--- a/admin/system.php
+++ b/admin/system.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!Access::check('interface',100) OR Config::get('demo_mode')) {
- access_denied();
+ UI::access_denied();
exit();
}
diff --git a/admin/users.php b/admin/users.php
index 210eab8c..50d7b20d 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -23,7 +23,7 @@
require_once '../lib/init.php';
if (!Access::check('interface','100')) {
- access_denied();
+ UI::access_denied();
exit();
}
@@ -35,7 +35,7 @@ switch ($_REQUEST['action']) {
if (Config::get('demo_mode')) { break; }
if (!Core::form_verify('edit_user','post')) {
- access_denied();
+ UI::access_denied();
exit;
}
@@ -87,7 +87,7 @@ switch ($_REQUEST['action']) {
if (Config::get('demo_mode')) { break; }
if (!Core::form_verify('add_user','post')) {
- access_denied();
+ UI::access_denied();
exit;
}
@@ -152,7 +152,7 @@ switch ($_REQUEST['action']) {
case 'confirm_delete':
if (Config::get('demo_mode')) { break; }
if (!Core::form_verify('delete_user')) {
- access_denied();
+ UI::access_denied();
exit;
}
$client = new User($_REQUEST['user_id']);