From d1bac4c7ee0b64ad1b4c3234223e7dec19a0c14c Mon Sep 17 00:00:00 2001 From: Sean Fahey Date: Tue, 3 Jun 2014 13:34:08 -0500 Subject: Added 'application/vnd.ms-office' MIME for ppt An export from Apple's Numbers to .ppt gives a MIME of application/vnd.ms-office --- application/config/mimes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 8123557f4..0723e6f12 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -58,7 +58,7 @@ return array( 'smil' => 'application/smil', 'mif' => 'application/vnd.mif', 'xls' => array('application/vnd.ms-excel', 'application/msexcel', 'application/x-msexcel', 'application/x-ms-excel', 'application/x-excel', 'application/x-dos_ms_excel', 'application/xls', 'application/x-xls', 'application/excel', 'application/download', 'application/vnd.ms-office', 'application/msword'), - 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'), + 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint', 'application/vnd.ms-office'), 'pptx' => array('application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/x-zip', 'application/zip'), 'wbxml' => 'application/wbxml', 'wmlc' => 'application/wmlc', @@ -178,4 +178,4 @@ return array( ); /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */ \ No newline at end of file +/* Location: ./application/config/mimes.php */ -- cgit v1.2.3-24-g4f1b From 905c1f3aac5731777af8881472e7496387002f6a Mon Sep 17 00:00:00 2001 From: Sean Fahey Date: Tue, 3 Jun 2014 13:46:05 -0500 Subject: Another ppt mime type --- application/config/mimes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 0723e6f12..63233a9e5 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -58,7 +58,7 @@ return array( 'smil' => 'application/smil', 'mif' => 'application/vnd.mif', 'xls' => array('application/vnd.ms-excel', 'application/msexcel', 'application/x-msexcel', 'application/x-ms-excel', 'application/x-excel', 'application/x-dos_ms_excel', 'application/xls', 'application/x-xls', 'application/excel', 'application/download', 'application/vnd.ms-office', 'application/msword'), - 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint', 'application/vnd.ms-office'), + 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint', 'application/vnd.ms-office', 'application/msword'), 'pptx' => array('application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/x-zip', 'application/zip'), 'wbxml' => 'application/wbxml', 'wmlc' => 'application/wmlc', -- cgit v1.2.3-24-g4f1b From 717e9c9adb5bd9d181ee9a35e2febf654ee925c3 Mon Sep 17 00:00:00 2001 From: sean Date: Tue, 3 Jun 2014 17:05:50 -0500 Subject: Seriously, remove the line ending --- application/config/mimes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index 63233a9e5..ccca69220 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -178,4 +178,4 @@ return array( ); /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */ +/* Location: ./application/config/mimes.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From ed86ee14f3a36de1034b8fa19ff6d41aeb428a93 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 11 Jul 2014 19:48:37 +0300 Subject: Add setting ['composer_autoload'] Supersedes PR #3132 --- application/config/config.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index d269b6e5d..b6b3c9fdf 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -121,7 +121,6 @@ $config['charset'] = 'UTF-8'; */ $config['enable_hooks'] = FALSE; - /* |-------------------------------------------------------------------------- | Class Extension Prefix @@ -136,6 +135,27 @@ $config['enable_hooks'] = FALSE; */ $config['subclass_prefix'] = 'MY_'; +/* +|-------------------------------------------------------------------------- +| Composer auto-loading +|-------------------------------------------------------------------------- +| +| Enabling this setting will tell CodeIgniter to look for a Composer +| package auto-loader script in application/vendor/autoload.php. +| +| $config['composer_autoload'] = TRUE; +| +| Or if you have your vendor/ directory located somewhere else, you +| can opt to set a specific path as well: +| +| $config['composer_autoload'] = '/path/to/vendor/autoload.php'; +| +| For more information about Composer, please visit http://getcomposer.org/ +| +| Note: This will NOT disable or override the CodeIgniter-specific +| autoloading (application/config/autoload.php) +*/ +$config['composer_autoload'] = FALSE; /* |-------------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 459657415189f4fe3f8d4eb05b209ab78409f9b0 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 27 Aug 2014 20:40:11 +0300 Subject: Fix #2963 Changed all file permissions settings throught the framework and the documentation. Also added configuration settings for CI_Log and CI_Image_lib --- application/config/config.php | 12 ++++++++++++ application/config/constants.php | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index b6b3c9fdf..e8d30b625 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -262,6 +262,18 @@ $config['log_path'] = ''; */ $config['log_file_extension'] = ''; +/* +|-------------------------------------------------------------------------- +| Log File Permissions +|-------------------------------------------------------------------------- +| +| The file system permissions to be applied on newly created log files. +| +| IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal +| integer notation (i.e. 0700, 0644, etc.) +*/ +$config['log_file_permissions'] = 0644; + /* |-------------------------------------------------------------------------- | Date Format for Logs diff --git a/application/config/constants.php b/application/config/constants.php index 239fd46fb..c19f044ab 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -42,7 +42,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); define('FILE_READ_MODE', 0644); define('FILE_WRITE_MODE', 0666); define('DIR_READ_MODE', 0755); -define('DIR_WRITE_MODE', 0777); +define('DIR_WRITE_MODE', 0755); /* |-------------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 03eeb366a6e71d184f448353e5b2ce2a9a42b812 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 8 Sep 2014 11:35:52 +0300 Subject: Add svg to config/mimes.php Close #3199 --- application/config/mimes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index ccca69220..a014cb459 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -174,7 +174,8 @@ return array( '7zip' => array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'), 'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'), 'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'), - 'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed') + 'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'), + 'svg' => array('image/svg+xml', 'application/xml', 'text/xml') ); /* End of file mimes.php */ -- cgit v1.2.3-24-g4f1b From 4b73882124dfe5e9aec9686fef168be1fc590dfe Mon Sep 17 00:00:00 2001 From: Ahmad Anbar Date: Thu, 11 Sep 2014 16:34:24 +0300 Subject: Added vcard mime-type --- application/config/mimes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index a014cb459..bab431f77 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -175,7 +175,8 @@ return array( 'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'), 'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'), 'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'), - 'svg' => array('image/svg+xml', 'application/xml', 'text/xml') + 'svg' => array('image/svg+xml', 'application/xml', 'text/xml'), + 'vcf' => 'text/x-vcard' ); /* End of file mimes.php */ -- cgit v1.2.3-24-g4f1b