BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /asterisk-stats @ 1401

  → /asterisk-stats @ 1402

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1401 → Rev 1402

/asterisk-stats/trunk/originate_call.php
5,8 → 5,8
include_once('includes/AsteriskManager/AsteriskManager.php');
$src = $_POST['src'];
$dst = $_POST['dst'];
$src = CanonEntryValue($_POST['src']);
$dst = CanonEntryValue($_POST['dst']);
try {
$ast = new Net_AsteriskManager(array(

/asterisk-stats/trunk/cdr_details.php
13,9 → 13,9
. " p1.person_name as src_name, e1.entry_title as src_title,"
. " p2.person_name as dst_name, e2.entry_title as dst_title"
. " from activecalls r"
. " left join telbook_entries e1 on r.src=e1.entry_value"
. " left join telbook_entries e1 on r.src=" . SqlCanonEntryValue("e1.entry_value")
. " left join telbook_persons p1 on p1.person_id=e1.entry_person"
. " left join telbook_entries e2 on r.dst=e2.entry_value"
. " left join telbook_entries e2 on r.dst=" . SqlCanonEntryValue("e2.entry_value")
. " left join telbook_persons p2 on p2.person_id=e2.entry_person"
. " where acctid=$1 and duration is null", array($_GET['active']));
}
26,9 → 26,9
. " p1.person_name as src_name, e1.entry_title as src_title,"
. " p2.person_name as dst_name, e2.entry_title as dst_title"
. " from cdr r"
. " left join telbook_entries e1 on r.src=e1.entry_value"
. " left join telbook_entries e1 on r.src=" . SqlCanonEntryValue("e1.entry_value")
. " left join telbook_persons p1 on p1.person_id=e1.entry_person"
. " left join telbook_entries e2 on r.dst=e2.entry_value"
. " left join telbook_entries e2 on r.dst=" . SqlCanonEntryValue("e2.entry_value")
. " left join telbook_persons p2 on p2.person_id=e2.entry_person"
. " where acctid=$1", array($_GET['detail']));
}

/asterisk-stats/trunk/includes/functions.php
1,6 → 1,7
<?php
function FormatDuration($seconds) {
function FormatDuration($seconds)
{
$minutes = $seconds / 60;
$seconds = $seconds % 60;
$hours = $minutes / 60;
9,7 → 10,8
return sprintf("%d:%02d:%02d", $hours, $minutes, $seconds);
}
function FormatTime($time) {
function FormatTime($time)
{
//Format the time to human readable format
$diff = $time;
$hrsdiff = floor($diff/60/60);
21,10 → 23,21
return (' ('.$hrsdiff.'h '.$minsdiff.'m '.$secsdiff.'s)');
}
function FormatDateTime($date_str) {
function FormatDateTime($date_str)
{
$date_obj = date_create($date_str);
return date_format($date_obj, "D, j M Y G:i:s");
}
function SqlCanonEntryValue($field)
{
return "regexp_replace($field, '[^0-9]', '')";
}
function CanonEntryValue($value)
{
return preg_replace('/[^0-9]/', '', $value);
}
?>

/asterisk-stats/trunk/cdr_list.php
107,9 → 107,9
. " p1.person_name as src_name, e1.entry_title as src_title,"
. " p2.person_name as dst_name, e2.entry_title as dst_title"
. " from activecalls r"
. " left join telbook_entries e1 on r.src=e1.entry_value"
. " left join telbook_entries e1 on r.src=" . SqlCanonEntryValue("e1.entry_value")
. " left join telbook_persons p1 on p1.person_id=e1.entry_person"
. " left join telbook_entries e2 on r.dst=e2.entry_value"
. " left join telbook_entries e2 on r.dst=" . SqlCanonEntryValue("e2.entry_value")
. " left join telbook_persons p2 on p2.person_id=e2.entry_person"
. " where"
. $query . " order by calldate desc" . $query_limit;
119,9 → 119,9
. " p1.person_name as src_name, e1.entry_title as src_title,"
. " p2.person_name as dst_name, e2.entry_title as dst_title"
. " from cdr r"
. " left join telbook_entries e1 on r.src=e1.entry_value"
. " left join telbook_entries e1 on r.src=" . SqlCanonEntryValue("e1.entry_value")
. " left join telbook_persons p1 on p1.person_id=e1.entry_person"
. " left join telbook_entries e2 on r.dst=e2.entry_value"
. " left join telbook_entries e2 on r.dst=" . SqlCanonEntryValue("e2.entry_value")
. " left join telbook_persons p2 on p2.person_id=e2.entry_person"
. " where"
. $query . " order by calldate desc" . $query_limit;