Dev: manual merge with 2.06 - config

LimeSurvey · Dec 22, 2015 · 9485ef8 · 9485ef8
1 parent 83a41a9
commit 9485ef8
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 56 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -82,7 +82,7 @@
 $config['userideditable']     =  'N';               // Allow editing of user IDs
 $config['defaulttemplate']    =  'default';         // This setting specifys the default theme used for the 'public list' of surveys
 
-$config['allowedtemplateuploads'] = 'gif,ico,jpg,png,css,js,,map,json,eot,svg,ttf,woff';  // File types allowed to be uploaded in the templates section.
+$config['allowedtemplateuploads'] = 'gif,ico,jpg,png,css,js,map,json,eot,svg,ttf,woff,txt,md';  // File types allowed to be uploaded in the templates section.
 
 $config['allowedresourcesuploads'] = '7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,ico,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,xml,zip,pstpl,css,js';   // File types allowed to be uploaded in the resources sections, and with the HTML Editor
 
@@ -512,6 +512,13 @@
 
 $config['googleMapsAPIKey'] = '';
 
+/**
+* GeoNames username for API. http://www.geonames.org/export/web-services.html
+* default limesurvey username is limited to 2000 credits/hour and 30 000 crdits/day see : http://www.geonames.org/export/ Terms and conditions
+*/
+$config['GeoNamesUsername'] = 'limesurvey';
+
+
 // Google Translate API key:  https://code.google.com/apis/language/translate/v2/getting_started.html
 $googletranslateapikey = '';
 

diff --git a/application/config/config-sample-mysql.php b/application/config/config-sample-mysql.php
@@ -22,24 +22,24 @@
 |
 */
 return array(
-	'components' => array(
-		'db' => array(
-			'connectionString' => 'mysql:host=localhost;port=3306;dbname=limesurvey;',
-			'emulatePrepare' => true,
-			'username' => 'root',
-			'password' => '',
-			'charset' => 'utf8',
-			'tablePrefix' => 'lime_',
-		),
+    'components' => array(
+        'db' => array(
+            'connectionString' => 'mysql:host=localhost;port=3306;dbname=limesurvey;',
+            'emulatePrepare' => true,
+            'username' => 'root',
+            'password' => '',
+            'charset' => 'utf8',
+            'tablePrefix' => 'lime_',
+        ),
 // Uncomment the following section if you wish to store sessions in the database
 // rather than in files.
 // Make sure MySQL max_allowed_packet setting is large enough, some surveys generate over 2 MB of session data.
 /*
-		'session' => array (
-			'class' => 'system.web.CDbHttpSession',
-			'connectionID' => 'db',
-			'sessionTableName' => '{{sessions}}',
-		),
+        'session' => array (
+            'class' => 'system.web.CDbHttpSession',
+            'connectionID' => 'db',
+            'sessionTableName' => '{{sessions}}',
+        ),
         */
         'urlManager' => array(
             'urlFormat' => 'get',

diff --git a/application/config/config-sample-pgsql.php b/application/config/config-sample-pgsql.php
@@ -12,50 +12,52 @@
 | 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
+|    '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(
-	'name' => 'LimeSurvey',
-	'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' => 'get',
-			'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
-	)
+    'name' => 'LimeSurvey',
+    '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' => 'get',
+            'rules' => array(
+            // You can put your own rules here
+            ),
+            '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 */