Koozali.org: home of the SME Server

Obsolete Releases => SME VoIP (Asterisk, SAIL etc) => Topic started by: apmuthu on April 06, 2013, 02:49:29 PM

Title: SAIL 4 RPM Build 58 and fixes
Post by: apmuthu on April 06, 2013, 02:49:29 PM: SAIL v4.0.0-58 rpm for SME8 (http://sailpbx.com/sail/sail-4.0-testing/rpms/sail-4.0.0-58.noarch.rpm) is now available and fixes backported from the sail4deb build 62 and later fixes are available here (http://www.apmuthu.com/bugfixes/Post_SAIL_4-58_rpm_fixes.zip).

These fixes are essential to make sure some inadvertant typos and missing selects don't cripple the install.

The entire patch diff is listed below:
Code: [Select]
opt/sark/php/sarkapp/javascript.js | 2 +- opt/sark/php/sarkcallgroup/javascript.js | 2 +- opt/sark/php/sarkextension/javascript.js | 2 +- opt/sark/php/sarkglobal/javascript.js | 27 +++++++++++++-------------- opt/sark/php/sarkglobal/view.php | 2 +- opt/sark/php/sarknetwork/javascript.js | 3 +++ opt/sark/php/sarkroute/view.php | 2 +- opt/sark/php/srkPageClass | 16 +++++++++++++--- 8 files changed, 34 insertions(+), 22 deletions(-) diff --git a/opt/sark/php/sarkapp/javascript.js b/opt/sark/php/sarkapp/javascript.js index bb018c1..f998add 100644 --- a/opt/sark/php/sarkapp/javascript.js +++ b/opt/sark/php/sarkapp/javascript.js @@ -49,7 +49,7 @@ placeholder: 'Null' }, // desc { - tooltip: 'Double Click to set auth', + tooltip: 'Double Click to set span', type: 'select', onblur: 'cancel', submit: 'Save', diff --git a/opt/sark/php/sarkcallgroup/javascript.js b/opt/sark/php/sarkcallgroup/javascript.js index 067c6c4..3be4f42 100644 --- a/opt/sark/php/sarkcallgroup/javascript.js +++ b/opt/sark/php/sarkcallgroup/javascript.js @@ -71,7 +71,7 @@ { type: 'textarea', submit:'Save', - tooltip: 'Double Click to set target set', + tooltip: 'Double Click to set target list', onblur: 'cancel', placeholder: 'Null', }, // out diff --git a/opt/sark/php/sarkextension/javascript.js b/opt/sark/php/sarkextension/javascript.js index 58d5a5c..8a0f3c6 100644 --- a/opt/sark/php/sarkextension/javascript.js +++ b/opt/sark/php/sarkextension/javascript.js @@ -26,7 +26,7 @@ }, messages: { - newpkey: "Please enter a valid extension number (3 or 4 digits)", + pkey: "Please enter a valid extension number (3 or 4 digits)", vmailfwd: "Invalid email address", cfim: "Call forward must be blank (default) or a numeric integer", cfbs: "Call forward must be blank (default) or a numeric integer", diff --git a/opt/sark/php/sarkglobal/javascript.js b/opt/sark/php/sarkglobal/javascript.js index 6a4eb70..ce71266 100644 --- a/opt/sark/php/sarkglobal/javascript.js +++ b/opt/sark/php/sarkglobal/javascript.js @@ -2,23 +2,22 @@ $(document).ready(function() { $('#pagetabs').tabs(); - - $.validator.addMethod("xform",function(value,element) { - return this.optional(element) || /^[0-9#*+: ]+$/i.test(value); - },"Mask can only contain 0-9#*+: and space characters"); $.validator.addMethod('validIP', function(value) { - var split = value.split('.'); - if (split.length != 4) - return false; + if (value.length==0) + return true; + + var split = value.split('.'); + if (split.length != 4) + return false; - for (var i=0; i<split.length; i++) { - var s = split[i]; - if (s.length==0 || isNaN(s) || s<0 || s>255) - return false; - } - return true; -}, ' Invalid IP Address'); + for (var i=0; i<split.length; i++) { + var s = split[i]; + if (s.length==0 || isNaN(s) || s<0 || s>255) + return false; + } + return true; + }, ' Invalid IP Address'); $("#sarkglobalForm").validate ( { rules: { diff --git a/opt/sark/php/sarkglobal/view.php b/opt/sark/php/sarkglobal/view.php index 8e32cfb..859718f 100644 --- a/opt/sark/php/sarkglobal/view.php +++ b/opt/sark/php/sarkglobal/view.php @@ -621,7 +621,7 @@ private function printSysNotes () { print "HAE State: $harunstate "; } */ - echo "SysTime: " . date('H:i:s') . " " . PHP_EOL; + echo "SysTime: " . `date '+%H:%M:%S'` . " " . PHP_EOL; if ($updays) { echo "System Uptime: $updays "; } diff --git a/opt/sark/php/sarknetwork/javascript.js b/opt/sark/php/sarknetwork/javascript.js index b5b9aa2..43c8a61 100644 --- a/opt/sark/php/sarknetwork/javascript.js +++ b/opt/sark/php/sarknetwork/javascript.js @@ -5,6 +5,9 @@ toggleDhcpStatus(); $.validator.addMethod('validIP', function(value) { + if (value.length==0) + return true; + var split = value.split('.'); if (split.length != 4) return false; diff --git a/opt/sark/php/sarkroute/view.php b/opt/sark/php/sarkroute/view.php index 388ee22..eea76b9 100644 --- a/opt/sark/php/sarkroute/view.php +++ b/opt/sark/php/sarkroute/view.php @@ -279,7 +279,7 @@ private function showEdit($key=False) { $trunklist = array(); array_push($trunklist, "None"); $sql = "select li.pkey,ca.technology from lineio li inner join carrier ca on li.carrier=ca.pkey " . - "where ca.technology='IAX2' OR ca.technology='SIP' OR ca.technology='DAHDI' "; + "where ca.technology='IAX2' OR ca.technology='SIP' OR ca.technology='DAHDI' OR ca.technology='Custom' "; $rows = $this->helper->getTable("lineio", $sql); foreach ($rows as $row) { diff --git a/opt/sark/php/srkPageClass b/opt/sark/php/srkPageClass index 6e4ab6b..894e73d 100644 --- a/opt/sark/php/srkPageClass +++ b/opt/sark/php/srkPageClass @@ -296,11 +296,21 @@ Class page { $dbh = DB::getInstance(); $row = $dbh->query("SELECT * FROM tt_help_core where pkey='$header'")->fetch(PDO::FETCH_ASSOC); echo '<th class="srk-border" id="' . $header . '">'; - echo '<a href="#" class="tt" style="color:#ffffff">'; - echo $row['displayname']; + echo '<a href="#" class="tt" style="color:#ffffff">'; + if (isset($row['displayname'])) { + echo $row['displayname']; + } + else { + echo $header; + } if ( $help ) { echo ''; - echo $row['htext']; + if (isset($row['htext'])) { + echo $row['htext']; + } + else { + echo "No help text available for this column"; + } echo ''; } echo '</a>';