From 2b0396063adc20a561bec2f3ae8b7d3dd0586a3b Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sun, 15 Feb 2015 08:46:20 +0000 Subject: [PATCH] Code cleanup. --- app/contacts/contact_addresses.php | 2 - app/contacts/contact_emails.php | 2 - app/contacts/contact_extensions.php | 3 - app/contacts/contact_phones.php | 2 - app/content/rsslist.php | 14 +- app/content/rsssubcategoryadd.php | 10 - app/content/rsssubcategoryupdate.php | 16 +- app/content/rsssubsearch.php | 166 ++++------ app/content/rsssubupdate.php | 2 +- app/dialplan/dialplan_advanced.php | 2 - app/exec/exec.php | 4 +- app/ivr_menu/ivr_menu_options.php | 16 +- app/log_viewer/log_viewer.php | 5 - app/recordings/recordings.php | 27 +- app/schemas/schema_data_edit.php | 4 +- app/services/services.php | 17 +- app/sip_profiles/sip_profile_settings.php | 9 - app/sql_query/sql_query.php | 4 - app/vars/vars_textarea.php | 3 - .../voicemail_greetings.php | 16 +- app/xml_cdr/xml_cdr_details.php | 22 -- app/xml_cdr/xml_cdr_statistics.php | 1 - app/xmpp/errors.php | 5 +- app/xmpp/profile_list.php | 7 +- core/menu/menu_item_list.php | 303 +++++++++--------- core/users/index.php | 4 +- core/users/users.php | 14 - 27 files changed, 230 insertions(+), 450 deletions(-) diff --git a/app/contacts/contact_addresses.php b/app/contacts/contact_addresses.php index 010805b0b0..00c908f8a9 100644 --- a/app/contacts/contact_addresses.php +++ b/app/contacts/contact_addresses.php @@ -92,7 +92,6 @@ require_once "resources/paging.php"; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo "\n"; @@ -145,6 +144,5 @@ require_once "resources/paging.php"; echo "\n"; echo "
"; - echo "
"; ?> \ No newline at end of file diff --git a/app/contacts/contact_emails.php b/app/contacts/contact_emails.php index fe67364d3d..1f745889a8 100644 --- a/app/contacts/contact_emails.php +++ b/app/contacts/contact_emails.php @@ -91,7 +91,6 @@ require_once "resources/paging.php"; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo "\n"; @@ -135,6 +134,5 @@ require_once "resources/paging.php"; echo "\n"; echo "
"; - echo "
"; ?> \ No newline at end of file diff --git a/app/contacts/contact_extensions.php b/app/contacts/contact_extensions.php index aa1d0ba3cf..e8fc84df71 100644 --- a/app/contacts/contact_extensions.php +++ b/app/contacts/contact_extensions.php @@ -114,7 +114,6 @@ require_once "resources/paging.php"; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -169,8 +168,6 @@ require_once "resources/paging.php"; echo "
".$text['label-extension']."
\n"; echo "\n"; echo "\n"; - echo ""; - echo "
"; ?> diff --git a/app/contacts/contact_phones.php b/app/contacts/contact_phones.php index d1b7598f38..f0ff10af0a 100644 --- a/app/contacts/contact_phones.php +++ b/app/contacts/contact_phones.php @@ -107,7 +107,6 @@ require_once "resources/paging.php"; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -171,6 +170,5 @@ require_once "resources/paging.php"; echo "\n"; echo "
".$text['label-phone_label']."
"; - echo "
"; ?> \ No newline at end of file diff --git a/app/content/rsslist.php b/app/content/rsslist.php index 24eef26ed7..7a3acdd31b 100644 --- a/app/content/rsslist.php +++ b/app/content/rsslist.php @@ -47,11 +47,6 @@ $order_by = $_GET["order_by"]; $order = $_GET["order"]; - echo "
"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "\n"; - echo "
\n"; - echo ""; echo ""; echo "\n"; - echo "\n"; - echo "
"; @@ -87,7 +82,6 @@ $order = $_GET["order"]; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo ""; echo th_order_by('rss_title', $text['label-title'], $order_by, $order); @@ -179,17 +173,11 @@ $order = $_GET["order"]; echo "\n"; echo "\n"; echo "
\n"; - echo "
\n"; + echo "

"; - echo "
"; - echo "
\n"; //echo "   \n"; //echo "   \n"; - echo ""; - echo "

"; require_once "resources/footer.php"; unset ($result_count); diff --git a/app/content/rsssubcategoryadd.php b/app/content/rsssubcategoryadd.php index 1af0035856..a2ec4dcdf1 100644 --- a/app/content/rsssubcategoryadd.php +++ b/app/content/rsssubcategoryadd.php @@ -77,11 +77,6 @@ if (count($_POST)>0) { } require_once "resources/header.php"; -echo "
"; -echo "\n"; -echo "\n"; -echo " "; -echo " "; -echo "
\n"; -echo "
"; echo "
"; echo ""; @@ -111,10 +106,5 @@ echo " "; echo "
"; echo "
"; -echo "
"; -echo "
"; - require_once "resources/footer.php"; ?> \ No newline at end of file diff --git a/app/content/rsssubcategoryupdate.php b/app/content/rsssubcategoryupdate.php index 18f2069b08..af84204dfc 100644 --- a/app/content/rsssubcategoryupdate.php +++ b/app/content/rsssubcategoryupdate.php @@ -86,13 +86,6 @@ else { } require_once "resources/header.php"; -echo "
"; -echo "\n"; - -echo "\n"; -echo " "; -echo " "; -echo "
\n"; -echo "
"; - echo "
"; echo ""; @@ -119,18 +112,13 @@ echo " "; echo " "; echo " "; echo " "; echo "
"; echo " "; +echo "

"; echo " "; echo "
"; +echo "

"; echo "
"; - -echo "
"; -echo "
"; - - require_once "resources/footer.php"; ?> diff --git a/app/content/rsssubsearch.php b/app/content/rsssubsearch.php index 7598223f0a..4609eebff1 100644 --- a/app/content/rsssubsearch.php +++ b/app/content/rsssubsearch.php @@ -57,14 +57,6 @@ if (count($_POST)>0) { require_once "resources/header.php"; - echo "
"; - echo "\n"; - - echo "\n"; - echo " \n"; - echo "\n"; - } //end if results echo "
\n"; - echo "
"; - - $sql = ""; $sql .= "select * from v_rss_sub "; $sql .= "where "; @@ -114,9 +106,9 @@ if (count($_POST)>0) { $row_style["1"] = "background-color: #FFFFFF;"; echo "".$text['label-search']."
"; - echo "
\n"; + echo "\n"; - echo ""; + echo " "; if ($result_count == 0) { //no results echo ""; @@ -124,18 +116,18 @@ if (count($_POST)>0) { else { //received results echo ""; - echo ""; - echo ""; - echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; + echo ""; + echo ""; + echo ""; + //echo ""; + //echo ""; + //echo ""; + //echo ""; + //echo ""; + //echo ""; + //echo ""; + //echo ""; + //echo ""; echo ""; echo "\n"; @@ -155,26 +147,16 @@ if (count($_POST)>0) { //echo ""; //echo ""; echo ""; - echo "\n"; if ($c==0) { $c=1; } else { $c=0; } } //end foreach unset($sql, $result, $row_count); - echo "
 
    ".$text['label-sub-id']."        ".$text['label-id']."        ".$text['label-title']."        Link        rss_sub_description        rss_sub_optional_1        rss_sub_optional_2        rss_sub_optional_3        rss_sub_optional_4        rss_sub_optional_5        rss_sub_add_date        rss_sub_add_user        ".$text['label-sub-id']."        ".$text['label-id']."        ".$text['label-title']."        Link        rss_sub_description        rss_sub_optional_1        rss_sub_optional_2        rss_sub_optional_3        rss_sub_optional_4        rss_sub_optional_5        rss_sub_add_date        rss_sub_add_user   
".$row[rss_sub_add_date]."".$row[rss_sub_add_user]."
\n"; - echo "
\n"; - - - echo "

"; - echo "
\n"; - echo "
"; - echo "

"; + require_once "resources/footer.php"; unset ($result_count); @@ -183,82 +165,68 @@ if (count($_POST)>0) { unset ($val); unset ($c); - } - else { - - echo "\n"; require_once "resources/header.php"; - echo "
"; - echo "\n"; - - echo "\n"; - echo " "; - echo " "; - echo "
\n"; - echo "
"; +} +else { + require_once "resources/header.php"; echo "
"; echo ""; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; + //echo " "; echo " "; echo " "; echo " "; echo "
".$text['label-sub-id']."
".$text['label-id']."
".$text['label-sub-title']."
".$text['label-sub-link']."
".$text['label-sub-desc']."
rss_sub_optional_1
rss_sub_optional_2
rss_sub_optional_3
rss_sub_optional_4
rss_sub_optional_5
rss_sub_add_date
rss_sub_add_user
".$text['label-sub-id']."
".$text['label-id']."
".$text['label-sub-title']."
".$text['label-sub-link']."
".$text['label-sub-desc']."
rss_sub_optional_1
rss_sub_optional_2
rss_sub_optional_3
rss_sub_optional_4
rss_sub_optional_5
rss_sub_add_date
rss_sub_add_user
"; echo "
"; - - echo "
"; - echo "
"; - - -require_once "resources/footer.php"; + require_once "resources/footer.php"; } //end if not post ?> diff --git a/app/content/rsssubupdate.php b/app/content/rsssubupdate.php index 57830c83f3..1110f90233 100644 --- a/app/content/rsssubupdate.php +++ b/app/content/rsssubupdate.php @@ -65,7 +65,7 @@ if (count($_POST)>0 && $_POST["persistform"] == "0") { if (strlen($msg) > 0) { require_once "resources/persist_form.php"; require_once "resources/header.php"; - echo "
"; + echo "
"; echo ""; echo ""; echo "
"; diff --git a/app/dialplan/dialplan_advanced.php b/app/dialplan/dialplan_advanced.php index 5630bc8c3e..6411c5a24a 100644 --- a/app/dialplan/dialplan_advanced.php +++ b/app/dialplan/dialplan_advanced.php @@ -94,7 +94,6 @@ function sf() { document.forms[0].savetopath.focus(); } }); -
@@ -157,7 +156,6 @@ function sf() { document.forms[0].savetopath.focus(); }
-
"; //show the header - echo "
"; - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -196,7 +195,6 @@ else { echo ""; echo "
".$text['label-execute']."
"; - echo "
"; //show the footer require_once "resources/footer.php"; diff --git a/app/ivr_menu/ivr_menu_options.php b/app/ivr_menu/ivr_menu_options.php index 119310d6ee..962cd56593 100644 --- a/app/ivr_menu/ivr_menu_options.php +++ b/app/ivr_menu/ivr_menu_options.php @@ -44,13 +44,7 @@ else { } //begin content - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo ""; - echo "
\n"; - echo "
"; - - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -162,14 +156,6 @@ else { echo "\n"; echo "\n"; echo "
".$text['header-option_list']." 
"; - - echo "

"; - echo "

"; - - echo "
"; - echo "
"; echo "

"; ?> diff --git a/app/log_viewer/log_viewer.php b/app/log_viewer/log_viewer.php index 416c0394e9..115a2f1e9c 100644 --- a/app/log_viewer/log_viewer.php +++ b/app/log_viewer/log_viewer.php @@ -71,9 +71,6 @@ if (permission_exists('log_download')) { require_once "resources/header.php"; -echo "
\n"; -echo "
\n"; - echo "\n"; echo " \n"; echo " "; echo " \n"; echo "
\n"; @@ -281,8 +278,6 @@ if (permission_exists('log_view')) { echo "
\n"; -echo "
\n"; require_once "resources/footer.php"; - ?> diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index 73fa9e282f..ef722e350d 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -147,12 +147,6 @@ require_once "resources/check_auth.php"; require_once "resources/header.php"; //begin the content - echo "
"; - echo "\n"; - echo "\n"; - echo "
\n"; - echo "
"; - echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n"; @@ -161,10 +155,9 @@ require_once "resources/check_auth.php"; echo "
"; - echo "
\n"; - echo " \n"; + echo "
\n"; echo " \n"; echo " \n"; } echo " \n"; - echo "
\n"; echo "  "; @@ -180,7 +173,8 @@ require_once "resources/check_auth.php"; echo "


\n"; + echo "
"; + echo "

\n"; $sql = "select * from v_recordings "; $sql .= "where domain_uuid = '$domain_uuid' "; @@ -275,24 +269,15 @@ require_once "resources/check_auth.php"; } //end if results echo "
\n"; - echo " \n"; + echo "
\n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; - echo "
 $paging_controls"; echo "
\n"; - - echo "
"; - echo "
"; - - echo "
\n"; - echo "
\n"; - echo "
\n"; - echo "
\n"; + echo "\n"; + echo "

\n"; //include the footer require_once "resources/footer.php"; diff --git a/app/schemas/schema_data_edit.php b/app/schemas/schema_data_edit.php index 54ca34f493..737a3b0368 100644 --- a/app/schemas/schema_data_edit.php +++ b/app/schemas/schema_data_edit.php @@ -544,8 +544,7 @@ else { echo " \n"; echo "\n"; -//begin the div and table that will hold the html form - echo "
"; +//begin the table that will hold the html form echo "\n"; //determine if a file should be uploaded @@ -971,7 +970,6 @@ else { } } echo "
\n"; - echo "
\n"; require_once "resources/footer.php"; ?> diff --git a/app/services/services.php b/app/services/services.php index fa844c027f..1c777761ac 100644 --- a/app/services/services.php +++ b/app/services/services.php @@ -86,13 +86,7 @@ if (strlen($_GET["a"]) > 0) { } } - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo ""; - echo "
\n"; - echo "
"; - - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -131,7 +125,6 @@ if (strlen($_GET["a"]) > 0) { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "
Services 
\n"; echo "\n"; echo th_order_by('service_name', 'Name', $order_by, $order); @@ -227,14 +220,6 @@ if (strlen($_GET["a"]) > 0) { echo "\n"; echo "
"; - echo ""; - echo "

"; - echo "

"; - - echo "
"; - echo "
"; echo "

"; //include the footer diff --git a/app/sip_profiles/sip_profile_settings.php b/app/sip_profiles/sip_profile_settings.php index bf2efed2f2..a77eeb1477 100644 --- a/app/sip_profiles/sip_profile_settings.php +++ b/app/sip_profiles/sip_profile_settings.php @@ -85,7 +85,6 @@ require_once "resources/paging.php"; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo "\n"; echo th_order_by('sip_profile_setting_name', $text['label-setting_name'], $order_by, $order, null, null, "id=".$sip_profile_uuid); @@ -147,14 +146,6 @@ require_once "resources/paging.php"; echo "\n"; echo "
"; - echo "
"; - echo "

"; - echo "

"; - - echo ""; - echo ""; - echo ""; - echo ""; echo "

"; //include the footer diff --git a/app/sql_query/sql_query.php b/app/sql_query/sql_query.php index 11e1d12196..e2a268093f 100644 --- a/app/sql_query/sql_query.php +++ b/app/sql_query/sql_query.php @@ -65,8 +65,6 @@ else { echo " });\n"; echo " "; - echo "
"; - echo "
"; echo "\n"; @@ -159,8 +157,6 @@ else { echo "

"; echo "
"; - echo "
"; - echo "\n"; //show the footer diff --git a/app/vars/vars_textarea.php b/app/vars/vars_textarea.php index 872b595155..8cef46a96a 100644 --- a/app/vars/vars_textarea.php +++ b/app/vars/vars_textarea.php @@ -91,8 +91,6 @@ if ($_GET['a'] == "default" && permission_exists('var_edit')) { ?> -
-
@@ -159,7 +157,6 @@ if ($_GET['a'] == "default" && permission_exists('var_edit')) {
-
"; echo "
\n"; - echo "
"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "\n"; - echo "
\n"; - echo "
"; - echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n"; @@ -378,19 +372,11 @@ else { echo "  
\n"; + echo "

"; - echo "
"; - echo "
"; echo "\n"; echo "
"; - echo "
\n"; - echo "
\n"; - echo "
\n"; - echo "
\n"; - //include the footer require_once "resources/footer.php"; diff --git a/app/xml_cdr/xml_cdr_details.php b/app/xml_cdr/xml_cdr_details.php index 0822ca128d..3b64434c63 100644 --- a/app/xml_cdr/xml_cdr_details.php +++ b/app/xml_cdr/xml_cdr_details.php @@ -166,7 +166,6 @@ else { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -222,16 +221,12 @@ else { echo " \n"; echo " \n"; echo "
".$text['label-summary']." ".$duration."".$hangup_cause."
"; - echo "
"; - -//breaking space echo "

\n"; //channel data loop $c = 0; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -253,16 +248,12 @@ else { if ($c==0) { $c=1; } else { $c=0; } } echo "
".$text['label-channel']." 
"; - echo "
"; - -//breaking space echo "

\n"; //variable loop $c = 0; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo "\n"; echo " \n"; @@ -317,16 +308,12 @@ else { if ($c==0) { $c=1; } else { $c=0; } } echo "
Variables 
"; - echo "
"; - -//breaking space echo "

\n"; //app_log $c = 0; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -351,9 +338,6 @@ else { if ($c==0) { $c=1; } else { $c=0; } } echo "
".$text['label-application-log']." 
"; - echo "
"; - -//breaking space echo "

\n"; //call flow @@ -525,12 +509,6 @@ else { echo ""; } -//testing - //echo "
\n";
-	//echo htmlentities($xml_string);
-	//print_r($xml);
-	//echo "
\n"; - //get the footer require_once "resources/footer.php"; ?> \ No newline at end of file diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php index 9c6c7331c0..49a1043df6 100644 --- a/app/xml_cdr/xml_cdr_statistics.php +++ b/app/xml_cdr/xml_cdr_statistics.php @@ -43,7 +43,6 @@ else { require_once "resources/header.php"; //page title and description - echo "
"; echo "\n"; echo "\n"; echo " \n"; diff --git a/app/xmpp/errors.php b/app/xmpp/errors.php index 95bc3d96c2..9891c2df6b 100644 --- a/app/xmpp/errors.php +++ b/app/xmpp/errors.php @@ -24,8 +24,5 @@ Ken Rice Mark J Crane */ -echo "
\n"; -echo "
".$text['label-call-statistics']."
\n"; -echo $error . "\n"; -echo "
\n"; +echo "
".$error."
\n"; ?> diff --git a/app/xmpp/profile_list.php b/app/xmpp/profile_list.php index a453ea4ce4..013baafe92 100644 --- a/app/xmpp/profile_list.php +++ b/app/xmpp/profile_list.php @@ -1,6 +1,4 @@ -
- - +
-

@@ -68,5 +66,4 @@ if ($c==0) { $c=1; } else { $c=0; }
-
+ \ No newline at end of file diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php index 127a6038ca..aad2458328 100644 --- a/core/menu/menu_item_list.php +++ b/core/menu/menu_item_list.php @@ -179,183 +179,168 @@ require_once "resources/header.php"; $order_by = $_GET["order_by"]; $order = $_GET["order"]; - echo "
"; - echo "\n"; +$sql = "select * from v_menu_items "; +$sql .= "where menu_uuid = '".$menu_uuid."' "; +$sql .= "and menu_item_parent_uuid is null "; +if (strlen($order_by)> 0) { + $sql .= "order by $order_by $order "; +} +else { + $sql .= "order by menu_item_order asc "; +} +$prep_statement = $db->prepare(check_sql($sql)); +$prep_statement->execute(); +$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); +$result_count = count($result); - echo "\n"; - echo " \n"; - echo "\n"; - echo "
\n"; +$c = 0; +$row_style["0"] = "row_style0"; +$row_style["1"] = "row_style0"; - $sql = "select * from v_menu_items "; - $sql .= "where menu_uuid = '".$menu_uuid."' "; - $sql .= "and menu_item_parent_uuid is null "; - if (strlen($order_by)> 0) { - $sql .= "order by $order_by $order "; +echo "\n"; + +if ($result_count == 0) { + //no results + echo ""; +} +else { + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "\n"; + echo ""; - $c = 0; - $row_style["0"] = "row_style0"; - $row_style["1"] = "row_style0"; + foreach($result as $row) { + //set the db values as php variables + $menu_item_uuid = $row['menu_item_uuid']; + $menu_item_category = $row['menu_item_category']; + $menu_item_title = $row['menu_item_title']; + $menu_item_link = $row['menu_item_link']; + $menu_item_protected = $row['menu_item_protected']; - echo "
\n"; - echo "
 
".$text['label-title']."".$text['label-groups']."".$text['label-category']."".$text['label-protected']."".$text['label-menu_order'].""; + if (permission_exists('menu_add')) { + echo "$v_link_label_add"; } - else { - $sql .= "order by menu_item_order asc "; - } - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); - $result_count = count($result); + echo "
\n"; - - if ($result_count == 0) { - //no results - echo ""; - } - else { - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "\n"; - echo ""; - - foreach($result as $row) { - //set the db values as php variables - $menu_item_uuid = $row['menu_item_uuid']; - $menu_item_category = $row['menu_item_category']; - $menu_item_title = $row['menu_item_title']; - $menu_item_link = $row['menu_item_link']; - $menu_item_protected = $row['menu_item_protected']; - - //get the groups that have been assigned to the menu - $sql = "select group_name from v_menu_item_groups "; - $sql .= "where menu_uuid = '$menu_uuid' "; - $sql .= "and menu_item_uuid = '$menu_item_uuid' "; - $sub_prep_statement = $db->prepare(check_sql($sql)); - $sub_prep_statement->execute(); - $sub_result = $sub_prep_statement->fetchAll(PDO::FETCH_NAMED); - $group_list = ""; - $x = 0; - foreach ($sub_result as &$sub_row) { - if ($x == 0) { - $group_list = $sub_row["group_name"]; - } - else { - $group_list .= ", ".$sub_row["group_name"]; - } - $x++; - } - unset ($sub_prep_statement); - - //add the type link based on the typd of the menu - switch ($menu_item_category) { - case "internal": - $menu_item_title = "$menu_item_title"; - break; - case "external": - if (substr($menu_item_link, 0,1) == "/") { - $menu_item_link = PROJECT_PATH . $menu_item_link; - } - $menu_item_title = "$menu_item_title"; - break; - case "email": - $menu_item_title = "$menu_item_title"; - break; - } - - //display the content of the list - $tr_link = (permission_exists('menu_edit')) ? "href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row['menu_item_uuid']."&menu_uuid=".$menu_uuid."'" : null; - echo "\n"; - echo ""; - echo ""; - //echo ""; - echo ""; - //echo ""; - //echo ""; - //echo ""; - - if ($menu_item_protected == "true") { - echo ""; + //get the groups that have been assigned to the menu + $sql = "select group_name from v_menu_item_groups "; + $sql .= "where menu_uuid = '$menu_uuid' "; + $sql .= "and menu_item_uuid = '$menu_item_uuid' "; + $sub_prep_statement = $db->prepare(check_sql($sql)); + $sub_prep_statement->execute(); + $sub_result = $sub_prep_statement->fetchAll(PDO::FETCH_NAMED); + $group_list = ""; + $x = 0; + foreach ($sub_result as &$sub_row) { + if ($x == 0) { + $group_list = $sub_row["group_name"]; } else { - echo ""; + $group_list .= ", ".$sub_row["group_name"]; } + $x++; + } + unset ($sub_prep_statement); - echo ""; + //add the type link based on the typd of the menu + switch ($menu_item_category) { + case "internal": + $menu_item_title = "$menu_item_title"; + break; + case "external": + if (substr($menu_item_link, 0,1) == "/") { + $menu_item_link = PROJECT_PATH . $menu_item_link; + } + $menu_item_title = "$menu_item_title"; + break; + case "email": + $menu_item_title = "$menu_item_title"; + break; + } - //echo ""; + //display the content of the list + $tr_link = (permission_exists('menu_edit')) ? "href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row['menu_item_uuid']."&menu_uuid=".$menu_uuid."'" : null; + echo "\n"; + echo ""; + echo ""; + //echo ""; + echo ""; + //echo ""; + //echo ""; + //echo ""; - echo " \n"; - echo ""; + if ($menu_item_protected == "true") { + echo ""; + } + else { + echo ""; + } - //update the menu order - if ($row[menu_item_order] != $tmp_menu_item_order) { - $sql = "update v_menu_items set "; - $sql .= "menu_item_title = '".$row['menu_item_title']."', "; - $sql .= "menu_item_order = '".$tmp_menu_item_order."' "; - $sql .= "where menu_uuid = '".$menu_uuid."' "; - $sql .= "and menu_item_uuid = '".$row[menu_item_uuid]."' "; - //$db->exec(check_sql($sql)); - } - $tmp_menu_item_order++; + echo ""; - //check for sub menus - $menu_item_level = 0; - if (strlen($row['menu_item_uuid']) > 0) { - $c = build_db_child_menu_list($db, $menu_item_level, $row['menu_item_uuid'], $c); - } + //echo ""; - if ($c==0) { $c=1; } else { $c=0; } - } //end foreach - unset($sql, $result, $row_count); + echo " \n"; + echo ""; - } //end if results + //update the menu order + if ($row[menu_item_order] != $tmp_menu_item_order) { + $sql = "update v_menu_items set "; + $sql .= "menu_item_title = '".$row['menu_item_title']."', "; + $sql .= "menu_item_order = '".$tmp_menu_item_order."' "; + $sql .= "where menu_uuid = '".$menu_uuid."' "; + $sql .= "and menu_item_uuid = '".$row[menu_item_uuid]."' "; + //$db->exec(check_sql($sql)); + } + $tmp_menu_item_order++; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
 
".$text['label-title']."".$text['label-groups']."".$text['label-category']."".$text['label-protected']."".$text['label-menu_order'].""; - if (permission_exists('menu_add')) { - echo "$v_link_label_add"; - } - echo "
".$menu_item_title." ".$group_list." ".$menu_item_link." ".$menu_item_category." ".$row[menu_item_description]."".$row['menu_item_parent_uuid']." ".$row['menu_item_order']." ".$text['label-true']."  ".$text['label-false']."  "; - echo " ".$row[menu_item_order]." "; - echo ""; - //if (permission_exists('menu_edit')) { - // echo " "; - // echo " "; - //} - //echo "
".$menu_item_title." ".$group_list." ".$menu_item_link." ".$menu_item_category." ".$row[menu_item_description]."".$row['menu_item_parent_uuid']." ".$row['menu_item_order']." "; - if (permission_exists('menu_edit')) { - echo "$v_link_label_edit"; - } - if (permission_exists('menu_delete')) { - echo "$v_link_label_delete"; - } - echo "
".$text['label-true']."  ".$text['label-false']."  "; + echo " ".$row[menu_item_order]." "; + echo ""; + //if (permission_exists('menu_edit')) { + // echo " "; + // echo " "; + //} + //echo ""; + if (permission_exists('menu_edit')) { + echo "$v_link_label_edit"; + } + if (permission_exists('menu_delete')) { + echo "$v_link_label_delete"; + } + echo "
\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
  \n"; - if (permission_exists('menu_add') && $action == "update") { - echo " $v_link_label_add\n"; - } - echo "
\n"; + //check for sub menus + $menu_item_level = 0; + if (strlen($row['menu_item_uuid']) > 0) { + $c = build_db_child_menu_list($db, $menu_item_level, $row['menu_item_uuid'], $c); + } - echo "
\n"; - echo "\n"; - echo "

"; + if ($c==0) { $c=1; } else { $c=0; } + } //end foreach + unset($sql, $result, $row_count); - echo "
\n"; - echo "
"; +} //end if results - echo "

"; - require_once "resources/footer.php"; +echo "\n"; +echo "\n"; +echo " \n"; +echo " \n"; +echo " \n"; +echo " \n"; +echo " \n"; +echo " \n"; +echo "
  \n"; +if (permission_exists('menu_add') && $action == "update") { + echo " $v_link_label_add\n"; +} +echo "
\n"; +echo "\n"; +echo "\n"; +echo "\n"; +echo "

"; + +require_once "resources/footer.php"; ?> \ No newline at end of file diff --git a/core/users/index.php b/core/users/index.php index 7450d17cb7..e2f9e8e129 100644 --- a/core/users/index.php +++ b/core/users/index.php @@ -43,10 +43,9 @@ else { $document['title'] = $text['title-user_manager']; //show the user list - echo "
"; echo " "; echo " "; - echo " "; echo " "; echo "
"; + echo " "; require_once "users.php"; echo "
"; echo "
"; @@ -54,7 +53,6 @@ else { echo "
"; - echo "
"; //include the footer include "resources/footer.php"; diff --git a/core/users/users.php b/core/users/users.php index 6d597bfb5a..3cf812bda3 100644 --- a/core/users/users.php +++ b/core/users/users.php @@ -42,11 +42,6 @@ $order = $_GET["order"]; $field_name = $_REQUEST["field_name"]; $field_value = $_REQUEST["field_value"]; -echo "
"; -echo "\n"; -echo "\n"; -echo "
\n"; - //page title and description echo "\n"; echo ""; @@ -145,7 +140,6 @@ echo " "; -echo ""; -echo "
\n"; $row_style["1"] = "row_style1"; //show the data - echo "
\n"; echo "\n"; echo "\n"; @@ -224,14 +218,6 @@ echo " \n"; echo "
\n"; echo "
"; - echo "
"; echo "

"; - echo "

"; - -echo "
"; -echo ""; -echo "

"; ?> \ No newline at end of file