@@ -1,45 +1,45 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | $sqliteDatabaseAdapterRegistryFields = array( |
| 4 | - 'path' => array( |
|
| 5 | - 'title' => 'Directory path<br /><small>Absolute path to directory, writeable by the webserver user.<br />' |
|
| 6 | - . 'Recommended to be outside of your webroot</small>', |
|
| 7 | - 'default' => dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . '.sqlitedb' |
|
| 8 | - ), |
|
| 9 | - 'database' => array( |
|
| 10 | - 'title' => 'Database filename (extension .sqlite)', |
|
| 11 | - 'default' => 'database.sqlite' |
|
| 12 | - ) |
|
| 4 | + 'path' => array( |
|
| 5 | + 'title' => 'Directory path<br /><small>Absolute path to directory, writeable by the webserver user.<br />' |
|
| 6 | + . 'Recommended to be outside of your webroot</small>', |
|
| 7 | + 'default' => dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . '.sqlitedb' |
|
| 8 | + ), |
|
| 9 | + 'database' => array( |
|
| 10 | + 'title' => 'Database filename (extension .sqlite)', |
|
| 11 | + 'default' => 'database.sqlite' |
|
| 12 | + ) |
|
| 13 | 13 | ); |
| 14 | 14 | |
| 15 | 15 | // Basic SQLLite3 Database |
| 16 | 16 | DatabaseAdapterRegistry::register( |
| 17 | - array( |
|
| 18 | - 'class' => 'SQLite3Database', |
|
| 19 | - 'title' => 'SQLite 3.3+ (using SQLite3)', |
|
| 20 | - 'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php', |
|
| 21 | - 'supported' => class_exists('SQLite3'), |
|
| 22 | - 'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a> |
|
| 17 | + array( |
|
| 18 | + 'class' => 'SQLite3Database', |
|
| 19 | + 'title' => 'SQLite 3.3+ (using SQLite3)', |
|
| 20 | + 'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php', |
|
| 21 | + 'supported' => class_exists('SQLite3'), |
|
| 22 | + 'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a> |
|
| 23 | 23 | PHP Extension is not available. Please install or enable it of them and refresh this page.', |
| 24 | - 'fields' => array_merge($sqliteDatabaseAdapterRegistryFields, array('key' => array( |
|
| 25 | - 'title' => 'Encryption key<br><small>This function is experimental and requires configuration of an ' |
|
| 26 | - . 'encryption module</small>', |
|
| 27 | - 'default' => '' |
|
| 28 | - ))) |
|
| 29 | - ) |
|
| 24 | + 'fields' => array_merge($sqliteDatabaseAdapterRegistryFields, array('key' => array( |
|
| 25 | + 'title' => 'Encryption key<br><small>This function is experimental and requires configuration of an ' |
|
| 26 | + . 'encryption module</small>', |
|
| 27 | + 'default' => '' |
|
| 28 | + ))) |
|
| 29 | + ) |
|
| 30 | 30 | ); |
| 31 | 31 | |
| 32 | 32 | // PDO database |
| 33 | 33 | DatabaseAdapterRegistry::register( |
| 34 | - array( |
|
| 35 | - 'class' => 'SQLite3PDODatabase', |
|
| 36 | - 'title' => 'SQLite 3.3+ (using PDO)', |
|
| 37 | - 'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php', |
|
| 38 | - 'supported' => (class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers())), |
|
| 39 | - 'missingExtensionText' => |
|
| 40 | - 'Either the <a href="http://php.net/manual/en/book.pdo.php">PDO Extension</a> or the |
|
| 34 | + array( |
|
| 35 | + 'class' => 'SQLite3PDODatabase', |
|
| 36 | + 'title' => 'SQLite 3.3+ (using PDO)', |
|
| 37 | + 'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php', |
|
| 38 | + 'supported' => (class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers())), |
|
| 39 | + 'missingExtensionText' => |
|
| 40 | + 'Either the <a href="http://php.net/manual/en/book.pdo.php">PDO Extension</a> or the |
|
| 41 | 41 | <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3 PDO Driver</a> |
| 42 | 42 | are unavailable. Please install or enable these and refresh this page.', |
| 43 | - 'fields' => $sqliteDatabaseAdapterRegistryFields |
|
| 44 | - ) |
|
| 43 | + 'fields' => $sqliteDatabaseAdapterRegistryFields |
|
| 44 | + ) |
|
| 45 | 45 | ); |
@@ -4,11 +4,11 @@ |
||
| 4 | 4 | global $databaseConfig; |
| 5 | 5 | if(strpos($databaseConfig['type'], 'SQLite') === 0) { |
| 6 | 6 | |
| 7 | - if(defined('SS_SQLITE_DATABASE_PATH')) { |
|
| 8 | - $databaseConfig['path'] = SS_SQLITE_DATABASE_PATH; |
|
| 9 | - } |
|
| 7 | + if(defined('SS_SQLITE_DATABASE_PATH')) { |
|
| 8 | + $databaseConfig['path'] = SS_SQLITE_DATABASE_PATH; |
|
| 9 | + } |
|
| 10 | 10 | |
| 11 | - if(defined('SS_SQLITE_DATABASE_KEY')) { |
|
| 12 | - $databaseConfig['key'] = SS_SQLITE_DATABASE_KEY; |
|
| 13 | - } |
|
| 11 | + if(defined('SS_SQLITE_DATABASE_KEY')) { |
|
| 12 | + $databaseConfig['key'] = SS_SQLITE_DATABASE_KEY; |
|
| 13 | + } |
|
| 14 | 14 | } |