From 7539244e49c36c398ca100c3a07abd8f37963a90 Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Tue, 23 Feb 2016 17:53:21 -0700
Subject: [PATCH] Additional work to get the CDR to allow the show all to work
 with the regular search and advanced search.

---
 app/xml_cdr/xml_cdr.php        | 12 +++++++---
 app/xml_cdr/xml_cdr_search.php | 40 ++++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 816ed04e6b..506d1e852a 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2014
+	Portions created by the Initial Developer are Copyright (C) 2008-2016
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -113,12 +113,18 @@ else {
 	echo "		<tr>\n";
 	echo "			<td style='vertical-align: top;'>\n";
 	if (permission_exists('xml_cdr_all')) {
-		if ($_REQUEST['showall'] != 'true') {
+		if ($_REQUEST['showall'] == 'true') {
+			echo "		<input type='hidden' name='showall' value='true'>\n";
+		}
+		else {
 			echo "		<input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='xml_cdr.php?showall=true';\">\n";
 		}
 	}
 	if (permission_exists('xml_cdr_search_advanced')) {
-		echo "			<input type='button' class='btn' value='".$text['button-advanced_search']."' onclick=\"window.location='xml_cdr_search.php';\">\n";
+		if ($_REQUEST['showall'] == 'true') {
+			$query_string = "showall=true";
+		}
+		echo "			<input type='button' class='btn' value='".$text['button-advanced_search']."' onclick=\"window.location='xml_cdr_search.php?$query_string';\">\n";
 	}
 	if ($_GET['missed'] != 'true') {
 		echo "			<input type='button' class='btn' value='".$text['button-missed']."' onclick=\"document.location.href='xml_cdr.php?missed=true';\">\n";
diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php
index 7a85e3900b..8b79a0251d 100644
--- a/app/xml_cdr/xml_cdr_search.php
+++ b/app/xml_cdr/xml_cdr_search.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Copyright (C) 2008-2012
+	Copyright (C) 2008-2016
 	All Rights Reserved.
 
 	Contributor(s):
@@ -34,11 +34,11 @@ else {
 	exit;
 }
 
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
 
+//send the header
 require_once "resources/header.php";
 
 //javascript to toggle input/select boxes
@@ -54,6 +54,7 @@ echo "		}";
 echo "	}";
 echo "</script>";
 
+//start the html form
 if (strlen(check_str($_GET['redirect'])) > 0) {
 	echo "<form method='get' action='" . $_GET['redirect'] . ".php'>\n";
 } else {
@@ -216,20 +217,27 @@ echo "	<tr>";
 echo "		<td class='vncell'>".$text['label-mos_score']."</td>";
 echo "		<td class='vtable'>";
 echo "			<select name='mos_comparison' class='formfld'>\n";
-echo "				<option value=''></option>\n";
-	echo "			<option value='less'>&lt;</option>\n";
-	echo "			<option value='greater'>&gt;</option>\n";
-	echo "			<option value='lessorequal'>&lt;&#61;</option>\n";
-	echo "			<option value='greaterorequal'>&gt;&#61;</option>\n";
-	echo "			<option value='equal'>&#61;</option>\n";
-	echo "			<option value='notequal'>&lt;&gt;</option>\n";
+echo "			<option value=''></option>\n";
+echo "			<option value='less'>&lt;</option>\n";
+echo "			<option value='greater'>&gt;</option>\n";
+echo "			<option value='lessorequal'>&lt;&#61;</option>\n";
+echo "			<option value='greaterorequal'>&gt;&#61;</option>\n";
+echo "			<option value='equal'>&#61;</option>\n";
+echo "			<option value='notequal'>&lt;&gt;</option>\n";
 echo "			</select>\n";
-echo " <input type='text' class='formfld' name='mos_score' value='$mos_score'></td>";
-echo "	</tr>";
-echo "	<tr>";
-echo "		<td colspan='2' align='right'><br><input type='submit' name='submit' class='btn' value='".$text['button-search']."'></td>";
-echo "	</tr>";
-echo "</table>";
+echo "			<input type='text' class='formfld' name='mos_score' value='$mos_score'>\n";
+echo "		</td>";
+echo "	</tr>\n";
+
+echo "	<tr>\n";
+echo "		<td colspan='2' align='right'><br>\n";
+if (permission_exists('xml_cdr_all') && $_REQUEST['showall'] == "true") {
+	echo "			<input type='hidden' name='showall' value='".$_REQUEST['showall']."'>\n";
+}
+echo "			<input type='submit' name='submit' class='btn' value='".$text['button-search']."'>\n";
+echo "		</td>\n";
+echo "	</tr>\n";
+echo "</table>\n";
 
 echo "		</td>";
 echo "	</tr>";
@@ -240,4 +248,4 @@ echo "</form>";
 
 require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file