update pMachine to EllisLab

update copyright year
update Code Igniter to CodeIgniter

2 files changed, 362 insertions, 362 deletions

diff --git a/system/application/config/config.php b/system/application/config/config.php
index b1598b341..3bb9d1d23 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -1,302 +1,302 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-/*
-|--------------------------------------------------------------------------
-| Base Site URL
-|--------------------------------------------------------------------------
-|
-| URL to your Code Igniter root. Typically this will be your base URL,
-| WITH a trailing slash:
-|
-|	http://www.your-site.com/
-|
-*/
-$config['base_url']	= "http://127.0.0.1/CodeIgniter/";
-
-/*
-|--------------------------------------------------------------------------
-| Index File
-|--------------------------------------------------------------------------
-|
-| Typically this will be your index.php file, unless you've renamed it to
-| something else. If you are using mod_rewrite to remove the page set this
-| variable so that it is blank.
-|
-*/
-$config['index_page'] = "index.php";
-
-/*
-|--------------------------------------------------------------------------
-| URI PROTOCOL
-|--------------------------------------------------------------------------
-|
-| This item determines which server global should be used to retrieve the
-| URI string.  The default setting of "AUTO" works for most servers.
-| If your links do not seem to work, try one of the other delicious flavors:
-|
-| 'AUTO'			Default - auto detects
-| 'PATH_INFO'		Uses the PATH_INFO
-| 'QUERY_STRING'	Uses the QUERY_STRING
-| 'REQUEST_URI'		Uses the REQUEST_URI
-| 'ORIG_PATH_INFO'	Uses the ORIG_PATH_INFO
-|
-*/
-$config['uri_protocol']	= "AUTO";
-
-/*
-|--------------------------------------------------------------------------
-| URL suffix
-|--------------------------------------------------------------------------
-|
-| This option allows you to add a suffix to all URLs generated by Code Igniter.
-| For more information please see the user guide:
-|
-| http://www.codeigniter.com/user_guide/general/urls.html
-*/
-
-$config['url_suffix'] = "";
-
-/*
-|--------------------------------------------------------------------------
-| Default Language
-|--------------------------------------------------------------------------
-|
-| This determines which set of language files should be used. Make sure
-| there is an available translation if you intend to use something other
-| than english.
-|
-*/
-$config['language']	= "english";
-
-
-/*
-|--------------------------------------------------------------------------
-| Enable/Disable System Hooks
-|--------------------------------------------------------------------------
-|
-| If you would like to use the "hooks" feature you must enable it by
-| setting this variable to TRUE (boolean).  See the user guide for details.
-|
-*/
-$config['enable_hooks'] = FALSE;
-
-
-/*
-|--------------------------------------------------------------------------
-| Class Extension Prefix
-|--------------------------------------------------------------------------
-|
-| This item allows you to set the filename/classname prefix when extending
-| native libraries.  For more information please see the user guide:
-|
-| http://www.codeigniter.com/user_guide/general/core_classes.html
-| http://www.codeigniter.com/user_guide/general/creating_libraries.html
-|
-*/
-$config['subclass_prefix'] = 'MY_';
-
-
-/*
-|--------------------------------------------------------------------------
-| Allowed URL Characters
-|--------------------------------------------------------------------------
-|
-| This lets you specify which characters are permitted within your URLs.
-| When someone tries to submit a URL with disallowed characters they will
-| get a warning message.
-|
-| As a security measure you are STRONGLY encouraged to restrict URLs to
-| as few characters as possible.  By default only these are allowed: a-z 0-9~%.:_-
-|
-| Leave blank to allow all characters -- but only if you are insane.
-|
-| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
-|
-*/
-$config['permitted_uri_chars'] = 'a-z 0-9~%.:_-';
-
-
-/*
-|--------------------------------------------------------------------------
-| Enable Query Strings
-|--------------------------------------------------------------------------
-|
-| By default Code Igniter uses search-engine friendly segment based URLs:
-| www.your-site.com/who/what/where/
-|
-| You can optionally enable standard query string based URLs:
-| www.your-site.com?who=me&what=something&where=here
-|
-| Options are: TRUE or FALSE (boolean)
-|
-| The two other items let you set the query string "words" that will
-| invoke your controllers and its functions:
-| www.your-site.com/index.php?c=controller&m=function
-|
-| Please note that some of the helpers won't work as expected when
-| this feature is enabled, since Code Igniter is designed primarily to
-| use segment based URLs.
-|
-*/
-$config['enable_query_strings'] = FALSE;
-$config['controller_trigger'] = 'c';
-$config['function_trigger'] = 'm';
-
-/*
-|--------------------------------------------------------------------------
-| 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:
-|
-|	0 = Disables logging
-| 	0 = Error logging TURNED OFF
-|	1 = Error Messages (including PHP errors)
-|	2 = Debug Messages
-|	3 = Informational Messages
-|	4 = All Messages
-|
-| For a live site you'll usually only enable Errors (1) to be logged otherwise
-| your log files will fill up very fast.
-|
-*/
-$config['log_threshold'] = 0;
-
-/*
-|--------------------------------------------------------------------------
-| Error Logging Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| system/logs/ folder.  Use a full server path with trailing slash.
-|
-*/
-$config['log_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Date Format for Logs
-|--------------------------------------------------------------------------
-|
-| Each item that is logged has an associated date. You can use PHP date
-| codes to set your own date formatting
-|
-*/
-$config['log_date_format'] = 'Y-m-d H:i:s';
-
-/*
-|--------------------------------------------------------------------------
-| Cache Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| system/cache/ folder.  Use a full server path with trailing slash.
-|
-*/
-$config['cache_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Encryption Key
-|--------------------------------------------------------------------------
-|
-| If you use the Encryption class or the Sessions class with encryption
-| enabled you MUST set an encryption key.  See the user guide for info.
-|
-*/
-$config['encryption_key'] = "";
-
-/*
-|--------------------------------------------------------------------------
-| Session Variables
-|--------------------------------------------------------------------------
-|
-| 'session_cookie_name' = the name you want for the cookie
-| 'encrypt_sess_cookie' = TRUE/FALSE (boolean).  Whether to encrypt the cookie
-| 'session_expiration'  = the number of SECONDS you want the session to last.
-|  by default sessions last 7200 seconds (two hours).  Set to zero for no expiration.
-|
-*/
-$config['sess_cookie_name']		= 'ci_session';
-$config['sess_expiration']		= 7200;
-$config['sess_encrypt_cookie']	= FALSE;
-$config['sess_use_database']	= FALSE;
-$config['sess_table_name']		= 'ci_sessions';
-$config['sess_match_ip']		= FALSE;
-$config['sess_match_useragent']	= TRUE;
-
-/*
-|--------------------------------------------------------------------------
-| Cookie Related Variables
-|--------------------------------------------------------------------------
-|
-| 'cookie_prefix' = Set a prefix if you need to avoid collisions
-| 'cookie_domain' = Set to .your-domain.com for site-wide cookies
-| 'cookie_path'   =  Typically will be a forward slash
-|
-*/
-$config['cookie_prefix']	= "";
-$config['cookie_domain']	= "";
-$config['cookie_path']		= "/";
-
-/*
-|--------------------------------------------------------------------------
-| Global XSS Filtering
-|--------------------------------------------------------------------------
-|
-| Determines whether the XSS filter is always active when GET, POST or
-| COOKIE data is encountered
-|
-*/
-$config['global_xss_filtering'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Output Compression
-|--------------------------------------------------------------------------
-|
-| Enables Gzip output compression for faster page loads.  When enabled,
-| the output class will test whether your server supports Gzip.
-| Even if it does, however, not all browsers support compression
-| so enable only if you are reasonably sure your visitors can handle it.
-|
-| VERY IMPORTANT:  If you are getting a blank page when compression is enabled it
-| means you are prematurely outputting something to your browser. It could
-| even be a line of whitespace at the end of one of your scripts.  For
-| compression to work, nothing can be sent before the output buffer is called
-| by the output class.  Do not "echo" any values with compression enabled.
-|
-*/
-$config['compress_output'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Master Time Reference
-|--------------------------------------------------------------------------
-|
-| Options are "local" or "gmt".  This pref tells the system whether to use
-| your server's local time as the master "now" reference, or convert it to
-| GMT.  See the "date helper" page of the user guide for information
-| regarding date handling.
-|
-*/
-$config['time_reference'] = 'local';
-
-
-/*
-|--------------------------------------------------------------------------
-| Rewrite PHP Short Tags
-|--------------------------------------------------------------------------
-|
-| 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)
-|
-*/
-$config['rewrite_short_tags'] = FALSE;
-
-
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+

+/*

+|--------------------------------------------------------------------------

+| Base Site URL

+|--------------------------------------------------------------------------

+|

+| URL to your CodeIgniter root. Typically this will be your base URL,

+| WITH a trailing slash:

+|

+|	http://www.your-site.com/

+|

+*/

+$config['base_url']	= "http://127.0.0.1/CodeIgniter/";

+

+/*

+|--------------------------------------------------------------------------

+| Index File

+|--------------------------------------------------------------------------

+|

+| Typically this will be your index.php file, unless you've renamed it to

+| something else. If you are using mod_rewrite to remove the page set this

+| variable so that it is blank.

+|

+*/

+$config['index_page'] = "index.php";

+

+/*

+|--------------------------------------------------------------------------

+| URI PROTOCOL

+|--------------------------------------------------------------------------

+|

+| This item determines which server global should be used to retrieve the

+| URI string.  The default setting of "AUTO" works for most servers.

+| If your links do not seem to work, try one of the other delicious flavors:

+|

+| 'AUTO'			Default - auto detects

+| 'PATH_INFO'		Uses the PATH_INFO

+| 'QUERY_STRING'	Uses the QUERY_STRING

+| 'REQUEST_URI'		Uses the REQUEST_URI

+| 'ORIG_PATH_INFO'	Uses the ORIG_PATH_INFO

+|

+*/

+$config['uri_protocol']	= "AUTO";

+

+/*

+|--------------------------------------------------------------------------

+| URL suffix

+|--------------------------------------------------------------------------

+|

+| This option allows you to add a suffix to all URLs generated by CodeIgniter.

+| For more information please see the user guide:

+|

+| http://www.codeigniter.com/user_guide/general/urls.html

+*/

+

+$config['url_suffix'] = "";

+

+/*

+|--------------------------------------------------------------------------

+| Default Language

+|--------------------------------------------------------------------------

+|

+| This determines which set of language files should be used. Make sure

+| there is an available translation if you intend to use something other

+| than english.

+|

+*/

+$config['language']	= "english";

+

+

+/*

+|--------------------------------------------------------------------------

+| Enable/Disable System Hooks

+|--------------------------------------------------------------------------

+|

+| If you would like to use the "hooks" feature you must enable it by

+| setting this variable to TRUE (boolean).  See the user guide for details.

+|

+*/

+$config['enable_hooks'] = FALSE;

+

+

+/*

+|--------------------------------------------------------------------------

+| Class Extension Prefix

+|--------------------------------------------------------------------------

+|

+| This item allows you to set the filename/classname prefix when extending

+| native libraries.  For more information please see the user guide:

+|

+| http://www.codeigniter.com/user_guide/general/core_classes.html

+| http://www.codeigniter.com/user_guide/general/creating_libraries.html

+|

+*/

+$config['subclass_prefix'] = 'MY_';

+

+

+/*

+|--------------------------------------------------------------------------

+| Allowed URL Characters

+|--------------------------------------------------------------------------

+|

+| This lets you specify which characters are permitted within your URLs.

+| When someone tries to submit a URL with disallowed characters they will

+| get a warning message.

+|

+| As a security measure you are STRONGLY encouraged to restrict URLs to

+| as few characters as possible.  By default only these are allowed: a-z 0-9~%.:_-

+|

+| Leave blank to allow all characters -- but only if you are insane.

+|

+| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!

+|

+*/

+$config['permitted_uri_chars'] = 'a-z 0-9~%.:_-';

+

+

+/*

+|--------------------------------------------------------------------------

+| Enable Query Strings

+|--------------------------------------------------------------------------

+|

+| By default CodeIgniter uses search-engine friendly segment based URLs:

+| www.your-site.com/who/what/where/

+|

+| You can optionally enable standard query string based URLs:

+| www.your-site.com?who=me&what=something&where=here

+|

+| Options are: TRUE or FALSE (boolean)

+|

+| The two other items let you set the query string "words" that will

+| invoke your controllers and its functions:

+| www.your-site.com/index.php?c=controller&m=function

+|

+| Please note that some of the helpers won't work as expected when

+| this feature is enabled, since CodeIgniter is designed primarily to

+| use segment based URLs.

+|

+*/

+$config['enable_query_strings'] = FALSE;

+$config['controller_trigger'] = 'c';

+$config['function_trigger'] = 'm';

+

+/*

+|--------------------------------------------------------------------------

+| 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:

+|

+|	0 = Disables logging

+| 	0 = Error logging TURNED OFF

+|	1 = Error Messages (including PHP errors)

+|	2 = Debug Messages

+|	3 = Informational Messages

+|	4 = All Messages

+|

+| For a live site you'll usually only enable Errors (1) to be logged otherwise

+| your log files will fill up very fast.

+|

+*/

+$config['log_threshold'] = 0;

+

+/*

+|--------------------------------------------------------------------------

+| Error Logging Directory Path

+|--------------------------------------------------------------------------

+|

+| Leave this BLANK unless you would like to set something other than the default

+| system/logs/ folder.  Use a full server path with trailing slash.

+|

+*/

+$config['log_path'] = '';

+

+/*

+|--------------------------------------------------------------------------

+| Date Format for Logs

+|--------------------------------------------------------------------------

+|

+| Each item that is logged has an associated date. You can use PHP date

+| codes to set your own date formatting

+|

+*/

+$config['log_date_format'] = 'Y-m-d H:i:s';

+

+/*

+|--------------------------------------------------------------------------

+| Cache Directory Path

+|--------------------------------------------------------------------------

+|

+| Leave this BLANK unless you would like to set something other than the default

+| system/cache/ folder.  Use a full server path with trailing slash.

+|

+*/

+$config['cache_path'] = '';

+

+/*

+|--------------------------------------------------------------------------

+| Encryption Key

+|--------------------------------------------------------------------------

+|

+| If you use the Encryption class or the Sessions class with encryption

+| enabled you MUST set an encryption key.  See the user guide for info.

+|

+*/

+$config['encryption_key'] = "";

+

+/*

+|--------------------------------------------------------------------------

+| Session Variables

+|--------------------------------------------------------------------------

+|

+| 'session_cookie_name' = the name you want for the cookie

+| 'encrypt_sess_cookie' = TRUE/FALSE (boolean).  Whether to encrypt the cookie

+| 'session_expiration'  = the number of SECONDS you want the session to last.

+|  by default sessions last 7200 seconds (two hours).  Set to zero for no expiration.

+|

+*/

+$config['sess_cookie_name']		= 'ci_session';

+$config['sess_expiration']		= 7200;

+$config['sess_encrypt_cookie']	= FALSE;

+$config['sess_use_database']	= FALSE;

+$config['sess_table_name']		= 'ci_sessions';

+$config['sess_match_ip']		= FALSE;

+$config['sess_match_useragent']	= TRUE;

+

+/*

+|--------------------------------------------------------------------------

+| Cookie Related Variables

+|--------------------------------------------------------------------------

+|

+| 'cookie_prefix' = Set a prefix if you need to avoid collisions

+| 'cookie_domain' = Set to .your-domain.com for site-wide cookies

+| 'cookie_path'   =  Typically will be a forward slash

+|

+*/

+$config['cookie_prefix']	= "";

+$config['cookie_domain']	= "";

+$config['cookie_path']		= "/";

+

+/*

+|--------------------------------------------------------------------------

+| Global XSS Filtering

+|--------------------------------------------------------------------------

+|

+| Determines whether the XSS filter is always active when GET, POST or

+| COOKIE data is encountered

+|

+*/

+$config['global_xss_filtering'] = FALSE;

+

+/*

+|--------------------------------------------------------------------------

+| Output Compression

+|--------------------------------------------------------------------------

+|

+| Enables Gzip output compression for faster page loads.  When enabled,

+| the output class will test whether your server supports Gzip.

+| Even if it does, however, not all browsers support compression

+| so enable only if you are reasonably sure your visitors can handle it.

+|

+| VERY IMPORTANT:  If you are getting a blank page when compression is enabled it

+| means you are prematurely outputting something to your browser. It could

+| even be a line of whitespace at the end of one of your scripts.  For

+| compression to work, nothing can be sent before the output buffer is called

+| by the output class.  Do not "echo" any values with compression enabled.

+|

+*/

+$config['compress_output'] = FALSE;

+

+/*

+|--------------------------------------------------------------------------

+| Master Time Reference

+|--------------------------------------------------------------------------

+|

+| Options are "local" or "gmt".  This pref tells the system whether to use

+| your server's local time as the master "now" reference, or convert it to

+| GMT.  See the "date helper" page of the user guide for information

+| regarding date handling.

+|

+*/

+$config['time_reference'] = 'local';

+

+

+/*

+|--------------------------------------------------------------------------

+| Rewrite PHP Short Tags

+|--------------------------------------------------------------------------

+|

+| 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)

+|

+*/

+$config['rewrite_short_tags'] = FALSE;

+

+

 ?>
\ No newline at end of file
diff --git a/system/application/views/welcome_message.php b/system/application/views/welcome_message.php
index 393fb56e1..8313059e4 100644
--- a/system/application/views/welcome_message.php
+++ b/system/application/views/welcome_message.php
@@ -1,62 +1,62 @@
-<html>
-<head>
-<title>Welcome to Code Igniter</title>
-
-<style type="text/css">
-
-body {
- background-color: #fff;
- margin: 40px;
- font-family: Lucida Grande, Verdana, Sans-serif;
- font-size: 14px;
- color: #4F5155;
-}
-
-a {
- color: #003399;
- background-color: transparent;
- font-weight: normal;
-}
-
-h1 {
- color: #444;
- background-color: transparent;
- border-bottom: 1px solid #D0D0D0;
- font-size: 16px;
- font-weight: bold;
- margin: 24px 0 2px 0;
- padding: 5px 0 6px 0;
-}
-
-code {
- font-family: Monaco, Verdana, Sans-serif;
- font-size: 12px;
- background-color: #f9f9f9;
- border: 1px solid #D0D0D0;
- color: #002166;
- display: block;
- margin: 14px 0 14px 0;
- padding: 12px 10px 12px 10px;
-}
-
-</style>
-</head>
-<body>
-
-<h1>Welcome to Code Igniter!</h1>
-
-<p>The page you are looking at is being generated dynamically by Code Igniter.</p>
-
-<p>If you would like to edit this page you'll find it located at:</p>
-<code>system/application/views/welcome_message.php</code>
-
-<p>The corresponding controller for this page is found at:</p>
-<code>system/application/controllers/welcome.php</code>
-
-<p>If you are exploring Code Igniter for the very first time, you should start by reading the <a href="user_guide/">User Guide</a>.</p>
-
-
-<p><br />Page rendered in {elapsed_time} seconds</p>
-
-</body>
+<html>

+<head>

+<title>Welcome to CodeIgniter</title>

+

+<style type="text/css">

+

+body {

+ background-color: #fff;

+ margin: 40px;

+ font-family: Lucida Grande, Verdana, Sans-serif;

+ font-size: 14px;

+ color: #4F5155;

+}

+

+a {

+ color: #003399;

+ background-color: transparent;

+ font-weight: normal;

+}

+

+h1 {

+ color: #444;

+ background-color: transparent;

+ border-bottom: 1px solid #D0D0D0;

+ font-size: 16px;

+ font-weight: bold;

+ margin: 24px 0 2px 0;

+ padding: 5px 0 6px 0;

+}

+

+code {

+ font-family: Monaco, Verdana, Sans-serif;

+ font-size: 12px;

+ background-color: #f9f9f9;

+ border: 1px solid #D0D0D0;

+ color: #002166;

+ display: block;

+ margin: 14px 0 14px 0;

+ padding: 12px 10px 12px 10px;

+}

+

+</style>

+</head>

+<body>

+

+<h1>Welcome to CodeIgniter!</h1>

+

+<p>The page you are looking at is being generated dynamically by CodeIgniter.</p>

+

+<p>If you would like to edit this page you'll find it located at:</p>

+<code>system/application/views/welcome_message.php</code>

+

+<p>The corresponding controller for this page is found at:</p>

+<code>system/application/controllers/welcome.php</code>

+

+<p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="user_guide/">User Guide</a>.</p>

+

+

+<p><br />Page rendered in {elapsed_time} seconds</p>

+

+</body>

 </html>
\ No newline at end of file