From dff1d2cf46f1f8d437a50b30ddf92486bf180674 Mon Sep 17 00:00:00 2001 From: Paul Arthur Date: Fri, 25 Jan 2013 21:49:47 -0500 Subject: Rename shoutBox to Shoutbox --- admin/shout.php | 8 ++++---- lib/class/catalog.class.php | 2 +- lib/class/shoutbox.class.php | 4 ++-- shout.php | 4 ++-- templates/show_index.inc.php | 2 +- templates/show_manage_shoutbox.inc.php | 4 ++-- templates/show_shoutbox.inc.php | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/admin/shout.php b/admin/shout.php index d74e4205..8d4b78c0 100644 --- a/admin/shout.php +++ b/admin/shout.php @@ -33,19 +33,19 @@ show_header(); switch ($_REQUEST['action']) { case 'edit_shout': $shout_id = $_POST['shout_id']; - $update = shoutBox::update($_POST); + $update = Shoutbox::update($_POST); show_confirmation(T_('Shoutbox Post Updated'),'',Config::get('web_path').'/admin/shout.php'); break; case 'show_edit': - $shout = new shoutBox($_REQUEST['shout_id']); - $object = shoutBox::get_object($shout->object_type,$shout->object_id); + $shout = new Shoutbox($_REQUEST['shout_id']); + $object = Shoutbox::get_object($shout->object_type,$shout->object_id); $object->format(); $client = new User($shout->user); $client->format(); require_once Config::get('prefix') . '/templates/show_edit_shout.inc.php'; break; case 'delete': - $shout_id = shoutBox::delete($_REQUEST['shout_id']); + $shout_id = Shoutbox::delete($_REQUEST['shout_id']); show_confirmation(T_('Shoutbox Post Deleted'),'',Config::get('web_path').'/admin/shout.php'); break; default: diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index 06d76e6f..4c0d6281 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -1518,7 +1518,7 @@ class Catalog extends database_object { Rating::gc(); Playlist::gc(); Tmp_Playlist::gc(); - shoutBox::gc(); + Shoutbox::gc(); Tag::gc(); debug_event('catalog', 'Database cleanup ended', 5, 'ampache-catalog'); diff --git a/lib/class/shoutbox.class.php b/lib/class/shoutbox.class.php index 3cface18..42adec08 100644 --- a/lib/class/shoutbox.class.php +++ b/lib/class/shoutbox.class.php @@ -20,7 +20,7 @@ * */ -class shoutBox { +class Shoutbox { public $id; @@ -228,5 +228,5 @@ class shoutBox { } // delete -} // shoutBox class +} // Shoutbox class ?> diff --git a/shout.php b/shout.php index 77ff3396..170ae6e4 100644 --- a/shout.php +++ b/shout.php @@ -38,12 +38,12 @@ switch ($_REQUEST['action']) { exit; } - $shout_id = shoutBox::create($_POST); + $shout_id = Shoutbox::create($_POST); header("Location:" . Config::get('web_path')); break; case 'show_add_shout': // Get our object first - $object = shoutBox::get_object($_REQUEST['type'],$_REQUEST['id']); + $object = Shoutbox::get_object($_REQUEST['type'],$_REQUEST['id']); if (!$object->id) { Error::add('general', T_('Invalid Object Selected')); diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php index c0aabb32..0eba867b 100644 --- a/templates/show_index.inc.php +++ b/templates/show_index.inc.php @@ -44,7 +44,7 @@ if (Art::is_enabled()) {
format(); - $object = shoutBox::get_object($shout->object_type,$shout->object_id); + $object = Shoutbox::get_object($shout->object_type,$shout->object_id); $object->format(); $client = new User($shout->user); $client->format(); diff --git a/templates/show_shoutbox.inc.php b/templates/show_shoutbox.inc.php index 5bb61a37..d46f07c1 100644 --- a/templates/show_shoutbox.inc.php +++ b/templates/show_shoutbox.inc.php @@ -24,8 +24,8 @@
object_type,$shout->object_id); + $shout = new Shoutbox($shout_id); + $object = Shoutbox::get_object($shout->object_type,$shout->object_id); $object->format(); $client = new User($shout->user); $client->format(); -- cgit