Operator: Make prefs use same column names as UI

diff --git a/operator/config/prefs.php.dist b/operator/config/prefs.php.dist
index 3586e21..15c64a0 100644 (file)
--- a/operator/config/prefs.php.dist
+++ b/operator/config/prefs.php.dist
@@ -25,25 +25,7 @@ $_prefs['columns'] = array(
     'locked' => false,
     'shared' => false,
     'type' => 'multienum',
-    'enum' => array(
-        'accountcode' => _("Account Code"),
-        'src' => _("Source"),
-        'dst' => _("Destination"),
-        'dcontext' => _("Destination Context"),
-        'clid' => _("Caller ID"),
-        'channel' => _("Channel"),
-        'dstchannel' => _("Destination Channel"),
-        'lastapp' => _("Last Application"),
-        'lastdata' => _("Last Application Data"),
-        'start' => _("Call Start Time"),
-        'answer' => _("Call Answer Time"),
-        'end' => _("Call End Time"),
-        'duration' => _("Call Duration"),
-        'billsec' => _("Billing Time (seconds)"),
-        'disposition' => _("Call Disposition"),
-        'amaflags' => _("AMA Flags"),
-        'userfield' => _("User Defined Field"),
-        'uniqueid' => _("Call Unique ID")),
+    'enum' => Operator::getColumns(),
     'desc' => _("The columns to be displayed on the Call Detail Review screen")
 );
 

diff --git a/operator/lib/Operator.php b/operator/lib/Operator.php
index fa00ad4..c707be9 100644 (file)
--- a/operator/lib/Operator.php
+++ b/operator/lib/Operator.php
@@ -37,7 +37,11 @@ class Operator {
 
     public static function getColumns()
     {
-        #static $columns = array(
+        static $columns = array();
+        if (!empty($columns)) {
+            return $columns;
+        }
+
         $columns = array(
             'accountcode' => _("Account Code"),
             'src' => _("Source"),
@@ -48,15 +52,15 @@ class Operator {
             'dstchannel' => _("Destination Channel"),
             'lastapp' => _("Last Application"),
             'lastdata' => _("Last Application Data"),
-            'start' => _("Call Start Time"),
-            'answer' => _("Call Answer Time"),
-            'end' => _("Call End Time"),
-            'duration' => _("Call Duration (seconds)"),
-            'billsec' => _("Billable Call Duration (seconds)"),
-            'disposition' => _("Call Disposition"),
+            'start' => _("Start Time"),
+            'answer' => _("Answer Time"),
+            'end' => _("End Time"),
+            'duration' => _("Duration (sec)"),
+            'billsec' => _("Billable Duration (sec)"),
+            'disposition' => _("Disposition"),
             'amaflags' => _("AMA Flag"),
             'userfield' => _("User Defined Field"),
-            'uniqueid' => _("Call Unique ID"));
+            'uniqueid' => _("Unique ID"));
 
         return $columns;
     }