Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 2443897ccdeba55dec89987af0183d74 > files > 5

freepbx-2.7.0-2mdv2010.1.src.rpm

diff -ur freepbx-2.7.0/amp_conf/bin/freepbx-cron-scheduler.php freepbx-2.7.0.orig/amp_conf/bin/freepbx-cron-scheduler.php
--- freepbx-2.7.0/amp_conf/bin/freepbx-cron-scheduler.php	2010-03-26 14:09:38.000000000 +0100
+++ freepbx-2.7.0.orig/amp_conf/bin/freepbx-cron-scheduler.php	2008-06-28 02:02:44.000000000 +0200
@@ -173,8 +173,8 @@
 		if (isset($amp_conf["AMPDBFILE"]) == "")
 			fatal("AMPDBFILE in $amportalconf cannot be blank");
 
-		require_once('DB/sqlite.php');
-		$datasource = "sqlite:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
+		require_once('DB/sqlite3.php');
+		$datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
 		$db = DB::connect($datasource);
 		break;
 
diff -ur freepbx-2.7.0/amp_conf/bin/retrieve_conf freepbx-2.7.0.orig/amp_conf/bin/retrieve_conf
--- freepbx-2.7.0/amp_conf/bin/retrieve_conf	2010-03-26 14:10:55.000000000 +0100
+++ freepbx-2.7.0.orig/amp_conf/bin/retrieve_conf	2010-01-28 18:17:00.000000000 +0100
@@ -248,13 +248,13 @@
 		if (! extension_loaded('sqlite3.so')  && ! extension_loaded('SQLITE3'))
 			dl('sqlite3.so');
 
-		if (! @require_once('DB/sqlite.php') )
+		if (! @require_once('DB/sqlite3.php') )
 		{
 			die_freepbx("Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");
 		}
 
-		require_once('DB/sqlite.php');
-		$datasource = "sqlite:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
+		require_once('DB/sqlite3.php');
+		$datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
 		$db = DB::connect($datasource);
 		break;
 
diff -ur freepbx-2.7.0/amp_conf/htdocs/admin/cdr/lib/defines.php freepbx-2.7.0.orig/amp_conf/htdocs/admin/cdr/lib/defines.php
--- freepbx-2.7.0/amp_conf/htdocs/admin/cdr/lib/defines.php	2010-03-26 14:10:02.000000000 +0100
+++ freepbx-2.7.0.orig/amp_conf/htdocs/admin/cdr/lib/defines.php	2009-04-30 01:46:45.000000000 +0200
@@ -59,12 +59,12 @@
                 if (! extension_loaded('sqlite3')  && ! extension_loaded('SQLITE3'))
                         dl('sqlite3.so');
 
-                if (! @require_once('DB/sqlite.php') )
+                if (! @require_once('DB/sqlite3.php') )
                 {
                         die_freepbx("Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");
                 }
 
-                $datasource = "sqlite:///asteriskcdr.db?mode=0666";
+                $datasource = "sqlite3:///asteriskcdr.db?mode=0666";
                 $options = array(
                         'debug'       => 4,
                         'portability' => DB_PORTABILITY_NUMROWS
diff -ur freepbx-2.7.0/amp_conf/htdocs/admin/common/db_connect.php freepbx-2.7.0.orig/amp_conf/htdocs/admin/common/db_connect.php
--- freepbx-2.7.0/amp_conf/htdocs/admin/common/db_connect.php	2010-03-26 14:10:27.000000000 +0100
+++ freepbx-2.7.0.orig/amp_conf/htdocs/admin/common/db_connect.php	2008-09-19 20:33:18.000000000 +0200
@@ -46,12 +46,12 @@
 		if (! extension_loaded('sqlite3') && ! extension_loaded('SQLITE3'))
 			dl('sqlite3.so');
 
-		if (! @require_once('DB/sqlite.php') )
+		if (! @require_once('DB/sqlite3.php') )
 		{
 			die_freepbx("Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");
 		}
 
-		$datasource = "sqlite:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
+		$datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
                 $options = array(
        	           	'debug'       => 4,
 			'portability' => DB_PORTABILITY_NUMROWS
diff -ur freepbx-2.7.0/install_amp freepbx-2.7.0.orig/install_amp
--- freepbx-2.7.0/install_amp	2010-03-26 14:09:09.000000000 +0100
+++ freepbx-2.7.0.orig/install_amp	2010-03-26 13:55:44.000000000 +0100
@@ -989,13 +989,13 @@
 		if (! extension_loaded('sqlite3.so')  && ! extension_loaded('SQLITE3'))
 			dl('sqlite3.so');
 
-		if (! @require_once('DB/sqlite.php') )
+		if (! @require_once('DB/sqlite3.php') )
 		{
 			out("FAILED");
 			fatal( "Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");
 		}
 
-		$datasource = "sqlite:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
+		$datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
 		$db = DB::connect($datasource);
 		break;