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

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

Revision: 5991
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5991&view=rev
Author:   abelbeck
Date:     2013-03-13 20:18:48 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
web interface, add support for ODBC CDR file /mnt/kd/cdr-sqlite3/cdr-odbc.sqlite3 and remove recently added SQL view generation for /mnt/kd/cdr-sqlite3/master.db

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/phpliteadmin.php
    branches/1.0/package/webinterface/altweb/admin/prefs.php
    branches/1.0/package/webinterface/altweb/admin/sqldata.php
    branches/1.0/package/webinterface/altweb/common/topics.info

Modified: branches/1.0/package/webinterface/altweb/admin/phpliteadmin.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/phpliteadmin.php	2013-03-13 19:43:54 UTC (rev 5990)
+++ branches/1.0/package/webinterface/altweb/admin/phpliteadmin.php	2013-03-13 20:18:48 UTC (rev 5991)
@@ -72,6 +72,9 @@
 		"name"=> "Asterisk"
 	)
 );
+if (is_file('/mnt/kd/cdr-sqlite3/cdr-odbc.sqlite3')) {
+	$databases[] = array( "path"=> "/mnt/kd/cdr-sqlite3/cdr-odbc.sqlite3", "name"=> "CDR ODBC" );
+}
 if (is_file('/mnt/kd/cdr-sqlite3/master.db')) {
 	$databases[] = array( "path"=> "/mnt/kd/cdr-sqlite3/master.db", "name"=> "CDR SQLite3" );
 }

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2013-03-13 19:43:54 UTC (rev 5990)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2013-03-13 20:18:48 UTC (rev 5991)
@@ -273,10 +273,6 @@
       $value = 'sqldata_create_schema = no';
       fwrite($fp, $value."\n");
     }
-    if (! isset($_POST['sqldata_create_cdr_view'])) {
-      $value = 'sqldata_create_cdr_view = no';
-      fwrite($fp, $value."\n");
-    }
 
     if (isset($_POST['users_hide_pass'])) {
       $value = 'users_voicemail_hide_pass = yes';
@@ -858,10 +854,6 @@
   $sel = (getPREFdef($global_prefs, 'sqldata_create_schema') !== 'no') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="sqldata_create_schema" name="sqldata_create_schema"'.$sel.' /></td><td colspan="5">Create SIP &amp; Phone standard SQL schema</td></tr>');
 
-  putHtml('<tr class="dtrow1"><td style="text-align: right;">');
-  $sel = (getPREFdef($global_prefs, 'sqldata_create_cdr_view') !== 'no') ? ' checked="checked"' : '';
-  putHtml('<input type="checkbox" value="sqldata_create_cdr_view" name="sqldata_create_cdr_view"'.$sel.' /></td><td colspan="5">Create CDR SQLite3 standard view if database exists</td></tr>');
-
   putHtml('<tr class="dtrow0"><td colspan="6">&nbsp;</td></tr>');
   
   putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');

Modified: branches/1.0/package/webinterface/altweb/admin/sqldata.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/sqldata.php	2013-03-13 19:43:54 UTC (rev 5990)
+++ branches/1.0/package/webinterface/altweb/admin/sqldata.php	2013-03-13 20:18:48 UTC (rev 5991)
@@ -51,23 +51,6 @@
       }
     }
     $pdo_db = NULL;
-
-    if (is_file('/mnt/kd/cdr-sqlite3/master.db') && getPREFdef($global_prefs, 'sqldata_create_cdr_view') !== 'no') {
-      $pdo_db = new PDO("sqlite:/mnt/kd/cdr-sqlite3/master.db");
-      $pdo_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-      // List all views
-      $view_arr = array();
-      $sql = "SELECT name FROM sqlite_master WHERE type='view'";
-      foreach ($pdo_db->query($sql) as $row) {
-        $view_arr[] = $row['name'];
-      }
-      if (! in_array('standard', $view_arr)) {
-        $sql = "CREATE VIEW IF NOT EXISTS 'standard' AS SELECT calldate, clid, dstchannel, dcontext, billsec, userfield FROM cdr ORDER BY calldate DESC";
-        $pdo_db->exec($sql);
-      }
-      $pdo_db = NULL;
-    }
   } catch (PDOException $e) {
     return($e->getMessage());
   }

Modified: branches/1.0/package/webinterface/altweb/common/topics.info
===================================================================
--- branches/1.0/package/webinterface/altweb/common/topics.info	2013-03-13 19:43:54 UTC (rev 5990)
+++ branches/1.0/package/webinterface/altweb/common/topics.info	2013-03-13 20:18:48 UTC (rev 5991)
@@ -296,10 +296,6 @@
 The "Create SIP & Phone standard SQL schema" (checked by default),
 automatically creates the standard table structure for the SQLite3 database.
 
-The "Create CDR SQLite3 standard view if database exists" (checked by default),
-automatically creates the standard view for the CDR SQLite3 database located
-at "/mnt/kd/cdr-sqlite3/master.db" if it exists.
-
 You can access the database via Asterisk with user defined "func_odbc" functions, where
 you can define customized database queries and more. A quite universal example for an entry
 in the "func_odbc.conf" would be:

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