Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed a couple issues with pull request

  • Loading branch information...
commit 45e7fc5bbb0597c7ac7870286b1a7d1074ae5458 1 parent 6f17b14
Jerel Unruh jerel authored
Showing with 99 additions and 2 deletions.
  1. +1 −2  .gitignore
  2. +98 −0 system/cms/config/database.php.bak
3  .gitignore
View
@@ -46,5 +46,4 @@ addons/shared_addons/plugins/*
!addons/shared_addons/field_types
addons/shared_addons/field_types/*
-!addons/shared_addons/field_types/index.html
-/private
+!addons/shared_addons/field_types/index.html
98 system/cms/config/database.php.bak
View
@@ -0,0 +1,98 @@
+<?php defined('BASEPATH') OR exit('No direct script access allowed');
+/*
+| -------------------------------------------------------------------
+| DATABASE CONNECTIVITY SETTINGS
+| -------------------------------------------------------------------
+| This file will contain the settings needed to access your database.
+|
+| For complete instructions please consult the 'Database Connection'
+| page of the User Guide.
+|
+| -------------------------------------------------------------------
+| EXPLANATION OF VARIABLES
+| -------------------------------------------------------------------
+|
+| ['hostname'] The hostname of your database server.
+| ['username'] The username used to connect to the database
+| ['password'] The password used to connect to the database
+| ['database'] The name of the database you want to connect to
+| ['dbdriver'] The database type. ie: mysql. Currently supported:
+ mysql, mysqli, postgre, odbc, mssql
+| ['dbprefix'] You can add an optional prefix, which will be added
+| to the table name when using the Active Record class
+| ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
+| ['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
+| ['active_r'] TRUE/FALSE - Whether to load the active record class
+| ['cache_on'] TRUE/FALSE - Enables/disables query caching
+| ['cachedir'] The path to the folder where cache files should be stored
+|
+| The $active_group variable lets you choose which connection group to
+| make active. By default there is only one group (the "default" group).
+|
+*/
+
+// Development
+$db[PYRO_DEVELOPMENT] = array(
+ 'hostname' => 'localhost',
+ 'username' => 'root',
+ 'password' => '',
+ 'database' => 'pyrocms',
+ 'dbdriver' => 'mysql',
+ 'dbprefix' => '',
+ 'active_r' => TRUE,
+ 'pconnect' => FALSE,
+ 'db_debug' => TRUE,
+ 'cache_on' => FALSE,
+ 'char_set' => 'utf8',
+ 'dbcollat' => 'utf8_unicode_ci',
+ 'port' => 3306,
+
+ // 'Tough love': Forces strict mode to test your app for best compatibility
+ 'stricton' => TRUE,
+);
+
+// Staging
+/*
+$db[PYRO_STAGING] = array(
+ 'hostname' => '',
+ 'username' => '',
+ 'password' => '',
+ 'database' => 'pyrocms',
+ 'dbdriver' => 'mysql',
+ 'active_r' => TRUE,
+ 'pconnect' => FALSE,
+ 'db_debug' => FALSE,
+ 'cache_on' => FALSE,
+ 'char_set' => 'utf8',
+ 'dbcollat' => 'utf8_unicode_ci',
+ 'port' => 3306,
+);
+*/
+
+// Production
+$db[PYRO_PRODUCTION] = array(
+ 'hostname' => 'localhost',
+ 'username' => 'root',
+ 'password' => '',
+ 'database' => 'pyrocms',
+ 'dbdriver' => 'mysql',
+ 'active_r' => TRUE,
+ 'pconnect' => FALSE,
+ 'db_debug' => FALSE,
+ 'cache_on' => FALSE,
+ 'char_set' => 'utf8',
+ 'dbcollat' => 'utf8_unicode_ci',
+ 'port' => 3306,
+);
+
+
+// Check the configuration group in use exists
+if ( ! array_key_exists(ENVIRONMENT, $db))
+{
+ show_error(sprintf(lang('error_invalid_db_group'), ENVIRONMENT));
+}
+
+// Assign the group to be used
+$active_group = ENVIRONMENT;
+
+/* End of file database.php */
Please sign in to comment.
Something went wrong with that request. Please try again.