diff options
Diffstat (limited to 'application')
| -rwxr-xr-x | application/config/example/autoload.php | 2 | ||||
| -rwxr-xr-x | application/config/example/database.php | 6 | ||||
| -rwxr-xr-x | application/config/example/mimes.php | 2 | ||||
| -rwxr-xr-x | application/errors/error_404.php | 58 | ||||
| -rwxr-xr-x | application/errors/error_db.php | 58 | ||||
| -rwxr-xr-x | application/errors/error_general.php | 58 |
6 files changed, 137 insertions, 47 deletions
diff --git a/application/config/example/autoload.php b/application/config/example/autoload.php index e527bf5cc..a471f3ab2 100755 --- a/application/config/example/autoload.php +++ b/application/config/example/autoload.php @@ -37,7 +37,7 @@ | */ -$autoload['packages'] = array(APPPATH.'third_party'); +$autoload['packages'] = array(); /* diff --git a/application/config/example/database.php b/application/config/example/database.php index 32a4d7e11..ee6b76a06 100755 --- a/application/config/example/database.php +++ b/application/config/example/database.php @@ -26,6 +26,12 @@ | ['cachedir'] The path to the folder where cache files should be stored | ['char_set'] The character set used in communicating with the database | ['dbcollat'] The character collation used in communicating with the database +| NOTE: For MySQL and MySQLi databases, this setting is only used +| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7. +| There is an incompatibility in PHP with mysql_real_escape_string() which +| can make your site vulnerable to SQL injection if you are using a +| multi-byte character set and are running versions lower than these. +| Sites using Latin-1 or UTF-8 database character set and collation are unaffected. | ['swap_pre'] A default table prefix that should be swapped with the dbprefix | ['autoinit'] Whether or not to automatically initialize the database. | ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections diff --git a/application/config/example/mimes.php b/application/config/example/mimes.php index 8065794ff..82767d7c8 100755 --- a/application/config/example/mimes.php +++ b/application/config/example/mimes.php @@ -10,7 +10,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'cpt' => 'application/mac-compactpro', - 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), + 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), 'bin' => 'application/macbinary', 'dms' => 'application/octet-stream', 'lha' => 'application/octet-stream', diff --git a/application/errors/error_404.php b/application/errors/error_404.php index a304f4561..792726a67 100755 --- a/application/errors/error_404.php +++ b/application/errors/error_404.php @@ -1,32 +1,60 @@ -<html> +<!DOCTYPE html> +<html lang="en"> <head> <title>404 Page Not Found</title> <style type="text/css"> +::selection{ background-color: #E13300; color: white; } +::moz-selection{ background-color: #E13300; color: white; } +::webkit-selection{ background-color: #E13300; color: white; } + body { -background-color: #fff; -margin: 40px; -font-family: Lucida Grande, Verdana, Sans-serif; -font-size: 12px; -color: #000; + background-color: #fff; + margin: 40px; + font: 13px/20px normal Helvetica, Arial, sans-serif; + color: #4F5155; } -#content { -border: #999 1px solid; -background-color: #fff; -padding: 20px 20px 12px 20px; +a { + color: #003399; + background-color: transparent; + font-weight: normal; } h1 { -font-weight: normal; -font-size: 14px; -color: #990000; -margin: 0 0 4px 0; + color: #444; + background-color: transparent; + border-bottom: 1px solid #D0D0D0; + font-size: 19px; + font-weight: normal; + margin: 0 0 14px 0; + padding: 14px 15px 10px 15px; +} + +code { + font-family: Consolas, Monaco, Courier New, Courier, monospace; + font-size: 12px; + background-color: #f9f9f9; + border: 1px solid #D0D0D0; + color: #002166; + display: block; + margin: 14px 0 14px 0; + padding: 12px 10px 12px 10px; +} + +#container { + margin: 10px; + border: 1px solid #D0D0D0; + -webkit-box-shadow: 0 0 8px #D0D0D0; +} + +p { + margin: 12px 15px 12px 15px; } </style> </head> <body> - <div id="content"> + <div id="container"> <h1><?php echo $heading; ?></h1> <?php echo $message; ?> </div> diff --git a/application/errors/error_db.php b/application/errors/error_db.php index 181de960b..b396cda9f 100755 --- a/application/errors/error_db.php +++ b/application/errors/error_db.php @@ -1,32 +1,60 @@ -<html> +<!DOCTYPE html> +<html lang="en"> <head> <title>Database Error</title> <style type="text/css"> +::selection{ background-color: #E13300; color: white; } +::moz-selection{ background-color: #E13300; color: white; } +::webkit-selection{ background-color: #E13300; color: white; } + body { -background-color: #fff; -margin: 40px; -font-family: Lucida Grande, Verdana, Sans-serif; -font-size: 12px; -color: #000; + background-color: #fff; + margin: 40px; + font: 13px/20px normal Helvetica, Arial, sans-serif; + color: #4F5155; } -#content { -border: #999 1px solid; -background-color: #fff; -padding: 20px 20px 12px 20px; +a { + color: #003399; + background-color: transparent; + font-weight: normal; } h1 { -font-weight: normal; -font-size: 14px; -color: #990000; -margin: 0 0 4px 0; + color: #444; + background-color: transparent; + border-bottom: 1px solid #D0D0D0; + font-size: 19px; + font-weight: normal; + margin: 0 0 14px 0; + padding: 14px 15px 10px 15px; +} + +code { + font-family: Consolas, Monaco, Courier New, Courier, monospace; + font-size: 12px; + background-color: #f9f9f9; + border: 1px solid #D0D0D0; + color: #002166; + display: block; + margin: 14px 0 14px 0; + padding: 12px 10px 12px 10px; +} + +#container { + margin: 10px; + border: 1px solid #D0D0D0; + -webkit-box-shadow: 0 0 8px #D0D0D0; +} + +p { + margin: 12px 15px 12px 15px; } </style> </head> <body> - <div id="content"> + <div id="container"> <h1><?php echo $heading; ?></h1> <?php echo $message; ?> </div> diff --git a/application/errors/error_general.php b/application/errors/error_general.php index 7734d34c7..fd63ce2c5 100755 --- a/application/errors/error_general.php +++ b/application/errors/error_general.php @@ -1,32 +1,60 @@ -<html> +<!DOCTYPE html> +<html lang="en"> <head> <title>Error</title> <style type="text/css"> +::selection{ background-color: #E13300; color: white; } +::moz-selection{ background-color: #E13300; color: white; } +::webkit-selection{ background-color: #E13300; color: white; } + body { -background-color: #fff; -margin: 40px; -font-family: Lucida Grande, Verdana, Sans-serif; -font-size: 12px; -color: #000; + background-color: #fff; + margin: 40px; + font: 13px/20px normal Helvetica, Arial, sans-serif; + color: #4F5155; } -#content { -border: #999 1px solid; -background-color: #fff; -padding: 20px 20px 12px 20px; +a { + color: #003399; + background-color: transparent; + font-weight: normal; } h1 { -font-weight: normal; -font-size: 14px; -color: #990000; -margin: 0 0 4px 0; + color: #444; + background-color: transparent; + border-bottom: 1px solid #D0D0D0; + font-size: 19px; + font-weight: normal; + margin: 0 0 14px 0; + padding: 14px 15px 10px 15px; +} + +code { + font-family: Consolas, Monaco, Courier New, Courier, monospace; + font-size: 12px; + background-color: #f9f9f9; + border: 1px solid #D0D0D0; + color: #002166; + display: block; + margin: 14px 0 14px 0; + padding: 12px 10px 12px 10px; +} + +#container { + margin: 10px; + border: 1px solid #D0D0D0; + -webkit-box-shadow: 0 0 8px #D0D0D0; +} + +p { + margin: 12px 15px 12px 15px; } </style> </head> <body> - <div id="content"> + <div id="container"> <h1><?php echo $heading; ?></h1> <?php echo $message; ?> </div> |