diff --git a/app/conference_controls/app_languages.php b/app/conference_controls/app_languages.php index e02386edfc..ad6af038e4 100644 --- a/app/conference_controls/app_languages.php +++ b/app/conference_controls/app_languages.php @@ -181,246 +181,6 @@ $text['description-control_description']['ru-ru'] = ""; $text['description-control_description']['sv-se'] = "Ange beskrivningen."; $text['description-control_description']['uk-ua'] = ""; -$text['label-true']['en-us'] = "true"; -$text['label-true']['ar-eg'] = ""; -$text['label-true']['de-at'] = "ein"; //copied from de-de -$text['label-true']['de-ch'] = "ein"; //copied from de-de -$text['label-true']['de-de'] = "ein"; -$text['label-true']['es-cl'] = ""; -$text['label-true']['es-mx'] = ""; -$text['label-true']['fr-ca'] = "Oui"; -$text['label-true']['fr-fr'] = "Oui"; -$text['label-true']['he-il'] = ""; -$text['label-true']['it-it'] = "Vero"; -$text['label-true']['nl-nl'] = "aan"; -$text['label-true']['pl-pl'] = ""; -$text['label-true']['pt-br'] = "Sim"; //copied from pt-pt -$text['label-true']['pt-pt'] = "Sim"; -$text['label-true']['ro-ro'] = ""; -$text['label-true']['ru-ru'] = ""; -$text['label-true']['sv-se'] = "sann"; -$text['label-true']['uk-ua'] = ""; - -$text['label-false']['en-us'] = "false"; -$text['label-false']['ar-eg'] = ""; -$text['label-false']['de-at'] = "aus"; //copied from de-de -$text['label-false']['de-ch'] = "aus"; //copied from de-de -$text['label-false']['de-de'] = "aus"; -$text['label-false']['es-cl'] = "falso"; -$text['label-false']['es-mx'] = "falso"; //copied from es-cl -$text['label-false']['fr-ca'] = "Non"; //copied from fr-fr -$text['label-false']['fr-fr'] = "Non"; -$text['label-false']['he-il'] = ""; -$text['label-false']['it-it'] = "Falso"; -$text['label-false']['nl-nl'] = "uit"; -$text['label-false']['pl-pl'] = ""; -$text['label-false']['pt-br'] = "Não"; -$text['label-false']['pt-pt'] = "falso"; -$text['label-false']['ro-ro'] = ""; -$text['label-false']['ru-ru'] = ""; -$text['label-false']['sv-se'] = "falsk"; -$text['label-false']['uk-ua'] = ""; - -$text['button-add']['en-us'] = "Add"; -$text['button-add']['ar-eg'] = ""; -$text['button-add']['de-at'] = "Hinzufügen"; //copied from de-de -$text['button-add']['de-ch'] = "Hinzufügen"; //copied from de-de -$text['button-add']['de-de'] = "Hinzufügen"; -$text['button-add']['es-cl'] = ""; -$text['button-add']['es-mx'] = ""; -$text['button-add']['fr-ca'] = "Ajouter"; -$text['button-add']['fr-fr'] = "Ajouter"; -$text['button-add']['he-il'] = ""; -$text['button-add']['it-it'] = "Inserisci"; -$text['button-add']['nl-nl'] = "Toevoegen"; -$text['button-add']['pl-pl'] = ""; -$text['button-add']['pt-br'] = "Adicionar"; //copied from pt-pt -$text['button-add']['pt-pt'] = "Adicionar"; -$text['button-add']['ro-ro'] = ""; -$text['button-add']['ru-ru'] = ""; -$text['button-add']['sv-se'] = "Lägg Till"; -$text['button-add']['uk-ua'] = ""; - -$text['button-edit']['en-us'] = "Edit"; -$text['button-edit']['ar-eg'] = ""; -$text['button-edit']['de-at'] = "Bearbeiten"; //copied from de-de -$text['button-edit']['de-ch'] = "Bearbeiten"; //copied from de-de -$text['button-edit']['de-de'] = "Bearbeiten"; -$text['button-edit']['es-cl'] = ""; -$text['button-edit']['es-mx'] = ""; -$text['button-edit']['fr-ca'] = "Modifier"; -$text['button-edit']['fr-fr'] = "Modifier"; -$text['button-edit']['he-il'] = ""; -$text['button-edit']['it-it'] = "Modifica"; -$text['button-edit']['nl-nl'] = "Bewerken"; -$text['button-edit']['pl-pl'] = ""; -$text['button-edit']['pt-br'] = "Editar"; //copied from pt-pt -$text['button-edit']['pt-pt'] = "Editar"; -$text['button-edit']['ro-ro'] = ""; -$text['button-edit']['ru-ru'] = ""; -$text['button-edit']['sv-se'] = "Ändra"; -$text['button-edit']['uk-ua'] = ""; - -$text['button-delete']['en-us'] = "Delete"; -$text['button-delete']['ar-eg'] = ""; -$text['button-delete']['de-at'] = "Löschen"; //copied from de-de -$text['button-delete']['de-ch'] = "Löschen"; //copied from de-de -$text['button-delete']['de-de'] = "Löschen"; -$text['button-delete']['es-cl'] = ""; -$text['button-delete']['es-mx'] = ""; -$text['button-delete']['fr-ca'] = "Supprimer"; -$text['button-delete']['fr-fr'] = "Supprimer"; -$text['button-delete']['he-il'] = ""; -$text['button-delete']['it-it'] = "Cancella"; -$text['button-delete']['nl-nl'] = "Verwijderen"; -$text['button-delete']['pl-pl'] = ""; -$text['button-delete']['pt-br'] = "Deletar"; //copied from pt-pt -$text['button-delete']['pt-pt'] = "Deletar"; -$text['button-delete']['ro-ro'] = ""; -$text['button-delete']['ru-ru'] = ""; -$text['button-delete']['sv-se'] = "Ta Bort"; -$text['button-delete']['uk-ua'] = ""; - -$text['button-save']['en-us'] = "Save"; -$text['button-save']['ar-eg'] = ""; -$text['button-save']['de-at'] = "Speichern"; //copied from de-de -$text['button-save']['de-ch'] = "Speichern"; //copied from de-de -$text['button-save']['de-de'] = "Speichern"; -$text['button-save']['es-cl'] = ""; -$text['button-save']['es-mx'] = ""; -$text['button-save']['fr-ca'] = "Enregistrer"; -$text['button-save']['fr-fr'] = "Enregistrer"; -$text['button-save']['he-il'] = ""; -$text['button-save']['it-it'] = "Salva"; -$text['button-save']['nl-nl'] = "Opslaan"; -$text['button-save']['pl-pl'] = ""; -$text['button-save']['pt-br'] = "Salvar"; -$text['button-save']['pt-pt'] = "Guardar"; -$text['button-save']['ro-ro'] = ""; -$text['button-save']['ru-ru'] = ""; -$text['button-save']['sv-se'] = "Spara"; -$text['button-save']['uk-ua'] = ""; - -$text['button-view']['en-us'] = "View"; -$text['button-view']['ar-eg'] = ""; -$text['button-view']['de-at'] = "Anzeigen"; //copied from de-de -$text['button-view']['de-ch'] = "Anzeigen"; //copied from de-de -$text['button-view']['de-de'] = "Anzeigen"; -$text['button-view']['es-cl'] = ""; -$text['button-view']['es-mx'] = ""; -$text['button-view']['fr-ca'] = "Vue"; -$text['button-view']['fr-fr'] = "Vue"; -$text['button-view']['he-il'] = ""; -$text['button-view']['it-it'] = "Mostra"; -$text['button-view']['nl-nl'] = "Bekijken"; -$text['button-view']['pl-pl'] = ""; -$text['button-view']['pt-br'] = "Visualizar"; //copied from pt-pt -$text['button-view']['pt-pt'] = "Visualizar"; -$text['button-view']['ro-ro'] = ""; -$text['button-view']['ru-ru'] = ""; -$text['button-view']['sv-se'] = "Läs"; -$text['button-view']['uk-ua'] = ""; - -$text['button-back']['en-us'] = "Back"; -$text['button-back']['ar-eg'] = ""; -$text['button-back']['de-at'] = "Zurück"; //copied from de-de -$text['button-back']['de-ch'] = "Zurück"; //copied from de-de -$text['button-back']['de-de'] = "Zurück"; -$text['button-back']['es-cl'] = ""; -$text['button-back']['es-mx'] = ""; -$text['button-back']['fr-ca'] = "Retour"; -$text['button-back']['fr-fr'] = "Retour"; -$text['button-back']['he-il'] = ""; -$text['button-back']['it-it'] = "Indietro"; -$text['button-back']['nl-nl'] = "Terug"; -$text['button-back']['pl-pl'] = ""; -$text['button-back']['pt-br'] = "Voltar"; //copied from pt-pt -$text['button-back']['pt-pt'] = "Voltar"; -$text['button-back']['ro-ro'] = ""; -$text['button-back']['ru-ru'] = ""; -$text['button-back']['sv-se'] = "Tillbaka"; -$text['button-back']['uk-ua'] = ""; - -$text['confirm-delete']['en-us'] = "Do you really want to delete this?"; -$text['confirm-delete']['ar-eg'] = ""; -$text['confirm-delete']['de-at'] = "Wollen Sie das wirklich löschen?"; //copied from de-de -$text['confirm-delete']['de-ch'] = "Wollen Sie das wirklich löschen?"; //copied from de-de -$text['confirm-delete']['de-de'] = "Wollen Sie das wirklich löschen?"; -$text['confirm-delete']['es-cl'] = ""; -$text['confirm-delete']['es-mx'] = ""; -$text['confirm-delete']['fr-ca'] = "Voulez-vous vraiment supprimer ca"; -$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer ca"; -$text['confirm-delete']['he-il'] = ""; -$text['confirm-delete']['it-it'] = "Vuoi veramente cancellarlo?"; -$text['confirm-delete']['nl-nl'] = "Wil dit werkelijk verwijderen?"; -$text['confirm-delete']['pl-pl'] = ""; -$text['confirm-delete']['pt-br'] = "Você realmente deseja excluir?"; //copied from pt-pt -$text['confirm-delete']['pt-pt'] = "Você realmente deseja excluir?"; -$text['confirm-delete']['ro-ro'] = ""; -$text['confirm-delete']['ru-ru'] = ""; -$text['confirm-delete']['sv-se'] = "Vill du verkligen t abort detta?"; -$text['confirm-delete']['uk-ua'] = ""; - -$text['message-add']['en-us'] = "Add Completed"; -$text['message-add']['ar-eg'] = ""; -$text['message-add']['de-at'] = "Erfolgreich hinzugefügt"; //copied from de-de -$text['message-add']['de-ch'] = "Erfolgreich hinzugefügt"; //copied from de-de -$text['message-add']['de-de'] = "Erfolgreich hinzugefügt"; -$text['message-add']['es-cl'] = ""; -$text['message-add']['es-mx'] = ""; -$text['message-add']['fr-ca'] = "Ajouter terminé"; -$text['message-add']['fr-fr'] = "Ajouter terminé"; -$text['message-add']['he-il'] = ""; -$text['message-add']['it-it'] = "Inserimento Completato"; -$text['message-add']['nl-nl'] = "Toevoegen gereed"; -$text['message-add']['pl-pl'] = ""; -$text['message-add']['pt-br'] = "Adicionar concluído"; //copied from pt-pt -$text['message-add']['pt-pt'] = "Adicionar concluído"; -$text['message-add']['ro-ro'] = ""; -$text['message-add']['ru-ru'] = ""; -$text['message-add']['sv-se'] = "Tillagd"; -$text['message-add']['uk-ua'] = ""; - -$text['message-update']['en-us'] = "Update Completed"; -$text['message-update']['ar-eg'] = ""; -$text['message-update']['de-at'] = "Aktualisierung abgeschlossen"; //copied from de-de -$text['message-update']['de-ch'] = "Aktualisierung abgeschlossen"; //copied from de-de -$text['message-update']['de-de'] = "Aktualisierung abgeschlossen"; -$text['message-update']['es-cl'] = ""; -$text['message-update']['es-mx'] = ""; -$text['message-update']['fr-ca'] = "Mise à jour terminée"; -$text['message-update']['fr-fr'] = "Mise à jour terminée"; -$text['message-update']['he-il'] = ""; -$text['message-update']['it-it'] = "Aggiornamento Completato"; -$text['message-update']['nl-nl'] = "Bijwerken gereed"; -$text['message-update']['pl-pl'] = ""; -$text['message-update']['pt-br'] = "Atualização concluída"; //copied from pt-pt -$text['message-update']['pt-pt'] = "Atualização concluída"; -$text['message-update']['ro-ro'] = ""; -$text['message-update']['ru-ru'] = ""; -$text['message-update']['sv-se'] = "Ändring Utförd"; -$text['message-update']['uk-ua'] = ""; - -$text['message-delete']['en-us'] = "Delete Completed"; -$text['message-delete']['ar-eg'] = ""; -$text['message-delete']['de-at'] = "Erfolgreich gelöscht"; //copied from de-de -$text['message-delete']['de-ch'] = "Erfolgreich gelöscht"; //copied from de-de -$text['message-delete']['de-de'] = "Erfolgreich gelöscht"; -$text['message-delete']['es-cl'] = ""; -$text['message-delete']['es-mx'] = ""; -$text['message-delete']['fr-ca'] = "Supprimer terminé"; -$text['message-delete']['fr-fr'] = "Supprimer terminé"; -$text['message-delete']['he-il'] = ""; -$text['message-delete']['it-it'] = "Cancellazione Completata"; -$text['message-delete']['nl-nl'] = "Verwijderen gereed"; -$text['message-delete']['pl-pl'] = ""; -$text['message-delete']['pt-br'] = "Exclusão concluída"; //copied from pt-pt -$text['message-delete']['pt-pt'] = "Exclusão concluída"; -$text['message-delete']['ro-ro'] = ""; -$text['message-delete']['ru-ru'] = ""; -$text['message-delete']['sv-se'] = "Borttagen"; -$text['message-delete']['uk-ua'] = ""; - $text['message-required']['en-us'] = "Please provide: "; $text['message-required']['ar-eg'] = ""; $text['message-required']['de-at'] = "Bitte geben Sie folgendes an:"; //copied from de-de @@ -621,4 +381,4 @@ $text['description-control_data']['ru-ru'] = ""; $text['description-control_data']['sv-se'] = "Ange data."; $text['description-control_data']['uk-ua'] = ""; -?> +?> \ No newline at end of file diff --git a/app/conference_controls/conference_controls.php b/app/conference_controls/conference_controls.php index b3657a8b1e..5183cb932f 100644 --- a/app/conference_controls/conference_controls.php +++ b/app/conference_controls/conference_controls.php @@ -82,9 +82,9 @@ $order = $_GET["order"]; //add the search string - if (isset($_GET["search"])) { - $search = strtolower($_GET["search"]); - $sql_search = " ("; + $search = strtolower($_GET["search"]); + if (strlen($search) > 0) { + $sql_search = "where ("; $sql_search .= " lower(control_name) like :search "; $sql_search .= " or lower(control_description) like :search "; $sql_search .= ") "; @@ -93,9 +93,7 @@ //get the count $sql = "select count(conference_control_uuid) from v_conference_controls "; - if (isset($sql_search)) { - $sql .= "where ".$sql_search; - } + $sql .= $sql_search; $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); @@ -165,7 +163,7 @@ echo " \n"; } echo th_order_by('control_name', $text['label-control_name'], $order_by, $order); - echo th_order_by('control_enabled', $text['label-control_enabled'], $order_by, $order, null, "class='center'"); + echo th_order_by('control_enabled', $text['label-control_enabled'], $order_by, $order, null, "class='center shrink'"); echo "
\n"; if (permission_exists('conference_control_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') { echo "