Project

General

Profile

« Previous | Next » 

Revision 1557

Added by Dietmar almost 13 years ago

! update editor.css for allcssand round (Tks to Ruebenwurzel)
  1. bugfix in forgot_form.php

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
=========================== add small Features 2.8.2 ==========================
14
02 Jan-2012 Build 1557 Dietmar Woellbrink (Luisehahne)
15
! update editor.css for allcssand round  (Tks to Ruebenwurzel)
16
# bugfix in forgot_form.php
14 17
02 Jan-2012 Build 1556 Dietmar Woellbrink (Luisehahne)
15 18
# typofix in function make_dir
16 19
02 Jan-2012 Build 1555 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/include/quickSkin/wb_quickSkin_28.php
8 8
/* -------------------------------------------------------- */
9 9

  
10 10
// use Debug Mode?
11
$debugmode = false; 
12
if(!isset($module_dir)) {
13
		die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Missing variable $module_dir</h2></body></html>');
14
}
11
$debugmode = false;
12

  
15 13
$aMsg = array();
16 14
require_once(WB_PATH.'/framework/functions.php');
17 15
// COMPILED TEMPLATES
18
$_CONFIG['quickskin_compiled'] = WB_PATH.'/temp/'.$module_dir.'/_skins_tmp/';
16
$_CONFIG['quickskin_compiled'] = WB_PATH.'/temp/quickSkin/_skins_tmp/';
19 17
if(!is_dir($_CONFIG['quickskin_compiled'])) {
20 18
	$msg = createFolderProtectFile($_CONFIG['quickskin_compiled']);
21 19
	if(sizeof($msg)) {
......
25 23
}
26 24

  
27 25
// CACHED FILES
28
$_CONFIG['quickskin_cache'] = WB_PATH.'/temp/'.$module_dir.'/_skins_cache/';
26
$_CONFIG['quickskin_cache'] = WB_PATH.'/temp/quickSkin/_skins_cache/';
29 27
if(!is_dir($_CONFIG['quickskin_cache'])) {
30 28
	$msg = createFolderProtectFile($_CONFIG['quickskin_cache']);
31 29
	if(sizeof($msg)) {
branches/2.8.x/wb/admin/interface/version.php
52 52

  
53 53
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
54 54
if(!defined('VERSION')) define('VERSION', '2.8.2');
55
if(!defined('REVISION')) define('REVISION', '1556');
55
if(!defined('REVISION')) define('REVISION', '1557');
56 56
if(!defined('SP')) define('SP', 'SP2');
branches/2.8.x/wb/account/forgot_form.php
18 18
// Must include code to stop this file being access directly
19 19
if(defined('WB_PATH') == false) { die("Cannot access this file directly"); }
20 20
// Check if the user has already submitted the form, otherwise show it
21
if(isset($_POST['email']) && $_POST['email'] != "" &&
22
    preg_match("/([0-9a-zA-Z]+[-._+&])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}/i", $_POST['email']))
21
if(isset($_POST['email']) && $_POST['email'] != "" )
23 22
{
24 23
	$email = strip_tags($_POST['email']);
25 24
// Check if the email exists in the database
......
29 28
	if(($results = $database->query($sql)))
30 29
	{
31 30
		if(($results_array = $results->fetchRow()))
32
	if($results->numRows() > 0) {
33
	
34 31
		{ // Get the id, username, email, and last_reset from the above db query
35 32
		// Check if the password has been reset in the last 2 hours
36 33
			if( (time() - (int)$results_array['last_reset']) < (2 * 3600) ) {
branches/2.8.x/wb/templates/allcss/editor.css
26 26
 * GNU General Public License for more details.
27 27
*/
28 28

  
29
body,td,th {
29
body {
30 30
	font-family: Verdana, Arial, Helvetica, sans-serif;
31 31
	font-size: 12px;
32
	text-align: justify;
32 33
	color: #000;
34
	background-color: #FFF;
35
	width: 580px;
33 36
}
34
body {
35
   background-color: #F0F0F0;
36
   background-image: none;
37
   margin: 0;
38
}
39 37
a:link, a:visited, a:active {
40 38
	color: #603;
41 39
	text-decoration: none;
......
61 59
form {
62 60
	margin: 0;
63 61
}
64
.main {
65
	width: 750px;
66
	margin: auto;
67
	padding: 0;
68
	background-color: #FFF;
69
}
70
.banner, .search_box {
71
	height: 80px;
72
	background-image: url(images/header.jpg);
73
	background-repeat: repeat-x;
74
	font-size: 20px;
75
	font-weight: bold;
76
	color: #FFF;
77
	text-align: center;
78
	padding-top: 20px;
79
}
80

  
81
.banner {
82
	width: 530px;
83
	padding-left: 20px;
84
	float: left;
85
	text-align: left;
86
}
87
.search_box {
88
	float: right;
89
	clear: right;
90
	width: 200px;
91
}
92
.search_string {
93
	width: 100px;
94
	height: 16px;
95
	font-size: 10px;
96
	vertical-align: middle;
97
}
98
.search_submit {
99
	width: 50px;
100
	height: 22px;
101
	font-size: 10px;
102
	vertical-align: middle;
103
}
104
.highlight {
105
	background-color: #D0D0D0;
106
}
107
.banner a {
108
	color: #FFF;
109
}
110
.banner span {
111
	color: #D0D0D0;
112
}
113

  
114
.menu {
115
	float: left;
116
	width: 140px;
117
	margin: 10px;
118
	margin-top: 3px;
119
}
120
.menu ul, .menu li {
121
	margin: 0;
122
	padding: 0;
123
	list-style: none;
124
	margin-bottom: 5px;
125
}
126
.menu ul ul {
127
	padding-left: 8px;
128
}
129
.menu a:link, .menu a:visited, .menu a:active, .menu a:hover {
130
	display: block;
131
	padding: 2px;
132
}
133
.menu-default a:link, .menu-default a:visited, .menu-default a:active {
134
	border-bottom: 1px dashed #999;
135
}
136
.menu-default a:hover {
137
	border-bottom: 1px dashed #333;
138
}
139

  
140
.menu-current  {
141
	border-bottom: 1px dashed #999;
142
	font-weight:bold;
143
}
144

  
145
.menu fieldset {
146
	border: 1px solid #D0D0D0;
147
	margin-top: 20px;
148
	margin-bottom: 5px;
149
	text-align: center;
150
	padding-bottom: 3px;
151
}
152

  
153
.menu legend {
154
	color: #603;
155
	font-size: 12px;
156
	text-transform: uppercase;
157
	font-weight: bold;
158
	text-align: center;
159
}
160

  
161
.menu input {
162
	text-transform: uppercase;
163
	font-size: 10px;
164
	margin: 5px 0px 1px 0px;
165
	width: 100px;
166
}
167

  
168
.content {
169
	margin-left: 150px;
170
	padding: 4px 10px 14px 10px;
171
	text-align: justify;
172
	clear: right;
173
}
174
.footer {
175
	background-color: #FFF;
176
	clear: both;
177
	height: 20px;
178
	background-image: url(images/footer.jpg);
179
	background-repeat: repeat-x;
180
	font-size: 10px;
181
	color: #666;
182
	text-align: center;
183
	line-height: 18px;
184
}
185
.powered_by {
186
	text-align: center;
187
	font-size: 10px;
188
	padding-top: 2px;
189
}
branches/2.8.x/wb/templates/round/editor.css
26 26
 * GNU General Public License for more details.
27 27
*/
28 28

  
29
body,td,th {
29
body {
30 30
	font-family: Verdana, Arial, Helvetica, sans-serif;
31 31
	font-size: 12px;
32 32
	color: #000;
33
	background-color: #FFF;
34
	width: 540px;
33 35
}
34
body {
35
   background-color: #F0F0F0;
36
   background-image: none;
37
   background-repeat: repeat-x;
38
   margin: 10px;
39
}
40 36
a:link, a:visited, a:active {
41 37
	color: #036;
42 38
	text-decoration: none;
......
64 60
form {
65 61
	margin: 0;
66 62
}
67
.header {
68
	width: 750px;
69
	height: 80px;
70
	background-color: #FFF;
71
	vertical-align: top;
72
}
73
.menu {
74
	vertical-align: top;
75
	background-color: #FFF;
76
	width: 170px;
77
	padding: 0px;
78
}
79
.menu ul, .menu li{
80
	list-style-type: none;
81
	margin: 0;
82
	padding: 0;
83
}
84
.menu ul {
85
	border-bottom: 0px;
86
	background-color: #036;
87
}
88
.menu ul ul {
89
	padding-left: 10px;
90
}
91
.menu a:link, .menu a:visited, .menu a:active {
92
	padding: 4px 10px 4px 10px;
93
	color: #FFF;
94
	display: block;
95
	background-color: #036;
96
	text-decoration: none;
97
}
98
.menu a:hover {
99
	background-color: #369;
100
	text-decoration: none;
101
}
102
.menu-current {
103
	font-weight: bold;
104
}
105
.highlight {
106
	background-color: #D0D0D0;
107
}
108
.border {
109
	font-size: 1px;
110
	height: 10px;
111
}
112
.login {
113
	padding: 2px 10px 2px 10px;
114
	font-size: 10px;
115
	background-color: #036;
116
	color: #FFF;
117
	text-align: center;
118
}
119
.login input {
120
	width: 95%;
121
	font-size: 10px;
122
}
123
.login a:link, .login a:visited, .login a:active {
124
	color: #DDD;
125
	text-decoration: none;
126
}
127
.login a:hover {
128
	color: #FFF;
129
	text-decoration: none;
130
}
131
.powered_by {
132
	padding: 3px 0px 0px 15px;
133
	background-color: #FFF;
134
}
135
.content {
136
	padding: 10px;
137
	background-color: #FFF;
138
	height: 300px;
139
	vertical-align: top;
140
	text-align: left;
141
}
142
.footer {
143
	padding: 5px;
144
	height: 20px;
145
	color: #FFF;
146
	vertical-align: middle;
147
	text-align: center;
148
}

Also available in: Unified diff