From 54e1389a16adaacce59601d442c5ce91969bf5f9 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sat, 24 Nov 2012 02:25:59 +0000 Subject: [PATCH] Update the file names in extensions. --- app/extensions/app_config.php | 2 +- app/extensions/extension_copy.php | 5 ++--- app/extensions/extension_delete.php | 8 +++----- app/extensions/extension_edit.php | 14 +++++++------- app/extensions/extensions.php | 14 ++++++-------- 5 files changed, 19 insertions(+), 24 deletions(-) diff --git a/app/extensions/app_config.php b/app/extensions/app_config.php index 74a3947527..e1f6e5db1b 100644 --- a/app/extensions/app_config.php +++ b/app/extensions/app_config.php @@ -32,7 +32,7 @@ $apps[$x]['menu'][0]['uuid'] = 'd3036a99-9a9f-2ad6-a82a-1fe7bebbe2d3'; $apps[$x]['menu'][0]['parent_uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55'; $apps[$x]['menu'][0]['category'] = 'internal'; - $apps[$x]['menu'][0]['path'] = '/app/extensions/v_extensions.php'; + $apps[$x]['menu'][0]['path'] = '/app/extensions/extensions.php'; $apps[$x]['menu'][0]['groups'][] = 'admin'; $apps[$x]['menu'][0]['groups'][] = 'superadmin'; diff --git a/app/extensions/extension_copy.php b/app/extensions/extension_copy.php index 4799b78258..ba63fb2827 100644 --- a/app/extensions/extension_copy.php +++ b/app/extensions/extension_copy.php @@ -42,8 +42,7 @@ else { //get the v_extensions data $extension_uuid = $_GET["id"]; - $sql = ""; - $sql .= "select * from v_extensions "; + $sql = "select * from v_extensions "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "and extension_uuid = '$extension_uuid' "; $prep_statement = $db->prepare(check_sql($sql)); @@ -141,7 +140,7 @@ else { //redirect the user require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Copy Complete\n"; echo "
\n"; diff --git a/app/extensions/extension_delete.php b/app/extensions/extension_delete.php index ade6df7d8c..d95a5f814a 100644 --- a/app/extensions/extension_delete.php +++ b/app/extensions/extension_delete.php @@ -40,16 +40,14 @@ if (count($_GET)>0) { //delete the extension if (strlen($id)>0) { - $sql = ""; - $sql .= "delete from v_extensions "; + $sql = "delete from v_extensions "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "and extension_uuid = '$id' "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); unset($prep_statement, $sql); - $sql = ""; - $sql .= "delete from v_extension_users "; + $sql = "delete from v_extension_users "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "and extension_uuid = '$id' "; $prep_statement = $db->prepare(check_sql($sql)); @@ -62,7 +60,7 @@ if (count($_GET)>0) { //redirect the user require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "
\n"; echo " \n"; diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index d1699d9862..b5b2e6baf1 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -114,7 +114,7 @@ else { $db->exec(check_sql($sql)); //redirect the browser require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
Delete Complete
"; require_once "includes/footer.php"; return; @@ -143,7 +143,7 @@ else { $db->exec($sql_insert); //redirect the browser require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
Add Complete
"; require_once "includes/footer.php"; return; @@ -368,7 +368,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; if (count($generated_users) == 0) { //action add - echo "\n"; + echo "\n"; echo "
\n"; echo " \n"; echo " \n"; @@ -486,7 +486,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //show the action and redirect the user require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "
\n"; @@ -605,8 +605,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { } echo "
\n"; echo "\n"; @@ -708,7 +708,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " \n"; echo " \n"; echo " \n"; } diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php index 582cbcfc95..4c9b5fa73a 100644 --- a/app/extensions/extensions.php +++ b/app/extensions/extensions.php @@ -60,8 +60,7 @@ require_once "includes/paging.php"; echo "
"; //get the number of rows in v_extensions - $sql = ""; - $sql .= " select count(*) as num_rows from v_extensions "; + $sql = "select count(*) as num_rows from v_extensions "; $sql .= "where domain_uuid = '$domain_uuid' "; $prep_statement = $db->prepare(check_sql($sql)); if ($prep_statement) { @@ -85,8 +84,7 @@ require_once "includes/paging.php"; $offset = $rows_per_page * $_GET['page']; //get the extension list - $sql = ""; - $sql .= " select * from v_extensions "; + $sql = "select * from v_extensions "; $sql .= "where domain_uuid = '$domain_uuid' "; if (isset($order_by)) { $sql .= "order by $order_by $order "; @@ -115,7 +113,7 @@ require_once "includes/paging.php"; echo th_order_by('description', 'Description', $order_by, $order); echo "\n"; echo "\n"; @@ -130,10 +128,10 @@ require_once "includes/paging.php"; echo " \n"; echo " \n"; echo "\n"; @@ -150,7 +148,7 @@ require_once "includes/paging.php"; echo " \n"; echo " \n"; echo " \n";
Message\n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo "

\n"; echo "
".$field['username']."\n"; - echo " $v_link_label_delete\n"; + echo " $v_link_label_delete\n"; echo "
\n"; if (permission_exists('extension_add')) { - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; } echo "
".$row['description']." \n"; if (permission_exists('extension_edit')) { - echo " $v_link_label_edit\n"; + echo " $v_link_label_edit\n"; } if (permission_exists('extension_delete')) { - echo " $v_link_label_delete\n"; + echo " $v_link_label_delete\n"; } echo "
$paging_controls\n"; if (permission_exists('extension_add')) { - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; } echo "