Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
- Loading branch information
Showing
361 changed files
with
19,405 additions
and
18,046 deletions.
There are no files selected for viewing
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,16 @@ | ||
| # 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. | ||
| *.jpg binary | ||
| *.png binary | ||
| *.gif binary | ||
| *.ico binary | ||
| *.mo binary |
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 |
|---|---|---|
| @@ -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'; |
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 |
|---|---|---|
| @@ -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' ); | ||
| } |
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,48 @@ | ||
| #!/usr/bin/php | ||
| <?php | ||
| /* | ||
| * LimeSurvey (tm) | ||
| * Copyright (C) 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. | ||
| * | ||
| * | ||
| * File edited by Sam Mousa for Marcel Minke. | ||
| * This loader bypasses the default Yii loader and loads a custom console class instead. | ||
| */ | ||
| if (!isset($argv[0])) die(); | ||
| define('BASEPATH','.'); | ||
|
|
||
| // Load configuration. | ||
| $sCurrentDir=dirname(__FILE__); | ||
| $config=require (dirname($sCurrentDir).DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); | ||
| $core = dirname($sCurrentDir) . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR; | ||
| unset ($config['defaultController']); | ||
| unset ($config['config']); | ||
|
|
||
|
|
||
|
|
||
| // fix for fcgi | ||
| defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); | ||
|
|
||
| defined('YII_DEBUG') or define('YII_DEBUG',true); | ||
|
|
||
| require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'framework' . DIRECTORY_SEPARATOR . 'yii.php'); | ||
|
|
||
| if(isset($config)) | ||
| { | ||
| require_once($core . 'ConsoleApplication.php'); | ||
| $app=Yii::createApplication('ConsoleApplication', $config); | ||
| define('APPPATH', Yii::app()->getBasePath() . DIRECTORY_SEPARATOR); | ||
| $app->commandRunner->addCommands(YII_PATH.'/cli/commands'); | ||
| $env=@getenv('YII_CONSOLE_COMMANDS'); | ||
| if(!empty($env)) | ||
| $app->commandRunner->addCommands($env); | ||
| } | ||
| $app->run(); | ||
| ?> |
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
Oops, something went wrong.