Merge remote-tracking branch 'LimeSurvey/master'

.gitattributes

@@ -1,4 +1,16 @@
-* text eol=lf
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Declare files that will always have LF line endings on checkout.
+*.php text eol=lf
+*.css text eol=lf
+*.js text eol=lf
+*.pstpl text eol=lf
+*.html text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
-*.png binary
+*.jpg binary
+*.png binary
+*.gif binary
+*.ico binary
+*.mo binary

.gitignore

@@ -4,3 +4,8 @@
 /upload/templates/*
 /tmp/runtime/HTML
 /application/controllers/admin/updater.php
+/tmp/*.html
+/tmp/*.lss
+/tmp/*.png
+/tmp/*.xls
+/upload/.htaccess

admin/admin.php

@@ -1,16 +1,2 @@
-<?php
-    /*
-    * LimeSurvey
-    * Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
-    * All rights reserved.
-    * License: GNU/GPL License v2 or later, see LICENSE.php
-    * LimeSurvey is free software. This version may have been modified pursuant
-    * to the GNU General Public License, and as distributed it includes or
-    * is derivative of works licensed under the GNU General Public License or
-    * other free or open source software licenses.
-    * See COPYRIGHT.php for copyright notices and details.
-    */
-
-    // Simple redirect to still have the old /admin URL
-    header( 'Location: ../index.php/admin' ) ;
-?>
+<?php
+include 'index.php';

admin/index.php

@@ -1,16 +1,31 @@
 <?php
-    /*
-    * LimeSurvey
-    * Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
-    * All rights reserved.
-    * License: GNU/GPL License v2 or later, see LICENSE.php
-    * LimeSurvey is free software. This version may have been modified pursuant
-    * to the GNU General Public License, and as distributed it includes or
-    * is derivative of works licensed under the GNU General Public License or
-    * other free or open source software licenses.
-    * See COPYRIGHT.php for copyright notices and details.
-    */
+/*
+* LimeSurvey
+* Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
+* All rights reserved.
+* License: GNU/GPL License v2 or later, see LICENSE.php
+* LimeSurvey is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+* See COPYRIGHT.php for copyright notices and details.
+*/
 
-    // Simple redirect to still have the old /admin URL
-    header( 'Location: ../index.php/admin' ) ;
-?>
+$config_folder = dirname(__FILE__) . '/../application/config/';
+$config_file = $config_folder . 'config.php';
+if (!file_exists($config_file))
+{
+    $config_file = $config_folder . 'config-sample-mysql.php';
+}
+define('BASEPATH', dirname(__FILE__) . '/..'); // To prevent direct access not allowed
+$config = require($config_file);
+
+$urlStyle = $config['components']['urlManager']['urlFormat'];
+
+// Simple redirect to still have the old /admin URL
+if ($urlStyle == 'path') {
+    header( 'Location: ../index.php/admin' );
+} else {
+    // For IIS use get style
+    header( 'Location: ../index.php?r=admin' );
+}

application/config/config-defaults.php

@@ -87,7 +87,7 @@
 
 $config['allowedresourcesuploads'] = '7z,aiff,asf,avi,bmp,csv,doc,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,xml,zip,pstpl,css,js';   // File types allowed to be uploaded in the resources sections, and with the HTML Editor
 
-$config['memorylimit']        =  '32';   // This sets how much memory LimeSurvey can access in megabytes. 32 mb is the minimum recommended - if you are using PDF functions up to 64 mb may be needed
+$config['memory_limit']        =  '32';   // This sets how much memory LimeSurvey can access in megabytes. 32 mb is the minimum recommended - if you are using PDF functions up to 64 mb may be needed
 
 $config['showpopups']         =   1;                // Show popup messages if mandatory or conditional questions have not been answered correctly.
 // 1=Show popup message, 0=Show message on page instead.
@@ -320,7 +320,7 @@
 *  This feature configures PDF export for Export Answers
 */
 
-$config['pdfdefaultfont'] = 'freemono';              //Default font for the pdf Export
+$config['pdfdefaultfont'] = 'dejavusans';              //Default font for the pdf Export
 $config['pdffontsize']    = 9;                       //Fontsize for normal text; Surveytitle is +4; grouptitle is +2
 $config['notsupportlanguages'] = array('zh-Hant-TW','zh-Hant-HK','zh-Hans','ja','th');
 $config['pdforientation'] = 'P';                     // Set L for Landscape or P for portrait format
@@ -499,14 +499,20 @@
 */
 $config['RPCInterface'] = 'off';
 
-
 /**
 * This parameter sets the default session expiration time in seconds
 * Default is 8 hours
 * @var integer
 */
 $config['iSessionExpirationTime'] = 28800;
 
+/**
+* This parameter can be used to set some question not selectable in LimeReplacementFiels
+* Default is an empty array, leave it for new question modules system
+* @var array
+*/
+$config['InsertansUnsupportedtypes'] = array();
+
 // === Advanced Setup
 // The following parameters need information from config.php
 // and thus are defined here (After reading your config.php file).