-
Notifications
You must be signed in to change notification settings - Fork 986
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.1' of https://github.com/LimeSurvey/LimeSurvey into 2.1
- Loading branch information
Showing
80 changed files
with
5,503 additions
and
5,774 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <?php if (!defined('BASEPATH')) 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 | ||
| | ------------------------------------------------------------------- | ||
| | | ||
| | 'connectionString' Hostname, database, port and database type for | ||
| | the connection. Driver example: mysql. Currently supported: | ||
| | mysql, pgsql, mssql, sqlite, oci | ||
| | 'username' The username used to connect to the database | ||
| | 'password' The password used to connect to the database | ||
| | 'tablePrefix' You can add an optional prefix, which will be added | ||
| | to the table name when using the Active Record class | ||
| | | ||
| */ | ||
| return array( | ||
| 'basePath' => dirname(dirname(__FILE__)), | ||
| 'runtimePath' => dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'runtime', | ||
| 'name' => 'LimeSurvey', | ||
| 'defaultController' => 'survey', | ||
|
|
||
| 'import' => array( | ||
| 'application.core.*', | ||
| 'application.models.*', | ||
| 'application.controllers.*', | ||
| 'application.modules.*', | ||
| ), | ||
|
|
||
| 'components' => array( | ||
| 'db' => array( | ||
| 'connectionString' => 'pgsql:host=localhost;port=5432;user=postgres;password=somepassword;dbname=limesurvey;', | ||
| 'emulatePrepare' => true, | ||
| 'username' => 'postgres', | ||
| 'password' => 'somepassword', | ||
| 'charset' => 'utf8', | ||
| 'tablePrefix' => 'lime_', | ||
| ), | ||
|
|
||
| // Uncomment the following line if you need table-based sessions | ||
| // 'session' => array ( | ||
| // 'class' => 'system.web.CDbHttpSession', | ||
| // 'connectionID' => 'db', | ||
| // 'sessionTableName' => '{{sessions}}', | ||
| // ), | ||
|
|
||
| 'urlManager' => array( | ||
| 'urlFormat' => 'path', | ||
| 'rules' => require('routes.php'), | ||
| 'showScriptName' => true, | ||
| ), | ||
|
|
||
| ), | ||
| // Use the following config variable to set modified optional settings copied from config-defaults.php | ||
| 'config'=>array( | ||
| // debug: Set this to 1 if you are looking for errors. If you still get no errors after enabling this | ||
| // then please check your error-logs - either in your hosting provider admin panel or in some /logs directory | ||
| // on your webspace. | ||
| // LimeSurvey developers: Set this to 2 to additionally display STRICT PHP error messages and get full access to standard templates | ||
| 'debug'=>0, | ||
| 'debugsql'=>0 // Set this to 1 to enanble sql logging, only active when debug = 2 | ||
| ) | ||
| ); | ||
| /* End of file config.php */ | ||
| /* Location: ./application/config/config.php */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <?php if (!defined('BASEPATH')) 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 | ||
| | ------------------------------------------------------------------- | ||
| | | ||
| | 'connectionString' Hostname, database, port and database type for | ||
| | the connection. Driver example: mysql. Currently supported: | ||
| | mysql, pgsql, mssql, sqlite, oci | ||
| | 'username' The username used to connect to the database | ||
| | 'password' The password used to connect to the database | ||
| | 'tablePrefix' You can add an optional prefix, which will be added | ||
| | to the table name when using the Active Record class | ||
| | | ||
| */ | ||
| return array( | ||
| 'basePath' => dirname(dirname(__FILE__)), | ||
| 'runtimePath' => dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'runtime', | ||
| 'name' => 'LimeSurvey', | ||
| 'defaultController' => 'survey', | ||
|
|
||
| 'import' => array( | ||
| 'application.core.*', | ||
| 'application.models.*', | ||
| 'application.controllers.*', | ||
| 'application.modules.*', | ||
| ), | ||
|
|
||
| 'components' => array( | ||
| 'db' => array( | ||
| 'connectionString' => 'sqlsrv:Server=localhost;Database=limesurvey', | ||
| 'username' => 'sa', | ||
| 'password' => 'somepassword', | ||
| 'charset' => 'utf8', | ||
| 'tablePrefix' => 'lime_', | ||
| 'initSQLs'=>array('SET DATEFORMAT ymd;','SET QUOTED_IDENTIFIER ON;'), | ||
| ), | ||
|
|
||
| // Uncomment the following line if you need table-based sessions | ||
| // 'session' => array ( | ||
| // 'class' => 'system.web.CDbHttpSession', | ||
| // 'connectionID' => 'db', | ||
| // 'sessionTableName' => '{{sessions}}', | ||
| // ), | ||
|
|
||
| 'urlManager' => array( | ||
| 'urlFormat' => 'path', | ||
| 'rules' => require('routes.php'), | ||
| 'showScriptName' => true, | ||
| ), | ||
|
|
||
| ), | ||
| // Use the following config variable to set modified optional settings copied from config-defaults.php | ||
| 'config'=>array( | ||
| // debug: Set this to 1 if you are looking for errors. If you still get no errors after enabling this | ||
| // then please check your error-logs - either in your hosting provider admin panel or in some /logs directory | ||
| // on your webspace. | ||
| // LimeSurvey developers: Set this to 2 to additionally display STRICT PHP error messages and get full access to standard templates | ||
| 'debug'=>0, | ||
| 'debugsql'=>0 // Set this to 1 to enanble sql logging, only active when debug = 2 | ||
| ) | ||
| ); | ||
| /* End of file config.php */ | ||
| /* Location: ./application/config/config.php */ |
Oops, something went wrong.