Changeset 6231

Timestamp:

07/31/08 09:55:44 (4 months ago)

Author:

ethans

Message:

Check for SQLITE3 module in addition to sqlite3 module. If this check isn't in place, dl() function fails on php on a platform that doesn't support
dynamic modules. Fixes #2982

Files:

• freepbx/trunk/amp_conf/bin/retrieve_conf (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/common/db_connect.php (modified) (3 diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/database.php (modified) (1 diff)
• freepbx/trunk/install_amp (modified) (2 diffs)

freepbx/trunk/amp_conf/bin/retrieve_conf

@@ -246 +246 @@
-
-                /* on centos this extension is not loaded by default */
-
+ && ! extension_loaded('SQLITE3')
-                        dl('sqlite3.so');
-

freepbx/trunk/amp_conf/htdocs/admin/common/db_connect.php

@@ -44 +44 @@
-
-                /* on centos this extension is not loaded by default */
-
+&& ! extension_loaded('SQLITE3')
-                        dl('sqlite3.so');
-
@@ -53 +53 @@
-
-                $datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
-
+
+
+
+
+
-                break;
-
@@ -71 +75 @@
-
-if ($amp_conf['AMPDBPASS'] == $amp_conf_defaults['AMPDBPASS'][1]) {
+        print 
-        $nt->add_warning('core', 'AMPDBPASS', _("Default SQL Password Used"), _("You are using the default SQL password that is widely known, you should set a secure password"));
-} else {

freepbx/trunk/amp_conf/htdocs/recordings/includes/database.php

@@ -44 +44 @@
-    if ($dbfile) {
-      // datasource mostly to support sqlite: dbengine://dbfile?mode=xxxx 
-
+
+
+
+
+
+
+
+
-    } 
-    else {
-      // datasource in in this style: dbengine://username:password@host/database 
-      $datasource = $engine . '://' . $username . ':' . $password . '@' . $host . '/' . $name;
+
+      // options
+      $options = array(
+        'debug'       => 2,
+        'portability' => DB_PORTABILITY_LOWERCASE|DB_PORTABILITY_RTRIM|DB_PORTABILITY_DELETE_COUNT|DB_PORTABILITY_NUMROWS|DB_PORTABILITY_ERRORS|DB_PORTABILITY_NULL_TO_EMPTY,
+      );
-    }
-
-    // options
-    $options = array(
-      'debug'       => 2,
-      'portability' => DB_PORTABILITY_LOWERCASE|DB_PORTABILITY_RTRIM|DB_PORTABILITY_DELETE_COUNT|DB_PORTABILITY_NUMROWS|DB_PORTABILITY_ERRORS|DB_PORTABILITY_NULL_TO_EMPTY,
-    );
-    
-    // attempt connection

freepbx/trunk/install_amp

@@ -898 +898 @@
-outn("Connecting to database..");
-
-$db_user = $amp_conf["AMPDBUSER"];
-$db_pass = $amp_conf["AMPDBPASS"];
-$db_host = $amp_conf["AMPDBHOST"];
-$db_engine = $amp_conf["AMPDBENGINE"];
+if ($db_engine != "sqlite3") {
+        $db_user = $amp_conf["AMPDBUSER"];
+        $db_pass = $amp_conf["AMPDBPASS"];
+        $db_host = $amp_conf["AMPDBHOST"];
+}
-$db_name = $amp_conf["AMPDBNAME"];
-
@@ -937 +939 @@
-
-                /* on centos this extension is not loaded by default */
-
+ && ! extension_loaded('SQLITE3')
-                        dl('sqlite3.so');
-