Skip to content

Commit

Permalink
Viscacha 0.8 RC7
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-mohr
m-mohr committed Oct 23, 2014
1 parent 0b78585 commit 3480ae7
Show file tree
Hide file tree
Showing 151 changed files with 3,955 additions and 3,351 deletions.
169 changes: 32 additions & 137 deletions _docs/readme.txt
View file
@@ -1,5 +1,5 @@
########################################
# Readme for Viscacha 0.8 RC 6 #
# Readme for Viscacha 0.8 RC 7 #
########################################

== Table of Contents ==
Expand All @@ -12,12 +12,15 @@

== 1 == Installation ==

1. Upload all files per ftp onto your server.
Note: You do not need to upload the folder install/files/ for the
installation! The folder is only required for the update.
2. Call the "install/" directory in the Viscacha-root-directory and
Warning: Since 0.8 RC7 we provide separate packages for installation
and update. Please use the package which contains "install"
in the name for an installation only.

1. Download the installation package from the Viscacha homepage!
2. Upload all files per ftp onto your server.
3. Call the "install/" directory in the Viscacha-root-directory and
follow the steps.
3. You have a "fresh" Viscacha-Installation on your server.
4. You have a "fresh" Viscacha-Installation on your server.

Note: More information on how to set up the CHMODs you can get while
installing the application. In the ACP you can also see a more
Expand All @@ -26,161 +29,53 @@ Note: More information on how to set up the CHMODs you can get while

== 2 == Update ==

Warning: Since 0.8 RC7 we provide separate packages for installation
and update. Please use the package which contains "update"
in the name for an update only.

1. Make a complete backup of your data (FTP + MySQL)!
2. Upload the install/ directory
3. Call / Execute the update script (Call the "install/" directory).
4. Follow all the steps while the update script is running.
5. After the update is ready and you are back in your Admin Control
Panel, please check for Updates of your installed Packages!
2. Download the update package from the Viscacha homepage!
3. Upload the install/ directory
4. Execute the update script (Call the "install/" directory).
5. Follow all the steps while the update script is running.
6. After the update is ready and you are back in your Admin Control
Panel, please check for updates of your installed packages!

Note: You can only update from Viscacha 0.8 RC5.
Note: You can only update from Viscacha 0.8 RC5 and 0.8 RC6.

== 2.1 == Stylesheet Changes ==
This changes are for later design updates.
This steps will also be shown in the update script!
== 2.1 == Stylesheet Changes (only RC6 to RC7) ==
This changes are for later design updates that are not installed while
updating. This steps will be shown or executed in the update script!

You have to apply the following changes (for all CSS files) to all
your installed designs. * is a placeholder for a Design-ID (1,2,3).
your installed designs. * is a placeholder for a Design-ID (1 2,3,...).
The CSS definitions can vary depending on your modifications to the
styles.

== Change in file designs/*/ie.css ==

1. Search and delete:
------------------------------------------------------------------------
* html .editor_textarea_outer .popup {
border-top-width: 0px;
}
* html .editor_textarea_outer .popup strong {
border-width: 0px;
border-top: 1px solid #888888;
}
* html .editor_textarea_outer .popup li {
border-top: 1px solid #c4c4c4;
}
------------------------------------------------------------------------

2. Add at the end of the file:
------------------------------------------------------------------------
* html .editor_textarea_outer .popup {
height: expression( this.scrollHeight > 249 ? "250px" : "auto" );
overflow-x: expression( this.scrollHeight > 249 && this.scrollWidth <= 200 ? "hidden" : "auto" );
}
* html .editor_textarea_outer .popup strong {
width: 196px;
}
* html .editor_textarea_outer .popup li {
width: 194px;
}
.bb_blockcode li {
white-space: normal;
}
------------------------------------------------------------------------


== Changes in file designs/*/standard.css ==

1. Search:
------------------------------------------------------------------------
.bb_blockcode li {
white-space: pre;
font-family: 'Courier New', monospace;
font-weight: normal;
font-style: normal;
margin-left: 4px;
}
------------------------------------------------------------------------

Replace with:
------------------------------------------------------------------------
.bb_blockcode * {
font-family: 'Courier New', monospace;
}
.bb_blockcode li {
margin-left: 12px;
white-space: pre;
hr {
height: 1px;
border: 0;
border-bottom: 1px #839FBC solid;
}
------------------------------------------------------------------------

2. Search:
------------------------------------------------------------------------
.editor_textarea_inner {
background-color: #FFFFFF;
font-size: 9pt;
border-width: 0px;
width: 100%;
overflow: auto;
margin: -4px;
padding: 4px;
}
------------------------------------------------------------------------

In this part of the stylesheet delete:
------------------------------------------------------------------------
overflow: auto;
------------------------------------------------------------------------

3. Search:
------------------------------------------------------------------------
.editor_textarea_outer .popup {
------------------------------------------------------------------------

Add below:
------------------------------------------------------------------------
overflow: auto;
------------------------------------------------------------------------

4. Search:
------------------------------------------------------------------------
.bbcolor {
padding: 10px;
background-color: #ffffff;
line-height: 13px;
font-size: 13px;
}
.bbcolor span {
width: 10px;
height: 13px;
display: block;
float: left;
cursor: pointer;
}
.bbcolor img {
width: 10px;
height: 13px;
border-width: 0px;
}
.bbcolor img:hover {
width: 8px;
height: 11px;
border: 1px solid #ffffff;
}
------------------------------------------------------------------------

Replace with:
------------------------------------------------------------------------
.bbcolor {
padding: 10px;
background-color: #ffffff;
line-height: 12px;
font-size: 12px;
}
.bbcolor img {
width: 8px;
height: 10px;
display: block;
float: left;
cursor: pointer;
border-width: 1px;
border-style: solid;
tt {
font-family: 'Courier New', monospace;
}
------------------------------------------------------------------------


== System requirements ==

Minimum system requirements:
- PHP Version: 4.3.0 and above
- PHP Version: 5.0.0 and above
(4.3.0 or higher may work, but is unsupported as of 0.8 RC7)
- PHP-Extensions: mysql or mysqli, pcre, gd, zlib
- MySQL Version: 4.0 and above

Expand Down
2 changes: 1 addition & 1 deletion addreply.php
View file
Expand Up @@ -187,7 +187,7 @@
if (!empty($_POST['Preview'])) {
$slog->updatelogged();
$db->close();
viscacha_header("Location: addreply.php?action=preview&id={$id}&fid=".$fid.SID2URL_JS_x);
sendStatusCode(307, $config['furl']."/addreply.php?action=preview&id={$id}&fid=".$fid.SID2URL_JS_x);
exit;
}
else {
Expand Down
5 changes: 4 additions & 1 deletion admin.php
View file
Expand Up @@ -97,6 +97,9 @@
elseif ($action == 'packages') {
include('admin/packages.php');
}
elseif ($action == 'admin') {
include('admin/packages_admin.php');
}
elseif ($action == 'profilefield') {
include('admin/profilefield.php');
}
Expand All @@ -112,7 +115,7 @@
$url = $gpc->get('url', none);
if (!empty($url)) {
$db->close();
viscacha_header('Location: '.$url);
sendStatusCode(307, $url);
exit;
}
else {
Expand Down
22 changes: 11 additions & 11 deletions admin/bbcodes.php
View file
Expand Up @@ -30,7 +30,7 @@
elseif ($job == 'smileys_edit') {
$editid = $gpc->get('id', arr_int);
if (count($editid) == 0) {
viscacha_header('Location: admin.php?action=bbcodes&job=smileys');
sendStatusCode(307, $config['furl'].'/admin.php?action=bbcodes&job=smileys');
exit;
}
$result = $db->query('SELECT * FROM '.$db->pre.'smileys WHERE id IN ('.implode(',', $editid).')');
Expand Down Expand Up @@ -379,8 +379,8 @@
<tr>
<td class="ubox" colspan="6" align="center">
Selected Smileys: <select name="job">
<option value="smileys_edit" selected="selected"><?php echo $lang->phrase('admin_bbc_edit'); ?></option>
<option value="smileys_export"><?php echo $lang->phrase('admin_bbc_export'); ?></option>
<option value="smileys_edit" selected="selected"><?php echo $lang->phrase('admin_bbc_edit'); ?></option>
<option value="smileys_export"><?php echo $lang->phrase('admin_bbc_export'); ?></option>
<option value="smileys_delete"><?php echo $lang->phrase('admin_bbc_delete'); ?></option>
</select>&nbsp;&nbsp;&nbsp;&nbsp;
<input type="submit" value="<?php echo $lang->phrase('admin_bbc_go'); ?>">
Expand Down Expand Up @@ -471,7 +471,7 @@
$error[] = $lang->phrase('admin_bbc_wrong_spec');
}
if (count($error) > 0) {
error('admin.php?action=bbcodes&job=smileys', $error);
error('admin.php?action=bbcodes&job=smileys', $error);
}
if ($has_upload) {
$filesystem->copy($path.$has_upload, $config['smileypath'].'/'.$has_upload);
Expand Down Expand Up @@ -837,7 +837,7 @@
}
$delobj = $scache->load('syntaxhighlight');
$delobj->delete();
ok('admin.php?action=bbcodes&job=codefiles', $lang->phrase('admin_bbc_files_successfully_deleted'));
ok('admin.php?action=bbcodes&job=codefiles', $lang->phrase('admin_bbc_files_successfully_deleted'));
}
elseif ($job == 'custombb_export') {
$id = $gpc->get('id', int);
Expand All @@ -851,8 +851,8 @@
$data = $db->fetch_assoc($result);
$data['button'] = null;

if (!empty($data['buttonimage']) && (preg_match(URL_REGEXP, $data['buttonimage']) || file_exists(CBBC_BUTTONDIR.$data['buttonimage'])) ) {
if (preg_match(URL_REGEXP, $data['buttonimage'])) {
if (!empty($data['buttonimage']) && (preg_match('~^'.URL_REGEXP.'$~i', $data['buttonimage']) || file_exists(CBBC_BUTTONDIR.$data['buttonimage'])) ) {
if (preg_match('~^'.URL_REGEXP.'$~i', $data['buttonimage'])) {
$button = get_remote($data['buttonimage']);
}
else {
Expand All @@ -862,7 +862,7 @@
$data['buttonimage'] = '';
}
else {
$ext = get_extension($data['buttonimage']);
$ext = get_extension($data['buttonimage']);
if (!in_array($ext, $imagetype_extension)) {
$data['buttonimage'] = '';
}
Expand Down Expand Up @@ -1186,7 +1186,7 @@
<tr><td class="mbox">
<p align="center"><?php echo $lang->phrase('admin_bbc_delete_bbc_question'); ?></p>
<p align="center">
<?php if (!preg_match(URL_REGEXP, $image['buttonimage']) && @file_exists(CBBC_BUTTONDIR.$image['buttonimage'])) { ?>
<?php if (!preg_match('~^'.URL_REGEXP.'$~i', $image['buttonimage']) && @file_exists(CBBC_BUTTONDIR.$image['buttonimage'])) { ?>
<a href="admin.php?action=bbcodes&amp;job=custombb_delete2&amp;id=<?php echo $id; ?>&amp;img=1"><img border="0" align="absmiddle" alt="" src="admin/html/images/yes.gif"> <?php echo $lang->phrase('admin_bbc_including_image'); ?></a><br />
<a href="admin.php?action=bbcodes&amp;job=custombb_delete2&amp;id=<?php echo $id; ?>"><img border="0" align="absmiddle" alt="" src="admin/html/images/yes.gif"> <?php echo $lang->phrase('admin_bbc_without_image'); ?></a><br />
<?php } else { ?>
Expand All @@ -1206,7 +1206,7 @@
if ($img == 1) {
$result = $db->query("SELECT buttonimage FROM {$db->pre}bbcode WHERE id = '{$id}' LIMIT 1");
$image = $db->fetch_assoc($result);
if (!preg_match(URL_REGEXP, $image['buttonimage']) && @file_exists(CBBC_BUTTONDIR.$image['buttonimage'])) {
if (!preg_match('~^'.URL_REGEXP.'$~i', $image['buttonimage']) && @file_exists(CBBC_BUTTONDIR.$image['buttonimage'])) {
$filesystem->unlink(CBBC_BUTTONDIR.$image['buttonimage']);
}
}
Expand Down Expand Up @@ -1278,7 +1278,7 @@
<?php
while ($bbcode = $db->fetch_assoc($result)) {
if (!empty($bbcode['buttonimage'])) {
if (!preg_match(URL_REGEXP, $bbcode['buttonimage'])) {
if (!preg_match('~^'.URL_REGEXP.'$~i', $bbcode['buttonimage'])) {
$bbcode['buttonimage'] = CBBC_BUTTONDIR.$bbcode['buttonimage'];
}
$src = "<img style=\"background-color: buttonface; border:solid 1px highlight;\" src=\"{$bbcode['buttonimage']}\" alt=\"\" />";
Expand Down

0 comments on commit 3480ae7

Please sign in to comment.