Skip to content

Commit

Permalink
Add option for skip_original to config file to always skip original, #…
Browse files Browse the repository at this point in the history
  • Loading branch information
mosbth committed Apr 18, 2016
1 parent 1943d66 commit 4e94016
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 5 deletions.
6 changes: 6 additions & 0 deletions REVISION.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ Revision history
[![Build Status](https://scrutinizer-ci.com/g/mosbth/cimage/badges/build.png?b=master)](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/master)


v0.7.11 (2016-04-18)
-------------------------------------

* Add option for `skip_original` to config file to always skip original, #118.


v0.7.10 (2016-04-01)
-------------------------------------

Expand Down
6 changes: 3 additions & 3 deletions webroot/img.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
*/

$version = "v0.7.10 (2016-04-01)";
$version = "v0.7.11 (2016-04-18)";

// For CRemoteImage
define("CIMAGE_USER_AGENT", "CImage/$version");
Expand Down Expand Up @@ -699,8 +699,8 @@ function verbose($msg = null)
$useOriginalDefault = getConfig('skip_original', false);

if ($useOriginalDefault === true) {
verbose("use original is default ON");
$useOriginal = true;
verbose("skip original is default ON");
$useOriginal = false;
}

verbose("use original = $useOriginal");
Expand Down
25 changes: 23 additions & 2 deletions webroot/img_config.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
/**
* Set mode as 'strict', 'production' or 'development'.
*
* development: Development mode with verbose error reporting. Option
* &verbose and &status enabled.
* production: Production mode logs all errors to file, giving server
* error 500 for bad usage. Option &verbose and &status
* disabled.
* strict: Strict mode logs few errors to file, giving server error
* 500 for bad usage. Stripped from comments and spaces.
* Option &verbose and &status disabled.
*
* Default values:
* mode: 'production'
*/
Expand All @@ -20,7 +29,7 @@


/**
* Where are the sources for the classfiles.
* Where are the sources for the class files.
*
* Default values:
* autoloader: null // used from v0.6.2
Expand Down Expand Up @@ -153,6 +162,18 @@



/**
* Set skip-original to true to always process the image and use
* the cached version. Default is false and to use the original
* image when its no processing needed.
*
* Default value:
* skip_original: false
*/
//'skip_original' => true,



/**
* A function (hook) can be called after img.php has processed all
* configuration options and before processing the image using CImage.
Expand Down Expand Up @@ -394,7 +415,7 @@


/**
* default options for ascii image.
* Default options for ascii image.
*
* Default values as specified below in the array.
* ascii-options:
Expand Down

0 comments on commit 4e94016

Please sign in to comment.