Show
Ignore:
Timestamp:
07/31/08 12:55:44 (5 years 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:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/bin/retrieve_conf

    r6189 r6231  
    246246 
    247247    /* on centos this extension is not loaded by default */ 
    248     if (! extension_loaded('sqlite3.so') ) 
     248    if (! extension_loaded('sqlite3.so') && ! extension_loaded('SQLITE3')) 
    249249      dl('sqlite3.so'); 
    250250 

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

    r5870 r6231  
    4444 
    4545    /* on centos this extension is not loaded by default */ 
    46     if (! extension_loaded('sqlite3') ) 
     46    if (! extension_loaded('sqlite3') && ! extension_loaded('SQLITE3')) 
    4747      dl('sqlite3.so'); 
    4848 
    …… 
    5353 
    5454    $datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666"; 
    55     $db = DB::connect($datasource); 
     55                $options = array( 
     56                    'debug'       => 4, 
     57      'portability' => DB_PORTABILITY_NUMROWS 
     58    ); 
     59    $db = DB::connect($datasource, $options); 
    5660    break; 
    5761 
    …… 
    7175 
    7276if ($amp_conf['AMPDBPASS'] == $amp_conf_defaults['AMPDBPASS'][1]) { 
     77  print  
    7378  $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")); 
    7479} else { 

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

    r1773 r6231  
    4444    if ($dbfile) { 
    4545      // datasource mostly to support sqlite: dbengine://dbfile?mode=xxxx  
    46       $dsn = $engine . '://' . $dbfile . '?mode=0666'; 
     46      $datasource = $engine . ':///' . $dbfile . '?mode=0666'; 
     47      $options = array( 
     48        'debug'       => 4 
     49      ); 
     50      if (! extension_loaded('sqlite3') && ! extension_loaded('SQLITE3')) { 
     51        dl('sqlite3.so'); 
     52      } 
     53 
    4754    }  
    4855    else { 
    4956      // datasource in in this style: dbengine://username:password@host/database  
    5057      $datasource = $engine . '://' . $username . ':' . $password . '@' . $host . '/' . $name; 
     58 
     59      // options 
     60      $options = array( 
     61        'debug'       => 2, 
     62        'portability' => DB_PORTABILITY_LOWERCASE|DB_PORTABILITY_RTRIM|DB_PORTABILITY_DELETE_COUNT|DB_PORTABILITY_NUMROWS|DB_PORTABILITY_ERRORS|DB_PORTABILITY_NULL_TO_EMPTY, 
     63      ); 
    5164    } 
    52  
    53     // options 
    54     $options = array( 
    55       'debug'       => 2, 
    56       'portability' => DB_PORTABILITY_LOWERCASE|DB_PORTABILITY_RTRIM|DB_PORTABILITY_DELETE_COUNT|DB_PORTABILITY_NUMROWS|DB_PORTABILITY_ERRORS|DB_PORTABILITY_NULL_TO_EMPTY, 
    57     ); 
    5865     
    5966    // attempt connection