[Fixed search and group by empty field Adrian Georgescu **20110902075504 Ignore-this: 45a93062b5362bade4d4e691f6930ddf ] hunk ./library/cdr_opensips.php 1163 + $c_number=trim($c_number); + if ($c_number_comp == "empty") { + $where .= " and $this->CanonicalURIField = ''"; + $this->url.=sprintf("&c_number_comp=%s",urlencode($c_number_comp)); + } else if (strlen($c_number)) { + $c_number=urldecode($c_number); + if (!$c_number_comp) $c_number_comp="begin"; + + if (!$c_number_comp || $c_number_comp=="begin") { + $where .= " and $this->CanonicalURIField like '".addslashes($c_number)."%'"; + } elseif ($c_number_comp=="equal") { + $where .= " and $this->CanonicalURIField = '".addslashes($c_number)."'"; + } elseif ($c_number_comp=="contain") { + $where .= " and $this->CanonicalURIField like '%".addslashes($c_number)."%'"; + } + $this->url.=sprintf("&c_number=%s&c_number_comp=%s",urlencode($c_number),urlencode($c_number_comp)); + } + hunk ./library/cdr_opensips.php 1310 - $c_number=trim($c_number); - - if (strlen($c_number)) { - $c_number=urldecode($c_number); + if ($UserName_comp == "empty") { + $where .= " and $this->usernameField = ''"; + $this->url.=sprintf("&UserName_comp=%s",urlencode($UserName_comp)); + } else if (strlen($UserName)) { + if (!$UserName_comp) $UserName_comp='begin'; hunk ./library/cdr_opensips.php 1316 - if (!$c_number_comp || $c_number_comp=="begin") { - $where .= " and $this->CanonicalURIField like '".addslashes($c_number)."%'"; - } elseif ($c_number_comp=="equal") { - $where .= " and $this->CanonicalURIField = '".addslashes($c_number)."'"; - } elseif ($c_number_comp=="contain") { - $where .= " and $this->CanonicalURIField like '%".addslashes($c_number)."%'"; + if ($UserName_comp=="begin") { + $where .= " and $this->usernameField like '".addslashes($UserName)."%'"; + } elseif ($UserName_comp=="contain") { + $where .= " and $this->usernameField like '%".addslashes($UserName)."%'"; + } elseif ($UserName_comp=="equal") { + $where .= " and $this->usernameField = '".addslashes($UserName)."'"; + } else { + $where .= " and $this->usernameField = '' "; hunk ./library/cdr_opensips.php 1325 - $this->url.=sprintf("&c_number=%s&c_number_comp=%s",urlencode($c_number),$c_number_comp); + + $this->url.=sprintf("&UserName=%s&UserName_comp=%s",urlencode($UserName),$UserName_comp); hunk ./library/cdr_opensips.php 1663 - $traceValue="empty"; + $traceValue=""; + $comp_type="empty"; + } else { + $comp_type="begin"; hunk ./library/cdr_opensips.php 1696 - printf("Display calls",$url_calls,$traceField,$traceValue_enc,$traceField); + printf("Display calls",$url_calls,$traceField,$traceValue_enc,$traceField,$comp_type);