Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1556) +++ branches/2.8.x/CHANGELOG (revision 1557) @@ -11,6 +11,9 @@ ! = Update/Change =========================== add small Features 2.8.2 ========================== +02 Jan-2012 Build 1557 Dietmar Woellbrink (Luisehahne) +! update editor.css for allcssand round (Tks to Ruebenwurzel) +# bugfix in forgot_form.php 02 Jan-2012 Build 1556 Dietmar Woellbrink (Luisehahne) # typofix in function make_dir 02 Jan-2012 Build 1555 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/include/quickSkin/wb_quickSkin_28.php =================================================================== --- branches/2.8.x/wb/include/quickSkin/wb_quickSkin_28.php (revision 1556) +++ branches/2.8.x/wb/include/quickSkin/wb_quickSkin_28.php (revision 1557) @@ -8,14 +8,12 @@ /* -------------------------------------------------------- */ // use Debug Mode? -$debugmode = false; -if(!isset($module_dir)) { - die('Access denied

Missing variable $module_dir

'); -} +$debugmode = false; + $aMsg = array(); require_once(WB_PATH.'/framework/functions.php'); // COMPILED TEMPLATES -$_CONFIG['quickskin_compiled'] = WB_PATH.'/temp/'.$module_dir.'/_skins_tmp/'; +$_CONFIG['quickskin_compiled'] = WB_PATH.'/temp/quickSkin/_skins_tmp/'; if(!is_dir($_CONFIG['quickskin_compiled'])) { $msg = createFolderProtectFile($_CONFIG['quickskin_compiled']); if(sizeof($msg)) { @@ -25,7 +23,7 @@ } // CACHED FILES -$_CONFIG['quickskin_cache'] = WB_PATH.'/temp/'.$module_dir.'/_skins_cache/'; +$_CONFIG['quickskin_cache'] = WB_PATH.'/temp/quickSkin/_skins_cache/'; if(!is_dir($_CONFIG['quickskin_cache'])) { $msg = createFolderProtectFile($_CONFIG['quickskin_cache']); if(sizeof($msg)) { Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1556) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1557) @@ -52,5 +52,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.2'); -if(!defined('REVISION')) define('REVISION', '1556'); +if(!defined('REVISION')) define('REVISION', '1557'); if(!defined('SP')) define('SP', 'SP2'); Index: branches/2.8.x/wb/account/forgot_form.php =================================================================== --- branches/2.8.x/wb/account/forgot_form.php (revision 1556) +++ branches/2.8.x/wb/account/forgot_form.php (revision 1557) @@ -18,8 +18,7 @@ // Must include code to stop this file being access directly if(defined('WB_PATH') == false) { die("Cannot access this file directly"); } // Check if the user has already submitted the form, otherwise show it -if(isset($_POST['email']) && $_POST['email'] != "" && - preg_match("/([0-9a-zA-Z]+[-._+&])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}/i", $_POST['email'])) +if(isset($_POST['email']) && $_POST['email'] != "" ) { $email = strip_tags($_POST['email']); // Check if the email exists in the database @@ -29,8 +28,6 @@ if(($results = $database->query($sql))) { if(($results_array = $results->fetchRow())) - if($results->numRows() > 0) { - { // Get the id, username, email, and last_reset from the above db query // Check if the password has been reset in the last 2 hours if( (time() - (int)$results_array['last_reset']) < (2 * 3600) ) { Index: branches/2.8.x/wb/templates/allcss/editor.css =================================================================== --- branches/2.8.x/wb/templates/allcss/editor.css (revision 1556) +++ branches/2.8.x/wb/templates/allcss/editor.css (revision 1557) @@ -26,16 +26,14 @@ * GNU General Public License for more details. */ -body,td,th { +body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; + text-align: justify; color: #000; + background-color: #FFF; + width: 580px; } -body { - background-color: #F0F0F0; - background-image: none; - margin: 0; -} a:link, a:visited, a:active { color: #603; text-decoration: none; @@ -61,129 +59,3 @@ form { margin: 0; } -.main { - width: 750px; - margin: auto; - padding: 0; - background-color: #FFF; -} -.banner, .search_box { - height: 80px; - background-image: url(images/header.jpg); - background-repeat: repeat-x; - font-size: 20px; - font-weight: bold; - color: #FFF; - text-align: center; - padding-top: 20px; -} - -.banner { - width: 530px; - padding-left: 20px; - float: left; - text-align: left; -} -.search_box { - float: right; - clear: right; - width: 200px; -} -.search_string { - width: 100px; - height: 16px; - font-size: 10px; - vertical-align: middle; -} -.search_submit { - width: 50px; - height: 22px; - font-size: 10px; - vertical-align: middle; -} -.highlight { - background-color: #D0D0D0; -} -.banner a { - color: #FFF; -} -.banner span { - color: #D0D0D0; -} - -.menu { - float: left; - width: 140px; - margin: 10px; - margin-top: 3px; -} -.menu ul, .menu li { - margin: 0; - padding: 0; - list-style: none; - margin-bottom: 5px; -} -.menu ul ul { - padding-left: 8px; -} -.menu a:link, .menu a:visited, .menu a:active, .menu a:hover { - display: block; - padding: 2px; -} -.menu-default a:link, .menu-default a:visited, .menu-default a:active { - border-bottom: 1px dashed #999; -} -.menu-default a:hover { - border-bottom: 1px dashed #333; -} - -.menu-current { - border-bottom: 1px dashed #999; - font-weight:bold; -} - -.menu fieldset { - border: 1px solid #D0D0D0; - margin-top: 20px; - margin-bottom: 5px; - text-align: center; - padding-bottom: 3px; -} - -.menu legend { - color: #603; - font-size: 12px; - text-transform: uppercase; - font-weight: bold; - text-align: center; -} - -.menu input { - text-transform: uppercase; - font-size: 10px; - margin: 5px 0px 1px 0px; - width: 100px; -} - -.content { - margin-left: 150px; - padding: 4px 10px 14px 10px; - text-align: justify; - clear: right; -} -.footer { - background-color: #FFF; - clear: both; - height: 20px; - background-image: url(images/footer.jpg); - background-repeat: repeat-x; - font-size: 10px; - color: #666; - text-align: center; - line-height: 18px; -} -.powered_by { - text-align: center; - font-size: 10px; - padding-top: 2px; -} \ No newline at end of file Index: branches/2.8.x/wb/templates/round/editor.css =================================================================== --- branches/2.8.x/wb/templates/round/editor.css (revision 1556) +++ branches/2.8.x/wb/templates/round/editor.css (revision 1557) @@ -26,17 +26,13 @@ * GNU General Public License for more details. */ -body,td,th { +body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #000; + background-color: #FFF; + width: 540px; } -body { - background-color: #F0F0F0; - background-image: none; - background-repeat: repeat-x; - margin: 10px; -} a:link, a:visited, a:active { color: #036; text-decoration: none; @@ -64,85 +60,3 @@ form { margin: 0; } -.header { - width: 750px; - height: 80px; - background-color: #FFF; - vertical-align: top; -} -.menu { - vertical-align: top; - background-color: #FFF; - width: 170px; - padding: 0px; -} -.menu ul, .menu li{ - list-style-type: none; - margin: 0; - padding: 0; -} -.menu ul { - border-bottom: 0px; - background-color: #036; -} -.menu ul ul { - padding-left: 10px; -} -.menu a:link, .menu a:visited, .menu a:active { - padding: 4px 10px 4px 10px; - color: #FFF; - display: block; - background-color: #036; - text-decoration: none; -} -.menu a:hover { - background-color: #369; - text-decoration: none; -} -.menu-current { - font-weight: bold; -} -.highlight { - background-color: #D0D0D0; -} -.border { - font-size: 1px; - height: 10px; -} -.login { - padding: 2px 10px 2px 10px; - font-size: 10px; - background-color: #036; - color: #FFF; - text-align: center; -} -.login input { - width: 95%; - font-size: 10px; -} -.login a:link, .login a:visited, .login a:active { - color: #DDD; - text-decoration: none; -} -.login a:hover { - color: #FFF; - text-decoration: none; -} -.powered_by { - padding: 3px 0px 0px 15px; - background-color: #FFF; -} -.content { - padding: 10px; - background-color: #FFF; - height: 300px; - vertical-align: top; - text-align: left; -} -.footer { - padding: 5px; - height: 20px; - color: #FFF; - vertical-align: middle; - text-align: center; -} \ No newline at end of file