diff --git a/app/conference_controls/conference_control_detail_edit.php b/app/conference_controls/conference_control_detail_edit.php index a19967c391..d2a6e408cc 100644 --- a/app/conference_controls/conference_control_detail_edit.php +++ b/app/conference_controls/conference_control_detail_edit.php @@ -132,6 +132,7 @@ $token = $object->create($_SERVER['PHP_SELF']); //show the header + $document['title'] = $text['title-conference_control_detail']; require_once "resources/header.php"; //show the content @@ -141,7 +142,7 @@ echo "
".$text['title-conference_control_detail']."
\n"; echo "
\n"; echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'conference_control_edit.php?id='.urlencode($conference_control_uuid)]); - echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'collapse'=>'hide-xs','name'=>'action','value'=>'save']); + echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'collapse'=>'hide-xs']); echo "
\n"; echo "
\n"; echo "\n"; diff --git a/app/conference_controls/conference_control_details.php b/app/conference_controls/conference_control_details.php index 016f2b76c1..28e1fb5b48 100644 --- a/app/conference_controls/conference_control_details.php +++ b/app/conference_controls/conference_control_details.php @@ -160,7 +160,7 @@ if (is_array($result) && @sizeof($result) != 0) { $x = 0; - foreach($result as $row) { + foreach ($result as $row) { if (permission_exists('conference_control_detail_edit')) { $list_row_url = 'conference_control_detail_edit.php?conference_control_uuid='.urlencode($row['conference_control_uuid']).'&id='.urlencode($row['conference_control_detail_uuid']); } diff --git a/app/conference_controls/resources/classes/conference_controls.php b/app/conference_controls/resources/classes/conference_controls.php index 8ab7b28c53..f2622b4b07 100644 --- a/app/conference_controls/resources/classes/conference_controls.php +++ b/app/conference_controls/resources/classes/conference_controls.php @@ -55,11 +55,9 @@ if (!class_exists('conference_controls')) { * called when the object is created */ public function __construct() { - //assign the variables $this->app_name = 'conference_controls'; $this->app_uuid = 'e1ad84a2-79e1-450c-a5b1-7507a043e048'; - } /** @@ -198,7 +196,6 @@ if (!class_exists('conference_controls')) { $this->table = 'conference_controls'; $this->toggle_field = 'control_enabled'; $this->toggle_values = ['true','false']; - $this->description_field = 'control_description'; $this->location = 'conference_controls.php'; if (permission_exists($this->name.'_edit')) { @@ -343,6 +340,13 @@ if (!class_exists('conference_controls')) { * copy rows from the database */ public function copy($records) { + + //assign the variables + $this->name = 'conference_control'; + $this->table = 'conference_controls'; + $this->description_field = 'control_description'; + $this->location = 'conference_controls.php'; + if (permission_exists($this->name.'_add')) { //add multi-lingual support