[xoops-svn] SF.net SVN: xoops-svn:[10372] XoopsCore/branches/2.5.x/2.5.6

[<be...@us...>]

Revision: 10372
          http://sourceforge.net/p/xoops/svn/10372
Author:   beckmi
Date:     2012-12-12 22:08:20 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
updating phpThumb config

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php

Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2012-12-12 21:06:40 UTC (rev 10371)
+++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2012-12-12 22:08:20 UTC (rev 10372)
@@ -1,7 +1,7 @@
 XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
 
 ===============================
-2012/08/06: Version 2.5.6 Alpha
+2012/12/12: Version 2.5.6 Beta
 ===============================
 Security fixes:
  - XSS (Cross Site Scripting) vulnerability in Maintenance (Dingjie Yang,Qualys/trabis)
@@ -13,7 +13,6 @@
  - TinyMCE to 3.5.8 (mamba)
  - Smarty to 2.6.27 (mamba)
 
-
 ===============================
 2012/04/15: Version 2.5.5 Final
 ===============================

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php	2012-12-12 21:06:40 UTC (rev 10371)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php	2012-12-12 22:08:20 UTC (rev 10372)
@@ -30,6 +30,6 @@
 /**
  *  Define XOOPS version
  */
-define('XOOPS_VERSION', 'XOOPS 2.5.6 Alpha');
+define('XOOPS_VERSION', 'XOOPS 2.5.6 Beta');
 
 ?>
\ No newline at end of file

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php	2012-12-12 21:06:40 UTC (rev 10371)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php	2012-12-12 22:08:20 UTC (rev 10372)
@@ -78,8 +78,8 @@
 //$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '*_thumb';  // cache 'pic.jpg' becomes 'pic_thumb.jpg' (or 'pic_thumb.png' if PNG output is selected, etc)
 //$PHPTHUMB_CONFIG['cache_default_only_suffix'] = 'small-*';  // cache 'pic.jpg' becomes 'small-pic.jpg' (or 'small-pic.png' if PNG output is selected, etc)
 
-$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.str_replace('www.', '', @$_SERVER['SERVER_NAME']);
-//$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache';                         // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server
+$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.(isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']).'_' : ''); // keep cache file separate by domain
+//$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache';                                                                                             // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server
 
 $PHPTHUMB_CONFIG['cache_force_passthru'] = true;  // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead
 
@@ -191,9 +191,9 @@
 
 
 // * Security configuration
-$PHPTHUMB_CONFIG['high_security_enabled']    = false;  // if enabled, requires 'high_security_password' set to at least 5 characters, and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
-$PHPTHUMB_CONFIG['high_security_password']   = '';     // required if 'high_security_enabled' is true, must be at least 5 characters long
-$PHPTHUMB_CONFIG['disable_debug']            = true;  // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled
+$PHPTHUMB_CONFIG['high_security_enabled']    = false;  // if enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
+$PHPTHUMB_CONFIG['high_security_password']   = '';     // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpThumb.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password
+$PHPTHUMB_CONFIG['disable_debug']            = true;   // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled
 $PHPTHUMB_CONFIG['allow_src_above_docroot']  = true;  // if true, allow src to be anywhere in filesystem; if false (default) only allow src within document_root
 $PHPTHUMB_CONFIG['allow_src_above_phpthumb'] = true;   // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation
 $PHPTHUMB_CONFIG['allow_parameter_file']     = false;  // if true, allow use of 'file' parameter; if false (default) the 'file' parameter is disabled/ignored