Revision 1565
Added by Dietmar over 12 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
|
| 13 | 13 |
=========================== add small Features 2.8.2 ========================== |
| 14 |
06 Jan-2012 Build 1565 Dietmar Woellbrink (Luisehahne) |
|
| 15 |
! fixed:: detection of serverdefined charsets more different |
|
| 14 | 16 |
06 Jan-2012 Build 1564 Dietmar Woellbrink (Luisehahne) |
| 15 | 17 |
# entities fixes in FI and TR languages files (Tks to Ruebenwurzel) |
| 16 | 18 |
06 Jan-2012 Build 1563 Dietmar Woellbrink (Luisehahne) |
| branches/2.8.x/wb/admin/start/index.php | ||
|---|---|---|
| 52 | 52 |
if($database->query($sql)) { }
|
| 53 | 53 |
} |
| 54 | 54 |
// --------------------------------------- |
| 55 |
$msg = ''; |
|
| 55 |
$msg = '<br />';
|
|
| 56 | 56 |
// check if it is neccessary to start the uograde-script |
| 57 | 57 |
if(($admin->get_user_id()==1) && file_exists(WB_PATH.'/upgrade-script.php')) {
|
| 58 | 58 |
// check if it is neccessary to start the uograde-script |
| ... | ... | |
| 69 | 69 |
exit; |
| 70 | 70 |
} |
| 71 | 71 |
} else {
|
| 72 |
$msg .= (file_exists(WB_PATH.'/upgrade-script.php') ? '<br />'.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'<br />' : '');
|
|
| 72 |
$msg .= (file_exists(WB_PATH.'/upgrade-script.php') ? ''.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'<br />' : ''); |
|
| 73 | 73 |
} |
| 74 | 74 |
} |
| 75 | 75 |
} |
| 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', '1564');
|
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1565');
|
|
| 56 | 56 |
if(!defined('SP')) define('SP', 'SP2');
|
| branches/2.8.x/wb/install/stylesheet.css | ||
|---|---|---|
| 1 |
body,td,th,input,textarea { font-family :Verdana, Arial, Helvetica, sans-serif; font-size :12px; color :#000000; }
|
|
| 2 |
body { background-color :#a8bccb; background-image :url(../templates/wb_theme/images/background.png); background-repeat :repeat-x; margin :0px; }
|
|
| 3 |
form { margin :0; }
|
|
| 4 |
input:focus, select:focus { background :#f1f8fd; }
|
|
| 5 |
.wrong { background-color :#ffdbdb; }
|
|
| 6 |
.submit { border :solid 2px #cccccc; background :#ffeeee; color :#ee0000; font-weight :bold; font-size :11px; padding :4px; width :100%; }
|
|
| 7 |
.content { background-color :#ffffff; padding :15px; height :350px; width :850px; text-align :justify; vertical-align :top; }
|
|
| 8 |
hr { margin :1em auto; color :#003366; height :1px; }
|
|
| 9 |
h1 { font-size :130%; color :#336699; margin :0px 0px 5px 0px; border-bottom :1px solid #cccccc; }
|
|
| 10 |
a:link, a:visited, a:active { color :#003366; text-decoration :none; }
|
|
| 11 |
a:hover { text-decoration :none; color :#336699; }
|
|
| 12 |
.bad { color :#ff0000; font-weight :bold; }
|
|
| 13 |
.good { color :#009900; font-weight :bold; }
|
|
| 14 |
.note { color :#666666; font-size :10px; }
|
|
| 15 |
.hide { display :none; }
|
|
| 16 |
.warning { border :2px #884444 solid; padding :1px; margin :5px auto; background :#ffeeee; color :#ee0000; text-align :center; font-size :1.2em; line-height :1em; }
|
|
| 1 |
body,td,th,input,textarea { font-family :Verdana, Arial, Helvetica, sans-serif; font-size :12px; color :#000000; }
|
|
| 2 |
body { background-color :#a8bccb; background-image :url(../templates/wb_theme/images/background.png); background-repeat :repeat-x; margin :0px; }
|
|
| 3 |
form { margin :0; }
|
|
| 4 |
input:focus, select:focus { background :#f1f8fd; }
|
|
| 5 |
.wrong { background-color :#ffdbdb; }
|
|
| 6 |
.submit { border :solid 2px #cccccc; background :#ffeeee; color :#ee0000; font-weight :bold; font-size :11px; padding :4px; width :100%; }
|
|
| 7 |
.content { background-color :#ffffff; padding :15px; height :350px; width :850px; text-align :justify; vertical-align :top; }
|
|
| 8 |
hr { margin :1em auto; color :#003366; height :1px; }
|
|
| 9 |
h1 { font-size :130%; color :#336699; margin :0px 0px 5px 0px; border-bottom :1px solid #cccccc; }
|
|
| 10 |
a:link, a:visited, a:active { color :#003366; text-decoration :none; }
|
|
| 11 |
a:hover { text-decoration :none; color :#336699; }
|
|
| 12 |
.bad { color :#ff0000; font-weight :bold; }
|
|
| 13 |
.good { color :#009900; font-weight :bold; }
|
|
| 14 |
.note { color :#666666; font-size :10px; }
|
|
| 15 |
.hide { display :none; }
|
|
| 16 |
.warning { border :2px #884444 solid; padding :5px; margin :5px auto; background :#ffeeee; color :#ee0000; text-align :center; font-size :12px; font-weight :normal; line-height :16px; -webkit-border-radius :0.75em; -moz-border-radius :0.75em; border-radius :0.75em; }
|
|
| branches/2.8.x/wb/install/index.php | ||
|---|---|---|
| 161 | 161 |
?> |
| 162 | 162 |
</td> |
| 163 | 163 |
</tr> |
| 164 |
<tr>
|
|
| 165 |
<td width="160" style="color: #666666;">AddDefaultCharset unset</td>
|
|
| 164 |
<tr> |
|
| 165 |
<td width="160" style="color: #666666;">Server DefaultCharset</td>
|
|
| 166 | 166 |
<td width="60"> |
| 167 | 167 |
<?php |
| 168 |
if($e_adc) {
|
|
| 169 |
$installFlag = false; |
|
| 170 |
?><font class="bad">No</font><?php |
|
| 168 |
$chrval = (($e_adc != '') && (strtolower($e_adc) != 'utf-8') ? true : false); |
|
| 169 |
if($chrval == false) {
|
|
| 170 |
?><font class="good"> |
|
| 171 |
<?php echo (($e_adc=='') ? 'OK' : $e_adc) ?> |
|
| 172 |
</font> |
|
| 173 |
<?php |
|
| 171 | 174 |
} else {
|
| 172 |
?><font class="good">Yes</font><?php
|
|
| 175 |
?><font class="bad"><?php echo $e_adc ?></font><?php
|
|
| 173 | 176 |
} |
| 177 |
|
|
| 174 | 178 |
?> |
| 175 | 179 |
</td> |
| 176 | 180 |
<td colspan="4"> </td> |
| 177 | 181 |
</tr> |
| 178 |
<?php if($e_adc) {
|
|
| 179 |
$installFlag = false; |
|
| 182 |
<?php if($chrval == true) {
|
|
| 180 | 183 |
?> |
| 181 | 184 |
<tr> |
| 182 |
<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> |
|
| 185 |
<td colspan="6" style="font-size: 10px;" class="bad"> |
|
| 186 |
<p class="warning"> |
|
| 187 |
<b>Please note:</b> Yor webserver is configured to deliver <b><?php echo $e_adc;?></b> charset only.<br /> |
|
| 188 |
To display national special characters (e.g.: ä á) in clear manner, switch off this preset please(or let it do by your hosting provider).<br /> |
|
| 189 |
In any case you can choose <b><?php echo $e_adc;?></b> in the settings of WebsiteBaker.<br /> |
|
| 190 |
But this solution does not guarranty a correct displaying of the content from all modules! |
|
| 191 |
</p> |
|
| 192 |
</td> |
|
| 183 | 193 |
</tr> |
| 184 | 194 |
<?php } ?> |
| 185 | 195 |
</table> |
Also available in: Unified diff
fixed:: detection of serverdefined charsets more different