[More html improvements in sip settings page Adrian Georgescu **20091101140429] hunk ./library/sip_settings.php 1090 - + hunk ./library/sip_settings.php 1556 - - "; - print _("SIP Address"); + + "; + print _("Address"); hunk ./library/sip_settings.php 1561 - $this->account + sip:$this->account hunk ./library/sip_settings.php 1569 - "; + "; hunk ./library/sip_settings.php 1573 - $this->fullName + $this->fullName hunk ./library/sip_settings.php 1580 - - "; + + "; hunk ./library/sip_settings.php 1585 - $this->username + $this->username hunk ./library/sip_settings.php 1590 - - "; + + "; hunk ./library/sip_settings.php 1595 - $this->domain + $this->domain hunk ./library/sip_settings.php 1601 - - "; + + "; hunk ./library/sip_settings.php 1606 - $this->sip_proxy + $this->sip_proxy hunk ./library/sip_settings.php 1613 - - "; + + "; hunk ./library/sip_settings.php 1618 - $this->xcap_root + $this->xcap_root hunk ./library/sip_settings.php 1630 - "; + "; hunk ./library/sip_settings.php 1633 - $this->rpid + $this->rpid hunk ./library/sip_settings.php 1641 + + $rr=floor($t/2); + $mod=$t-$rr*2; + + if ($mod ==0) { + $_class='odd'; + } else { + $_class='even'; + } + hunk ./library/sip_settings.php 1652 - - "; + + + "; hunk ./library/sip_settings.php 1657 - $e + $e hunk ./library/sip_settings.php 1668 - "; + "; hunk ./library/sip_settings.php 1684 + $rr=floor($t/2); + $mod=$t-$rr*2; + + if ($mod ==0) { + $_class='odd'; + } else { + $_class='even'; + } + hunk ./library/sip_settings.php 1694 - - "; + + + "; hunk ./library/sip_settings.php 1700 - + hunk ./library/sip_settings.php 1707 - "; + "; hunk ./library/sip_settings.php 1711 - + hunk ./library/sip_settings.php 1745 + /* hunk ./library/sip_settings.php 1748 - "; + "; hunk ./library/sip_settings.php 1754 + */ hunk ./library/sip_settings.php 1759 - "; + "; hunk ./library/sip_settings.php 1763 - %s.crt + %s.crt hunk ./library/sip_settings.php 1769 - "; + "; hunk ./library/sip_settings.php 1773 - %s.p12 + %s.p12 hunk ./library/sip_settings.php 1792 - printf (_("Email account information to %s"),$this->email); + printf (_("Email SIP account information to %s"),$this->email); hunk ./library/sip_settings.php 1852 - - "; + + "; hunk ./library/sip_settings.php 1857 - "; + "; hunk ./library/sip_settings.php 1867 - - "; + + "; hunk ./library/sip_settings.php 1872 - "; + "; hunk ./library/sip_settings.php 1884 - - "; + + "; hunk ./library/sip_settings.php 1889 - "; + "; hunk ./library/sip_settings.php 1923 - - "; + + "; hunk ./library/sip_settings.php 1928 - + hunk ./library/sip_settings.php 1945 - "; + "; hunk ./library/sip_settings.php 1949 - + hunk ./library/sip_settings.php 1967 - "; + "; hunk ./library/sip_settings.php 1970 - + hunk ./library/sip_settings.php 1995 - $td_class="orange"; + $_class="orange"; hunk ./library/sip_settings.php 1997 - $td_class="border"; + $_class=""; hunk ./library/sip_settings.php 2003 - - "; + + "; hunk ./library/sip_settings.php 2008 - + hunk ./library/sip_settings.php 2047 - "; + "; hunk ./library/sip_settings.php 2072 - - "; + + "; hunk ./library/sip_settings.php 2076 - + hunk ./library/sip_settings.php 2111 - $td_class="orange"; + $_class="orange"; hunk ./library/sip_settings.php 2113 - $td_class="border"; + $_class=""; hunk ./library/sip_settings.php 2117 - - $elementName - + + $elementName + hunk ./library/sip_settings.php 2244 - - "; + + "; hunk ./library/sip_settings.php 2249 - + hunk ./library/sip_settings.php 2271 - - "; + + "; hunk ./library/sip_settings.php 2276 - + hunk ./library/sip_settings.php 2361 - - "; + + "; hunk ./library/sip_settings.php 2365 - + hunk ./library/sip_settings.php 2382 - - "; + + "; hunk ./library/sip_settings.php 2387 - + hunk ./library/sip_settings.php 2418 - - "; + + "; hunk ./library/sip_settings.php 2423 - + hunk ./library/sip_settings.php 2435 - - "; + + "; hunk ./library/sip_settings.php 2451 - - "; + + "; hunk ./library/sip_settings.php 2455 - + hunk ./library/sip_settings.php 2464 - - "; + + "; hunk ./library/sip_settings.php 2468 - + hunk ./library/sip_settings.php 2508 - print ""; + print ""; hunk ./library/sip_settings.php 2511 - print ""; + print ""; hunk ./library/sip_settings.php 2605 - "; + "; hunk ./library/sip_settings.php 2615 - "; + "; hunk ./library/sip_settings.php 2618 - print " + print " hunk ./library/sip_settings.php 2643 - print ""; + print ""; hunk ./library/sip_settings.php 2646 - print " + print " hunk ./library/sip_settings.php 3362 - $_done = false; + $prepaidCard = $_REQUEST['prepaidCard']; + $prepaidId = $_REQUEST['prepaidId']; hunk ./library/sip_settings.php 3365 - print " - -

url method=post> - - - "; - - if ($issuer=='subscriber'){ - $prepaidCard = $_REQUEST['prepaidCard']; - $prepaidId = $_REQUEST['prepaidId']; + $_done = false; hunk ./library/sip_settings.php 3367 - if ($prepaidCard && $prepaidId) { - if ($result = $this->addBalanceSubscriber($prepaidCard,$prepaidId)) { + if ($issuer) { + print " + + "; + + if ($issuer=='subscriber'){ + if ($prepaidCard && $prepaidId) { + if ($result = $this->addBalanceSubscriber($prepaidCard,$prepaidId)) { + print "

"; + printf (_("Old balance was %s, new balance is %s. "),$result->old_balance, $result->new_balance); + print ""; + $_done=true; + } + } + } else if ($issuer=='reseller' || $issuer=='admin') { + $description = $_REQUEST['description']; + $value = $_REQUEST['value']; + + if (strlen($value) && $result = $this->addBalanceReseller($value,$description)) { + hunk ./library/sip_settings.php 3388 - printf (_("Old balance was %s, new balance is %s. "),$result->old_balance, $result->new_balance); + printf (_("Old balance was %s, new balance is %s. "),$result->old_balance, $result->new_balance); hunk ./library/sip_settings.php 3393 - } - - if ($issuer=='reseller' || $issuer=='admin') { - $description = $_REQUEST['description']; - $value = $_REQUEST['value']; - - if (strlen($value) && $result = $this->addBalanceReseller($value,$description)) { - - print "

"; - printf (_("Old balance was %s, new balance is %s. "),$result->old_balance, $result->new_balance); - print ""; - $_done=true; + + if ($_done && $_REQUEST['notify']) { + $subject=sprintf ("SIP account %s balance update",$this->account); + + $body="Your SIP account balance has been updated. ". + "For more details go to $this->sip_settings_page?tab=prepaid"; + + if (mail($this->email, $subject, $body, "From: $this->support_email")) { + printf (_("Subscriber has been notified at %s."), $this->email); + } hunk ./library/sip_settings.php 3404 - } - - if ($_done && $_REQUEST['notify']) { - $subject=sprintf ("SIP account %s balance update",$this->account); hunk ./library/sip_settings.php 3405 - $body="Your SIP account balance has been updated. ". - "For more details go to $this->sip_settings_page?tab=prepaid"; + print " + + + "; hunk ./library/sip_settings.php 3410 - if (mail($this->email, $subject, $body, "From: $this->support_email")) { - print "

"; - printf (_("Subscriber has been notified to %s."), $this->email); - print ""; - } hunk ./library/sip_settings.php 3412 - print " - - - "; - hunk ./library/sip_settings.php 3420 - "; + "; hunk ./library/sip_settings.php 3425 -

hunk ./library/sip_settings.php 3446 - + hunk ./library/sip_settings.php 3586 - hunk ./library/sip_settings.php 3683 - Total credit + Total credit hunk ./library/sip_settings.php 3696 - Total debit - %s + Total debit + %s hunk ./library/sip_settings.php 3708 - print "

url&tab=prepaid&action=get_balance_history&csv=1 target=_new>Export history to CSV file"; + if (!$this->isEmbedded()) { + print "

url&tab=prepaid&action=get_balance_history&csv=1 target=_new>"; + print _("Export balance history in CSV format"); + print ""; + } else { + print "