Revision 1316
Added by Luisehahne over 14 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
12 | 12 |
|
13 | 13 |
------------------------------------- 2.8.1 ------------------------------------- |
14 | 14 |
11-Apr-2010 Dietmar Woellbrink (Luisehahne) |
15 |
# Ticket #978 Add additional PHP 5.2 check to installation |
|
16 |
# Ticket #979 False PHP 4 requirements in install |
|
17 |
# Ticket #980 Usebility - Bug in the settings-interface |
|
18 |
# Ticket #981 typos in backend-theme "argos" in file groups.htt |
|
19 |
11-Apr-2010 Dietmar Woellbrink (Luisehahne) |
|
15 | 20 |
# fix ticket #975 some weird /pages/ header infos |
16 | 21 |
11-Apr-2010 Dietmar Woellbrink (Luisehahne) |
17 | 22 |
! little fixes for backwards compatible PHP4, pls test |
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.x'); |
55 |
if(!defined('REVISION')) define('REVISION', '1315');
|
|
55 |
if(!defined('REVISION')) define('REVISION', '1316');
|
|
56 | 56 |
|
57 | 57 |
?> |
branches/2.8.x/wb/templates/wb_theme/theme.css | ||
---|---|---|
131 | 131 |
.c75l, .c75r, .c80l, .c80r { width: 75%; } |
132 | 132 |
|
133 | 133 |
.info { padding: 10px; margin-bottom: 0.5em; background: #f8f8f8; color: #666; font-size: 91.7%; } |
134 |
.note { border: 2px #484 solid; padding: 10px;margin: 10px 10px 10px 270px; background: #efe; color: #040; }
|
|
134 |
.note { border: 2px #484 solid; padding: 10px;margin: 10px auto; background: #efe; color: #040; }
|
|
135 | 135 |
.important { border: 2px #884 solid; padding: 10px; margin-bottom: 1em; background: #ffe; color: #440; } |
136 | 136 |
.warning { border: 2px #844 solid; padding: 10px; margin-bottom: 1em; background: #fee; color: #400; } |
137 | 137 |
|
branches/2.8.x/wb/templates/wb_theme/templates/settings.htt | ||
---|---|---|
398 | 398 |
<label for="world_writeable"> |
399 | 399 |
{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777) |
400 | 400 |
</label> |
401 |
<br /> |
|
402 |
<font class="note">({WORLD_WRITEABLE_WARNING})</font> |
|
401 |
<span class="warning">({WORLD_WRITEABLE_WARNING})</span> |
|
403 | 402 |
</div> |
404 | 403 |
<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div> |
405 | 404 |
</td> |
branches/2.8.x/wb/templates/argos_theme/templates/settings.htt | ||
---|---|---|
388 | 388 |
<label for="world_writeable"> |
389 | 389 |
{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777) |
390 | 390 |
</label> |
391 |
<br /> |
|
392 |
<font class="note">({WORLD_WRITEABLE_WARNING})</font> |
|
391 |
<span class="warning">({WORLD_WRITEABLE_WARNING})</span> |
|
393 | 392 |
</div> |
394 | 393 |
<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div> |
395 | 394 |
</td> |
branches/2.8.x/wb/templates/argos_theme/templates/groups.htt | ||
---|---|---|
1 |
<!-- BEGIN main_block --> |
|
2 |
|
|
3 |
<form name="groups" action="groups.php" method="post"> |
|
4 |
<input type="hidden" name="action" value="delete" /> |
|
5 |
|
|
6 |
<table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;"> |
|
7 |
<tr style="background:#f0f0f0;"> |
|
8 |
<td align="left"><h2>{HEADING_MODIFY_DELETE_GROUP}</h2></td> |
|
9 |
<td align="right"> |
|
10 |
<!-- BEGIN manage_users_block --> |
|
11 |
<a href="{ADMIN_URL}/users/index.php">{TEXT_MANAGE_USERS}</a> |
|
12 |
<!-- END manage_users_block --> |
|
13 |
</td> |
|
14 |
</tr> |
|
15 |
</table> |
|
16 |
|
|
17 |
<select name="group_id" style="width: 500px;"> |
|
18 |
<!-- BEGIN list_block --> |
|
19 |
<option value="{VALUE}"> |
|
20 |
{NAME} |
|
21 |
</option> |
|
22 |
<!-- END list_block --> |
|
23 |
</select> |
|
24 |
<input type="submit" name="modify" style="width: 100px;" value="{TEXT_MODIFY}" class="{DISPLAY_MODIFY}" /> |
|
25 |
<input type="submit" name="delete" style="width: 100px;" value="{TEXT_DELETE}" onClick="return confirm('{CONFIRM_DELETE}');" class="{DISPLAY_DELETE}" /> |
|
26 |
</form> |
|
27 |
<br /> |
|
28 |
<h2 class="{DISPLAY_ADD}"> |
|
29 |
{HEADING_ADD_GROUP} |
|
30 |
</h2> |
|
31 |
<!-- END main_block --> |
|
1 |
<!-- BEGIN main_block --> |
|
2 |
|
|
3 |
<form name="groups" action="groups.php" method="post"> |
|
4 |
<input type="hidden" name="action" value="delete" /> |
|
5 |
|
|
6 |
<table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;"> |
|
7 |
<tr style="background:#f0f0f0;"> |
|
8 |
<td align="left"><h2>{HEADING_MODIFY_DELETE_GROUP}</h2></td> |
|
9 |
<td align="right"> |
|
10 |
<!-- BEGIN manage_users_block --> |
|
11 |
<a href="{ADMIN_URL}/users/index.php">{TEXT_MANAGE_USERS}</a> |
|
12 |
<!-- END manage_users_block --> |
|
13 |
</td> |
|
14 |
</tr> |
|
15 |
</table> |
|
16 |
|
|
17 |
<select name="group_id" style="width: 500px;"> |
|
18 |
<!-- BEGIN list_block --> |
|
19 |
<option value="{VALUE}"> |
|
20 |
{NAME} |
|
21 |
</option> |
|
22 |
<!-- END list_block --> |
|
23 |
</select> |
|
24 |
<input type="submit" name="modify" style="width: 100px;" value="{TEXT_MODIFY}" class="{DISPLAY_MODIFY}" /> |
|
25 |
<input type="submit" name="delete" style="width: 100px;" value="{TEXT_DELETE}" onclick="return confirm('{CONFIRM_DELETE}');" class="{DISPLAY_DELETE}" /> |
|
26 |
</form> |
|
27 |
<br /> |
|
28 |
<h2 class="{DISPLAY_ADD}"> |
|
29 |
{HEADING_ADD_GROUP} |
|
30 |
</h2> |
|
31 |
<!-- END main_block --> |
branches/2.8.x/wb/install/stylesheet.css | ||
---|---|---|
34 | 34 |
background-color: #FFFFFF; |
35 | 35 |
padding: 15px; |
36 | 36 |
height: 350px; |
37 |
width: 750px;
|
|
37 |
width: 850px;
|
|
38 | 38 |
text-align: justify; |
39 | 39 |
vertical-align: top; |
40 | 40 |
} |
... | ... | |
71 | 71 |
} |
72 | 72 |
.hide { |
73 | 73 |
display: none; |
74 |
} |
|
74 |
} |
|
75 |
.warning { border: 2px #844 solid; padding: 1px; margin: 5px auto; background: #fee; color: #ee0000; text-align: center; font-size: 1.2em; line-height: 1em; } |
branches/2.8.x/wb/install/index.php | ||
---|---|---|
11 | 11 |
* @platform WebsiteBaker 2.8.x |
12 | 12 |
* @requirements PHP 4.3.4 and higher |
13 | 13 |
* @version $Id$ |
14 |
* @filesource $HeadURL: $
|
|
15 |
* @lastmodified $Date: $
|
|
14 |
* @filesource $HeadURL$ |
|
15 |
* @lastmodified $Date$ |
|
16 | 16 |
* |
17 | 17 |
*/ |
18 | 18 |
|
... | ... | |
90 | 90 |
</head> |
91 | 91 |
<body> |
92 | 92 |
|
93 |
<table cellpadding="0" cellspacing="0" border="0" width="750" align="center">
|
|
93 |
<table cellpadding="0" cellspacing="0" border="0" width="850" align="center">
|
|
94 | 94 |
<tr> |
95 | 95 |
<td width="60" valign="top"> |
96 | 96 |
<img src="../templates/wb_theme/images/logo.png" alt="Logo" /> |
... | ... | |
108 | 108 |
<input type="hidden" name="password_fieldname" value="admin_password" /> |
109 | 109 |
<input type="hidden" name="remember" id="remember" value="true" /> |
110 | 110 |
|
111 |
<table cellpadding="0" cellspacing="0" border="0" width="750" align="center" style="margin-top: 10px;">
|
|
111 |
<table cellpadding="0" cellspacing="0" border="0" width="850" align="center" style="margin-top: 10px;">
|
|
112 | 112 |
<tr> |
113 | 113 |
<td class="content"> |
114 | 114 |
|
... | ... | |
131 | 131 |
</tr> |
132 | 132 |
<?php } ?> |
133 | 133 |
<tr> |
134 |
<td width="160" style="color: #666666;">PHP Version > 4.1.0</td>
|
|
134 |
<td width="160" style="color: #666666;">PHP Version > 4.4.9</td>
|
|
135 | 135 |
<td width="60"> |
136 | 136 |
<?php |
137 |
$phpversion = substr(PHP_VERSION, 0, 6);
|
|
138 |
if($phpversion > 4.1) {
|
|
137 |
if (version_compare(PHP_VERSION, '4.4.9', '>='))
|
|
138 |
{
|
|
139 | 139 |
?><font class="good">Yes</font><?php |
140 | 140 |
} else { |
141 | 141 |
?><font class="bad">No</font><?php |
... | ... | |
151 | 151 |
?><font class="good">Disabled</font><?php |
152 | 152 |
} else { |
153 | 153 |
?><font class="bad">Enabled</font><?php |
154 |
}
|
|
154 |
} |
|
155 | 155 |
?> |
156 | 156 |
</td> |
157 | 157 |
</tr> |
... | ... | |
167 | 167 |
?> |
168 | 168 |
</td> |
169 | 169 |
<td colspan="4"> </td> |
170 |
<?php if (version_compare(PHP_VERSION, '5.2.1', '<')){ ?> |
|
171 |
<tr> |
|
172 |
<td colspan="7"> |
|
173 |
<div class="warning"> |
|
174 |
<p>Your current PHP Version is: <?php print PHP_VERSION; ?></p><h4>Please upgrade your Hosting to PHP Version 5.2.1 or higher</h4> |
|
175 |
<p>PHP 4 is no longer under development nor will any security updates be released.</p> |
|
176 |
|
|
177 |
</div> |
|
178 |
</td> |
|
170 | 179 |
</tr> |
180 |
<?php } ?> |
|
181 |
</tr> |
|
171 | 182 |
<?php if($e_adc) { ?> |
172 | 183 |
<tr> |
173 | 184 |
<td colspan="6" style="font-size: 10px;" class="bad">Please note: AddDefaultCharset is set to <?php echo $e_adc;?> in apache.conf.<br />If you have to use umlauts (e.g. ä á) please change this to Off. - Or use <?php echo $e_adc;?> inside website baker, too.</td> |
174 | 185 |
Also available in: Unified diff
Ticket #978 Add additional PHP 5.2 check to installation
Ticket #979 False PHP 4 requirements in install
Ticket #980 Usebility - Bug in the settings-interface
Ticket #981 typos in backend-theme "argos" in file groups.htt