issue34-config-file-location - add config option for composer

installations so that config is outside vendor/ folder

issue34-config-file-location - added updates to readme

issue34-config-file-location - refactor config locations

Author: stephenlawrence

libs/csrf/csrfprotector.php

@@ -104,11 +104,22 @@ public static function init($length = null, $action = null)
 			if (session_id() == '')
 			    session_start();
 
-			if (!file_exists(__DIR__ ."/../config.php"))
-				throw new configFileNotFoundException("OWASP CSRFProtector: configuration file not found for CSRFProtector!");	
+			/*
+			 * load configuration file and properties
+			 * Check locally for a config.php then check for 
+			 * a config/csrf_config.php file in the root folder
+			 * for composer installations
+			 */
+			$standard_config_location = __DIR__ ."/../config.php";
+			$composer_config_location = __DIR__ ."/../../../../../config/csrf_config.php";
 
-			//load configuration file and properties
-			self::$config = include(__DIR__ ."/../config.php");
+			if (file_exists($standard_config_location)) {
+				self::$config = include($standard_config_location);
+			} elseif(file_exists($composer_config_location)) {
+				self::$config = include($composer_config_location);
+			} else {
+				throw new configFileNotFoundException("OWASP CSRFProtector: configuration file not found for CSRFProtector!");
+			}
 
 			//overriding length property if passed in parameters
 			if ($length != null)

readme.md

@@ -23,6 +23,12 @@ php composer.phar install
 ```
 This will add CSRFP (library will be downloaded at ./vendor/owasp/csrf-protector-php) to your project directory. View [packagist.org](https://packagist.org/) for more help with composer!
 
+Configuration
+==========
+For composer installations: Copy the config.sample.php file into your root folder at config/csrf_config.php
+For non-composer installations: Copy the libs/csrf/config.sample.php file into libs/csrc/config.php
+Edit config accordingly. See Detailed Information link below.
+
 How to use
 ==========
 ```php