[Astlinux-commits] SF.net SVN: astlinux:[5463] branches/1.0/package/webinterface/altweb

[<abe...@us...>]

Revision: 5463
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5463&view=rev
Author:   abelbeck
Date:     2012-02-21 18:03:21 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
web interface, Prefs tab and CDR Log tab, add support for 'uniqueid' CDR value

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/cdrlog.php
    branches/1.0/package/webinterface/altweb/admin/prefs.php
    branches/1.0/package/webinterface/altweb/common/version.php

Modified: branches/1.0/package/webinterface/altweb/admin/cdrlog.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/cdrlog.php	2012-02-21 18:00:01 UTC (rev 5462)
+++ branches/1.0/package/webinterface/altweb/admin/cdrlog.php	2012-02-21 18:03:21 UTC (rev 5463)
@@ -67,6 +67,8 @@
     return($def ? 14 : 15);
   case 'accountcode':
     return($def ? 15 : 0);
+  case 'uniqueid':
+    return($def ? 16 : 16);
   case 'userfield':
     return($def ? 17 : 17);
   }
@@ -185,6 +187,9 @@
   if (isset($map['accountcode'])) {
     $str .= ',"'.trim($linetokens[$map['accountcode']], '"').'"';
   }
+  if (isset($map['uniqueid'])) {
+    $str .= ',"'.trim($linetokens[$map['uniqueid']], '"').'"';
+  }
   if (isset($map['userfield'])) {
     $str .= ',"'.trim($linetokens[$map['userfield']], '"').'"';
   }
@@ -316,6 +321,9 @@
       if (isset($map['accountcode'])) {
         $db['data'][$id]['accountcode'] = trim($linetokens[$map['accountcode']], '"');
       }
+      if (isset($map['uniqueid'])) {
+        $db['data'][$id]['uniqueid'] = trim($linetokens[$map['uniqueid']], '"');
+      }
       if (isset($map['userfield'])) {
         $db['data'][$id]['userfield'] = trim($linetokens[$map['userfield']], '"');
       }

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2012-02-21 18:00:01 UTC (rev 5462)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2012-02-21 18:03:21 UTC (rev 5463)
@@ -656,6 +656,8 @@
   putHtml('<option value="amaflags"'.$sel.'>amaflags</option>');
   $sel = (getPREFdef($global_prefs, 'cdrlog_last_cmd') === 'accountcode') ? ' selected="selected"' : '';
   putHtml('<option value="accountcode"'.$sel.'>accountcode</option>');
+  $sel = (getPREFdef($global_prefs, 'cdrlog_last_cmd') === 'uniqueid') ? ' selected="selected"' : '';
+  putHtml('<option value="uniqueid"'.$sel.'>uniqueid</option>');
   $sel = (getPREFdef($global_prefs, 'cdrlog_last_cmd') === 'userfield') ? ' selected="selected"' : '';
   putHtml('<option value="userfield"'.$sel.'>userfield</option>');
   putHtml('</select>');

Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php	2012-02-21 18:00:01 UTC (rev 5462)
+++ branches/1.0/package/webinterface/altweb/common/version.php	2012-02-21 18:03:21 UTC (rev 5463)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.8.06';
+$GUI_VERSION = '1.8.07';
 
 ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.