[geeklog-cvs] geeklog: Updated custom validation rule for path_to_mogrify. Bug...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Tue May 31 10:18:50 EDT 2011
changeset 8302:fcf965a0e8b1
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/fcf965a0e8b1
user: Tom <websitemaster at cogeco.net>
date: Tue May 31 10:18:21 2011 -0400
description:
Updated custom validation rule for path_to_mogrify. Bug #1355
Updated english language of validation rules
diffstat:
language/english.php | 48 ++++++++++++++++++------------------
language/english_utf-8.php | 48 ++++++++++++++++++------------------
public_html/admin/configuration.php | 2 +-
3 files changed, 49 insertions(+), 49 deletions(-)
diffs (152 lines):
diff -r 00baf05789e5 -r fcf965a0e8b1 language/english.php
--- a/language/english.php Mon May 30 19:55:55 2011 +0200
+++ b/language/english.php Tue May 31 10:18:21 2011 -0400
@@ -2126,42 +2126,42 @@
$LANG_VALIDATION = array(
'default' => 'This field contains an invalid value',
'notEmpty' => 'This field cannot be empty',
- 'alphaNumeric' => 'This field must be in alpha numeric',
- 'between' => 'This field must be in specified range',
+ 'alphaNumeric' => 'This field must be alpha numeric',
+ 'between' => 'This field must be in a specified range',
'blank' => 'This field must be blank',
'comparison' => 'This field does not match the comparison operation',
- 'date' => 'This field must be in date format',
- 'year' => 'This field must be in year format such as 2010',
- 'time' => 'This field must be in time format',
- 'datetime' => 'This field must be in datetime format',
- 'boolean' => 'This field must be in boolean',
- 'decimal' => 'This field must be in decimal',
- 'email' => 'This field must contains valid email address',
+ 'date' => 'This field must be in a date format',
+ 'year' => 'This field must be in a year format such as 2010',
+ 'time' => 'This field must be in a time format',
+ 'datetime' => 'This field must be in a datetime format',
+ 'boolean' => 'This field must be a boolean',
+ 'decimal' => 'This field must be a decimal',
+ 'email' => 'This field must contain a valid email address',
'equalTo' => 'This field does not equal',
- 'extension' => 'This field only accept allowable file extension',
- 'ip' => 'This field must be in valid IP format',
+ 'extension' => 'This field only accepts allowable file extensions',
+ 'ip' => 'This field must be in a valid IP format',
'minLength' => 'This field is too short',
'maxLength' => 'This field is too long',
- 'numeric' => 'This field must be a numeric',
- 'phone' => 'This field must contains valid phone number',
- 'range' => 'This field must be in specified range',
- 'url' => 'This field must contains valid URL',
- 'inList' => 'This field must contain specified list',
+ 'numeric' => 'This field must be numeric',
+ 'phone' => 'This field must contain a valid phone number',
+ 'range' => 'This field must be in a specified range',
+ 'url' => 'This field must contains a valid URL',
+ 'inList' => 'This field must contain a specified list',
'mail_settings_backend' => "This field must be one of 'smtp', 'sendmail', or 'mail'",
- 'mail_settings_sendmail_path' => 'This field must contains valid path to sendmail binary',
- 'mail_settings_host' => 'This field must contain valid hostname',
+ 'mail_settings_sendmail_path' => 'This field must contains a valid path to sendmail binary',
+ 'mail_settings_host' => 'This field must contain a valid hostname',
'mail_settings_port' => 'This field must be between 0 - 65535',
- 'rdf_limit' => 'This field must in numeric or hour such as 24h',
+ 'rdf_limit' => 'This field must be numeric',
'path' => 'Path does not exist',
'file' => 'File does not exist',
- 'search_limits' => 'This field must be numeric separated with a comma',
- 'num_search_results' => "This field must be numeric and from 'search_limits' above",
+ 'search_limits' => 'This field must be numeric and separated with a comma',
+ 'num_search_results' => "This field must be numeric and from the 'search_limits' field above",
'theme' => 'Theme directory does not exist',
- 'path_themes' => 'Theme path must be in absolute path and make sure the last character contains ' .
+ 'path_themes' => 'Theme path must be an absolute path and make sure the last character contains the ' .
'directory separator',
- 'path_to_mogrify' => 'You must set image library to imagemagick and fill this field with ' .
+ 'path_to_mogrify' => 'You must set the image library to imagemagick and fill this field with the ' .
'complete path to the mogrify executable',
- 'path_to_netpbm' => 'You must set image library to netpbm and fill this field with ' .
+ 'path_to_netpbm' => 'You must set the image library to netpbm and fill this field with the ' .
'directory where the binaries from the Netpbm package are kept',
'language' => 'Language file does not exist',
'timezone' => 'Invalid timezone',
diff -r 00baf05789e5 -r fcf965a0e8b1 language/english_utf-8.php
--- a/language/english_utf-8.php Mon May 30 19:55:55 2011 +0200
+++ b/language/english_utf-8.php Tue May 31 10:18:21 2011 -0400
@@ -2126,42 +2126,42 @@
$LANG_VALIDATION = array(
'default' => 'This field contains an invalid value',
'notEmpty' => 'This field cannot be empty',
- 'alphaNumeric' => 'This field must be in alpha numeric',
- 'between' => 'This field must be in specified range',
+ 'alphaNumeric' => 'This field must be alpha numeric',
+ 'between' => 'This field must be in a specified range',
'blank' => 'This field must be blank',
'comparison' => 'This field does not match the comparison operation',
- 'date' => 'This field must be in date format',
- 'year' => 'This field must be in year format such as 2010',
- 'time' => 'This field must be in time format',
- 'datetime' => 'This field must be in datetime format',
- 'boolean' => 'This field must be in boolean',
- 'decimal' => 'This field must be in decimal',
- 'email' => 'This field must contains valid email address',
+ 'date' => 'This field must be in a date format',
+ 'year' => 'This field must be in a year format such as 2010',
+ 'time' => 'This field must be in a time format',
+ 'datetime' => 'This field must be in a datetime format',
+ 'boolean' => 'This field must be a boolean',
+ 'decimal' => 'This field must be a decimal',
+ 'email' => 'This field must contain a valid email address',
'equalTo' => 'This field does not equal',
- 'extension' => 'This field only accept allowable file extension',
- 'ip' => 'This field must be in valid IP format',
+ 'extension' => 'This field only accepts allowable file extensions',
+ 'ip' => 'This field must be in a valid IP format',
'minLength' => 'This field is too short',
'maxLength' => 'This field is too long',
- 'numeric' => 'This field must be a numeric',
- 'phone' => 'This field must contains valid phone number',
- 'range' => 'This field must be in specified range',
- 'url' => 'This field must contains valid URL',
- 'inList' => 'This field must contain specified list',
+ 'numeric' => 'This field must be numeric',
+ 'phone' => 'This field must contain a valid phone number',
+ 'range' => 'This field must be in a specified range',
+ 'url' => 'This field must contains a valid URL',
+ 'inList' => 'This field must contain a specified list',
'mail_settings_backend' => "This field must be one of 'smtp', 'sendmail', or 'mail'",
- 'mail_settings_sendmail_path' => 'This field must contains valid path to sendmail binary',
- 'mail_settings_host' => 'This field must contain valid hostname',
+ 'mail_settings_sendmail_path' => 'This field must contains a valid path to sendmail binary',
+ 'mail_settings_host' => 'This field must contain a valid hostname',
'mail_settings_port' => 'This field must be between 0 - 65535',
- 'rdf_limit' => 'This field must in numeric or hour such as 24h',
+ 'rdf_limit' => 'This field must be numeric',
'path' => 'Path does not exist',
'file' => 'File does not exist',
- 'search_limits' => 'This field must be numeric separated with a comma',
- 'num_search_results' => "This field must be numeric and from 'search_limits' above",
+ 'search_limits' => 'This field must be numeric and separated with a comma',
+ 'num_search_results' => "This field must be numeric and from the 'search_limits' field above",
'theme' => 'Theme directory does not exist',
- 'path_themes' => 'Theme path must be in absolute path and make sure the last character contains ' .
+ 'path_themes' => 'Theme path must be an absolute path and make sure the last character contains the ' .
'directory separator',
- 'path_to_mogrify' => 'You must set image library to imagemagick and fill this field with ' .
+ 'path_to_mogrify' => 'You must set the image library to imagemagick and fill this field with the ' .
'complete path to the mogrify executable',
- 'path_to_netpbm' => 'You must set image library to netpbm and fill this field with ' .
+ 'path_to_netpbm' => 'You must set the image library to netpbm and fill this field with the ' .
'directory where the binaries from the Netpbm package are kept',
'language' => 'Language file does not exist',
'timezone' => 'Invalid timezone',
diff -r 00baf05789e5 -r fcf965a0e8b1 public_html/admin/configuration.php
--- a/public_html/admin/configuration.php Mon May 30 19:55:55 2011 +0200
+++ b/public_html/admin/configuration.php Tue May 31 10:18:21 2011 -0400
@@ -335,7 +335,7 @@
$ret = false;
if ( isset($ruleParams[0]['path_to_mogrify']) && isset($_CONF['image_lib']) &&
$_CONF['image_lib'] == 'imagemagick' &&
- file_exists($ruleParams[0]['path_to_mogrify']) )
+ is_dir($ruleParams[0]['path_to_mogrify']) )
{
$ret = true;
}
More information about the geeklog-cvs
mailing list