summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/shout.php8
-rw-r--r--lib/class/catalog.class.php2
-rw-r--r--lib/class/shoutbox.class.php4
-rw-r--r--shout.php4
-rw-r--r--templates/show_index.inc.php2
-rw-r--r--templates/show_manage_shoutbox.inc.php4
-rw-r--r--templates/show_shoutbox.inc.php4
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()) {
<?php if (Config::get('sociable')) { ?>
<div id="shout_objects">
<?php
- $shouts = shoutBox::get_top('5');
+ $shouts = Shoutbox::get_top('5');
if (count($shouts)) {
require_once Config::get('prefix') . '/templates/show_shoutbox.inc.php';
}
diff --git a/templates/show_manage_shoutbox.inc.php b/templates/show_manage_shoutbox.inc.php
index bcb0a4fe..d0c96bce 100644
--- a/templates/show_manage_shoutbox.inc.php
+++ b/templates/show_manage_shoutbox.inc.php
@@ -41,9 +41,9 @@ $web_path = Config::get('web_path');
</tr>
<?php
foreach ($object_ids as $shout_id) {
- $shout = new shoutBox($shout_id);
+ $shout = new Shoutbox($shout_id);
$shout->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 @@
<div id="shoutbox">
<?php
foreach ($shouts as $shout_id) {
- $shout = new shoutBox($shout_id);
- $object = shoutBox::get_object($shout->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();