Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2094) +++ branches/2.8.x/CHANGELOG (revision 2095) @@ -11,6 +11,13 @@ ! = Update/Change =============================================================================== +03 Feb-2014 Build 2095 Manuela v.d.Decken(DarkViper) +! /functions::make_thumb() set JPG-compression to 100% +! /database::showError() output text corrected +! ../captcha.php::call_captcha() imagesize corected +! droplet >> [[SiteModified]] recoded +! droplet >> [[ModifiedWhen]] recoded +! install/index length of password restricted to 30 chars 30 Jan-2014 Build 2094 Manuela v.d.Decken(DarkViper) # TranslateAdaptorWbOldStyle::_getAddonPath now ignores a missing language file ! admin::print_header() now provides all translations in theme::header.htt and accepts language files in theme Index: branches/2.8.x/wb/include/captcha/captcha.php =================================================================== --- branches/2.8.x/wb/include/captcha/captcha.php (revision 2094) +++ branches/2.8.x/wb/include/captcha/captcha.php (revision 2095) @@ -113,7 +113,7 @@ switch(CAPTCHA_TYPE) { case 'calc_image': $captcha_width = 160; - $captcha_height = 55; + $captcha_height = 60; break; case 'calc_ttf_image': $captcha_width = 175; @@ -125,7 +125,7 @@ break; case 'old_image': $captcha_width = 160; - $captcha_height = 55; + $captcha_height = 60; break; default: $captcha_width = 250; Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2094) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2095) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.4'); -if(!defined('REVISION')) define('REVISION', '2094'); +if(!defined('REVISION')) define('REVISION', '2095'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/class.database.php =================================================================== --- branches/2.8.x/wb/framework/class.database.php (revision 2094) +++ branches/2.8.x/wb/framework/class.database.php (revision 2095) @@ -25,7 +25,7 @@ $msg .= 'tried to create an invalid '.$y[1]['class'].' - object

'; $msg .= '

Please replace '; $msg .= '$database = new database(); by '; - $msg .= '$database = WbDatabase::getInstance();.

'; + $msg .= '$database = WbDatabase::getInstance();

'; $msg .= '

Also you can get information and help from the '; $msg .= 'WebsiteBaker Forum

'; $msg .= '
'; @@ -35,7 +35,7 @@ $msg .= 'wurde versucht, ein ungültiges '.$y[1]['class'].' - Objekt zu erstellen.

'; $msg .= '

Bitte ersetzen Sie '; $msg .= '$database = new database(); durch '; - $msg .= '$database = WbDatabase::getInstance();.

'; + $msg .= '$database = WbDatabase::getInstance();

'; $msg .= '

Auch können sie auch Informationen und Hilfe im '; $msg .= 'WebsiteBaker Forum finden.

'; $msg .= ''; Index: branches/2.8.x/wb/framework/functions.php =================================================================== --- branches/2.8.x/wb/framework/functions.php (revision 2094) +++ branches/2.8.x/wb/framework/functions.php (revision 2095) @@ -978,7 +978,7 @@ $source = imageCreateFromJpeg($source); $dst_img = ImageCreateTrueColor($thumb_w, $thumb_h); imagecopyresampled($dst_img,$source,0,0,0,0,$thumb_w,$thumb_h,$original_x,$original_y); - imagejpeg($dst_img, $destination); + imagejpeg($dst_img, $destination, 100); // Clear memory imagedestroy($dst_img); imagedestroy($source); Index: branches/2.8.x/wb/install/save.php =================================================================== --- branches/2.8.x/wb/install/save.php (revision 2094) +++ branches/2.8.x/wb/install/save.php (revision 2095) @@ -356,7 +356,7 @@ if(!isset($_POST['admin_email']) OR $_POST['admin_email'] == '') { set_error('Please enter an email for the Administrator account','admin_email'); } else { - if(preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i', $_POST['admin_email'])) { + if(preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,})$/i', $_POST['admin_email'])) { $admin_email = $_POST['admin_email']; } else { set_error('Please enter a valid email address for the Administrator account','admin_email'); @@ -376,6 +376,10 @@ if($admin_password != $admin_repassword) { set_error('Sorry, the two Administrator account passwords you entered do not match','admin_repassword'); } +if (mb_strlen($admin_password) < 6) { + set_error('Sorry, the password must have 6 chars at last','admin_password'); +} + // End admin user details code // Try and write settings to config file Index: branches/2.8.x/wb/install/index.php =================================================================== --- branches/2.8.x/wb/install/index.php (revision 2094) +++ branches/2.8.x/wb/install/index.php (revision 2095) @@ -179,7 +179,7 @@ -
+ @@ -552,13 +552,13 @@ Password: - type="password" tabindex="16" name="admin_password" value="" /> + type="password" maxlength="30" tabindex="16" name="admin_password" value="" /> Re-Password: - type="password" tabindex="17" name="admin_repassword" value="" /> + type="password" maxlength="30" tabindex="17" name="admin_repassword" value="" /> Index: branches/2.8.x/wb/modules/droplets/example/ModifiedWhen.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/ModifiedWhen.php (revision 2094) +++ branches/2.8.x/wb/modules/droplets/example/ModifiedWhen.php (revision 2095) @@ -1,8 +1,8 @@ //:Displays the last modification time of the current page //:Use [[ModifiedWhen]] -global $database, $wb; -if (PAGE_ID>0) { - $query=$database->query("SELECT modified_when FROM ".TABLE_PREFIX."pages where page_id=".PAGE_ID); - $mod_details=$query->fetchRow(); - return "This page was last modified on ".date("d/m/Y",$mod_details[0]). " at ".date("H:i",$mod_details[0])."."; -} \ No newline at end of file + +$sRetval = ''; +if (($aPageDate = (($GLOBALS['wb']->page_id) ? $GLOBALS['wb']->page['modified_when'] : 0))) { + $sRetval = 'This page was last modified on '.date('d/m/Y', $aPageDate).' at '.date('H:i', $aPageDate); +} +return $sRetval; Index: branches/2.8.x/wb/modules/droplets/example/SiteModified.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/SiteModified.php (revision 2094) +++ branches/2.8.x/wb/modules/droplets/example/SiteModified.php (revision 2095) @@ -1,8 +1,11 @@ +0) { - $query=$database->query("SELECT max(modified_when) FROM ".TABLE_PREFIX."pages"); - $mod_details=$query->fetchRow(); - return "This site was last modified on ".date("d/m/Y",$mod_details[0]). " at ".date("H:i",$mod_details[0])."."; -} \ No newline at end of file +$sRetval = ''; +if (PAGE_ID > 0) { + $sql = 'SELECT MAX(`modified_when`) `modified` ' + . 'FROM `'.WbDatabase::getInstance()->TablePrefix.'pages`'; + $iModified = WbDatabase::getInstance()->getOne($sql); + $sRetval = "This site was last modified on ".date("d/m/Y",$iModified). " at ".date("H:i",$iModified)."."; +} +return $sRetval; \ No newline at end of file