0.7.8 Browse the docs button display pages without the css style

application/config/application.php

@@ -3,11 +3,11 @@
  * Bonfire
  *
  * An open source project to allow developers to jumpstart their development of
- * CodeIgniter applications
+ * CodeIgniter applications.
  *
  * @package   Bonfire
  * @author    Bonfire Dev Team
- * @copyright Copyright (c) 2011 - 2014, Bonfire Dev Team
+ * @copyright Copyright (c) 2011 - 2015, Bonfire Dev Team
  * @license   http://opensource.org/licenses/MIT    The MIT License
  * @link      http://cibonfire.com
  * @since     Version 1.0
@@ -19,16 +19,15 @@
  */
 $config['site.default_user_timezone'] = 'UM8';
 
-//--------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // Module Locations
-//--------------------------------------------------------------------
-// These paths are checked in the order listed whenever a module is
-// attempting to be located, whether it's loading a library, helper,
-// or routes file.
+//------------------------------------------------------------------------------
+// These paths are checked in the order listed when attempting to locate a module,
+// whether loading a library, helper, or routes file.
 //
 $config['modules_locations'] = array(
     realpath(APPPATH) . '/modules/' => '../../application/modules/',
-    realpath(APPPATH . '../bonfire') . '/modules/' => '../../bonfire/modules/',
+    realpath(BFPATH) . '/modules/' => '../../bonfire/modules/',
 );
 
 //------------------------------------------------------------------------------

application/config/autoload.php

@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') || exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------
@@ -39,7 +39,6 @@
 |  $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
 |
 */
-
 $autoload['packages'] = array(
 		realpath(APPPATH .'../bonfire'),	// Bonfire Core
     APPPATH . 'third_party',          // App -specific 3rd-party libs.
@@ -49,8 +48,9 @@
 | -------------------------------------------------------------------
 |  Auto-load Libraries
 | -------------------------------------------------------------------
-| These are the classes located in the system/libraries folder
-| or in your application/libraries folder.
+| These are the classes located in system/libraries/ or your
+| application/libraries/ directory, with the addition of the
+| 'database' library, which is somewhat of a special case.
 |
 | Prototype:
 |
@@ -61,23 +61,22 @@
 |
 |	$autoload['libraries'] = array('user_agent' => 'ua');
 */
-
 $autoload['libraries'] = array('database');
 
 
 /*
 | -------------------------------------------------------------------
 |  Auto-load Drivers
 | -------------------------------------------------------------------
-| These classes are located in the system/libraries folder or in your
-| application/libraries folder within their own subdirectory. They
+| These classes are located in system/libraries/ or in your
+| application/libraries/ directory, but are also placed inside their
+| own subdirectory and they extend the CI_Driver_Library class. They
 | offer multiple interchangeable driver options.
 |
 | Prototype:
 |
 |	$autoload['drivers'] = array('cache');
 */
-
 $autoload['drivers'] = array();
 
 /*
@@ -88,7 +87,6 @@
 |
 |	$autoload['helper'] = array('url', 'file');
 */
-
 $autoload['helper'] = array('url', 'language');
 
 /*
@@ -103,7 +101,6 @@
 | config files.  Otherwise, leave it blank.
 |
 */
-
 $autoload['config'] = array('application');
 
 /*
@@ -118,7 +115,6 @@
 | "codeigniter_lang.php" would be referenced as array('codeigniter');
 |
 */
-
 $autoload['language'] = array();
 
 /*
@@ -127,12 +123,11 @@
 | -------------------------------------------------------------------
 | Prototype:
 |
-|	$autoload['model'] = array('model1', 'model2');
+|	$autoload['model'] = array('first_model', 'second_model');
 |
 | You can also supply an alternative model name to be assigned
 | in the controller:
 |
 |	$autoload['model'] = array('first_model' => 'first');
 */
-
 $autoload['model'] = array();

application/config/config.php

@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') || exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -37,15 +37,16 @@
 |--------------------------------------------------------------------------
 |
 | This item determines which server global should be used to retrieve the
-| URI string.  The default setting of 'AUTO' works for most servers.
+| URI string.  The default setting of 'REQUEST_URI' works for most servers.
 | If your links do not seem to work, try one of the other delicious flavors:
 |
-| 'AUTO'		Default - auto detects
+| 'AUTO'		    auto detects
 | 'CLI' or 'argv'	Uses $_SERVER['argv'] (for php-cli only) // CI3
-| 'PATH_INFO'		Uses $_SERVER['PATH_INFO']
 | 'REQUEST_URI'		Uses $_SERVER['REQUEST_URI']
 | 'QUERY_STRING'	Uses $_SERVER['QUERY_STRING']
+| 'PATH_INFO'		Uses $_SERVER['PATH_INFO']
 |
+| WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
  */
 $config['uri_protocol']	= 'AUTO';
 
@@ -192,8 +193,6 @@
 | Error Logging Threshold
 |--------------------------------------------------------------------------
 |
-| If you have enabled error logging, you can set an error threshold to
-| determine what gets logged. Threshold options are:
 | You can enable error logging by setting a threshold over zero. The
 | threshold determines what gets logged. Threshold options are:
 |
@@ -203,7 +202,7 @@
 |	3 = Informational Messages
 |	4 = All Messages
 |
-| You can also pass in a array with threshold levels to show individual error types
+| You can also pass an array with threshold levels to show individual error types
 |
 | 	array(2) = Debug Messages, without Error Messages
 |
@@ -272,7 +271,6 @@
 */
 $config['error_views_path'] = '';
 
-
 /*
 |--------------------------------------------------------------------------
 | Cache Directory Path
@@ -289,8 +287,15 @@
 | Cache Include Query String (CI3)
 |--------------------------------------------------------------------------
 |
-| Set this to TRUE if you want to use different cache files depending on the
-| URL query string.  Please be aware this might result in numerous cache files.
+| Whether to take the URL query string into consideration when generating
+| output cache files. Valid options are:
+|
+|	FALSE      = Disabled
+|	TRUE       = Enabled, take all query parameters into account.
+|	             Please be aware that this may result in numerous cache
+|	             files generated for the same page over and over again.
+|	array('q') = Enabled, but only take into account the specified list
+|	             of query parameters.
 |
  */
 $config['cache_query_string'] = false;
@@ -309,9 +314,9 @@
 $config['encryption_key'] = "58f62e7a5c072527eb00fad7ccb6f547";
 
 /*
-|------------------------------------------------------------------------------
+|--------------------------------------------------------------------------
 | Session Variables
-|------------------------------------------------------------------------------
+|--------------------------------------------------------------------------
 | (CI2)
 | 'sess_cookie_name'     = the name you want for the cookie
 | 'sess_expiration'      = the number of SECONDS you want the session to last.
@@ -342,7 +347,7 @@
 |
 | 'sess_save_path'
 |
-|	The location to save sessions to, driver dependant.
+|	The location to save sessions to, driver dependent.
 |
 |	For the 'files' driver, it's a path to a writable directory.
 |   WARNING: Only absolute paths are supported!
@@ -352,10 +357,17 @@
 |
 |	IMPORTANT: You are REQUIRED to set a valid save path!
 |
+|   Bonfire note: If you use a different database table name in 'sess_save_path', update
+|   /bonfire/migrations/043_Add_ci3_sessions.php
+|   accordingly or create the table manually.
+|
 | 'sess_match_ip'
 |
 |	Whether to match the user's IP address when reading the session data.
 |
+|	WARNING: If you're using the database driver, don't forget to update
+|	         your session table's PRIMARY KEY when changing this setting.
+|
 | 'sess_time_to_update'
 |
 |	How many seconds between CI regenerating the session ID.
@@ -386,10 +398,6 @@
 // CI 3 Session Variables
 $config['sess_driver'] = 'database';
 $config['sess_regenerate_destroy'] = false;
-
-// If you use a different database table name, update
-// /bonfire/migrations/043_Add_ci3_sessions.php
-// accordingly or create the table manually.
 $config['sess_save_path'] = 'ci3_sessions';
 
 /*
@@ -419,7 +427,7 @@
 |--------------------------------------------------------------------------
 |
 | Determines whether to standardize newline characters in input data,
-| meaning to replace \r\n, \r, \n occurences with the PHP_EOL value.
+| meaning to replace \r\n, \r, \n occurrences with the PHP_EOL value.
 |
 | This is particularly useful for portability between UNIX-based OSes,
 | (usually \n) and Windows (\r\n).
@@ -434,6 +442,9 @@
 |
 | Determines whether the XSS filter is always active when GET, POST or
 | COOKIE data is encountered
+|
+| WARNING: This feature is DEPRECATED in CI3 and currently available only
+|          for backwards compatibility purposes!
 |
  */
 $config['global_xss_filtering'] = false;
@@ -502,6 +513,8 @@
 | If your PHP installation does not have short tag support enabled CI
 | can rewrite the tags on-the-fly, enabling you to utilize that syntax
 | in your view files.  Options are TRUE or FALSE (boolean)
+|
+| Note: You need to have eval() enabled for this to work.
 |
  */
 $config['rewrite_short_tags'] = false;

application/config/constants.php

@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') || exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -14,10 +14,10 @@
 | always be used to set the mode correctly.
 |
 */
-define('FILE_READ_MODE', 0644);
-define('FILE_WRITE_MODE', 0666);
-define('DIR_READ_MODE', 0755);
-define('DIR_WRITE_MODE', 0777);
+defined('FILE_READ_MODE')  || define('FILE_READ_MODE', 0644);
+defined('FILE_WRITE_MODE') || define('FILE_WRITE_MODE', 0666);
+defined('DIR_READ_MODE')   || define('DIR_READ_MODE', 0755);
+defined('DIR_WRITE_MODE')  || define('DIR_WRITE_MODE', 0775);
 
 /*
 |--------------------------------------------------------------------------
@@ -27,15 +27,14 @@
 | These modes are used when working with fopen()/popen()
 |
 */
-
-define('FOPEN_READ', 'rb');
-define('FOPEN_READ_WRITE', 'r+b');
-define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
-define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
-define('FOPEN_WRITE_CREATE', 'ab');
-define('FOPEN_READ_WRITE_CREATE', 'a+b');
-define('FOPEN_WRITE_CREATE_STRICT', 'xb');
-define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
+defined('FOPEN_READ')                          || define('FOPEN_READ', 'rb');
+defined('FOPEN_READ_WRITE')                    || define('FOPEN_READ_WRITE', 'r+b');
+defined('FOPEN_WRITE_CREATE_DESTRUCTIVE')      || define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
+defined('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE') || define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
+defined('FOPEN_WRITE_CREATE')                  || define('FOPEN_WRITE_CREATE', 'ab');
+defined('FOPEN_READ_WRITE_CREATE')             || define('FOPEN_READ_WRITE_CREATE', 'a+b');
+defined('FOPEN_WRITE_CREATE_STRICT')           || define('FOPEN_WRITE_CREATE_STRICT', 'xb');
+defined('FOPEN_READ_WRITE_CREATE_STRICT')      || define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
 
 // -----------------------------------------------------------------------------
 // CI3 Constants - These may not be honored by the system (especially SHOW_DEBUG_BACKTRACE),
@@ -52,7 +51,8 @@
 | of this setting
 |
 */
-define('SHOW_DEBUG_BACKTRACE', true);
+defined('SHOW_DEBUG_BACKTRACE') || define('SHOW_DEBUG_BACKTRACE', true);
+
 /*
 |--------------------------------------------------------------------------
 | Exit Status Codes
@@ -78,29 +78,28 @@
 | http://tldp.org/LDP/abs/html/exitcodes.html
 |
 */
-define('EXIT_SUCCESS', 0); // no errors
-define('EXIT_ERROR', 1); // generic error
-define('EXIT_CONFIG', 3); // configuration error
-define('EXIT_UNKNOWN_FILE', 4); // file not found
-define('EXIT_UNKNOWN_CLASS', 5); // unknown class
-define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
-define('EXIT_USER_INPUT', 7); // invalid user input
-define('EXIT_DATABASE', 8); // database error
-define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
-define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
+defined('EXIT_SUCCESS')        || define('EXIT_SUCCESS', 0); // no errors
+defined('EXIT_ERROR')          || define('EXIT_ERROR', 1); // generic error
+defined('EXIT_CONFIG')         || define('EXIT_CONFIG', 3); // configuration error
+defined('EXIT_UNKNOWN_FILE')   || define('EXIT_UNKNOWN_FILE', 4); // file not found
+defined('EXIT_UNKNOWN_CLASS')  || define('EXIT_UNKNOWN_CLASS', 5); // unknown class
+defined('EXIT_UNKNOWN_METHOD') || define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
+defined('EXIT_USER_INPUT')     || define('EXIT_USER_INPUT', 7); // invalid user input
+defined('EXIT_DATABASE')       || define('EXIT_DATABASE', 8); // database error
+defined('EXIT__AUTO_MIN')      || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
+defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
 
 // -----------------------------------------------------------------------------
 // Bonfire-specific Constants
 // -----------------------------------------------------------------------------
-
-define('BONFIRE_VERSION', 'v0.7.4');
+defined('BONFIRE_VERSION') || define('BONFIRE_VERSION', 'v0.7.8');
 
 // -----------------------------------------------------------------------------
 // The 'App Area' allows you to specify the base folder used for all of the contexts
 // in the app. By default, this is set to '/admin', but this does not make sense
 // for all applications.
 // -----------------------------------------------------------------------------
-define('SITE_AREA', 'admin');
+defined('SITE_AREA') || define('SITE_AREA', 'admin');
 
 // -----------------------------------------------------------------------------
 // The 'LOGIN_URL' and 'REGISTER_URL' constant allows changing of the url where
@@ -116,10 +115,10 @@
 // The 'IS_AJAX' constant allows for a quick simple test as to whether the current
 // request was made with XHR.
 // -----------------------------------------------------------------------------
-// @todo Shouldn't this work without the "? true : false" portion?
 //
-$ajax_request = (! empty($_SERVER['HTTP_X_REQUESTED_WITH'])
-        && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest'
-    ) ? true : false;
-define('IS_AJAX', $ajax_request);
-unset($ajax_request);
+if (! defined('IS_AJAX')) {
+    $ajax_request = ! empty($_SERVER['HTTP_X_REQUESTED_WITH'])
+        && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest';
+    define('IS_AJAX', $ajax_request);
+    unset($ajax_request);
+}