Skip to content

Commit

Permalink
v0.3.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
crestAT committed Sep 22, 2018
1 parent e1feb75 commit f426aa3
Show file tree
Hide file tree
Showing 26 changed files with 11 additions and 115 deletions.
17 changes: 0 additions & 17 deletions .gitattributes

This file was deleted.

7 changes: 0 additions & 7 deletions owncloud/.user.ini

This file was deleted.

Binary file modified owncloud/locale-owncloud/ar/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/ca/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/cs/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/de/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/el/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/es/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/fr/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/it/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/ku/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/nl/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/ro/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/ru/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/sl/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/sv/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/tr/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/uk/LC_MESSAGES/nas4free.mo
Binary file not shown.
Binary file modified owncloud/locale-owncloud/zh_CN/LC_MESSAGES/nas4free.mo
Binary file not shown.
27 changes: 4 additions & 23 deletions owncloud/owncloud-config.php
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ function change_perms($dir) {
$return_val = mwexec("tar -xf {$configuration['storage_path']}/master.zip -C {$configuration['storage_path']}/ --strip-components 1", false);
if ($return_val == 0) {
exec("rm {$configuration['storage_path']}/master.zip");
copy("{$configuration['rootfolder']}/.user.ini", "{$configuration['storage_path']}/.user.ini");
copy("{$configuration['rootfolder']}/nextowncloud-phpinfo.php", "{$config['websrv']['documentroot']}/nextowncloud-phpinfo.php");
mwexec("chown -R {$user} {$configuration['storage_path']}", true);
$savemsg = $configuration['application']." ".gettext("has been successfully installed.");
Expand Down Expand Up @@ -239,8 +238,6 @@ function change_perms($dir) {
fwrite($restore_script, "if [ $? -ne 0 ]; then echo 'Error - set maintenance mode ON failed!' >> \$RSYNC_LOGFILE; ERROR_COUNT=$((ERROR_COUNT+1)); fi"."\n");
fwrite($restore_script, "/usr/local/bin/rsync -Aax --log-file=\$RSYNC_LOGFILE --delete {$configuration[$configuration['application']]['backup_path']}/APPLICATION/config {$configuration[$configuration['application']]['storage_path']}"."\n");
fwrite($restore_script, "if [ $? -ne 0 ]; then echo 'Error during rsync execution!' >> \$RSYNC_LOGFILE; ERROR_COUNT=$((ERROR_COUNT+1)); fi"."\n");
fwrite($restore_script, "/usr/local/bin/rsync -Aax --log-file=\$RSYNC_LOGFILE --delete {$configuration[$configuration['application']]['backup_path']}/APPLICATION/.user.ini {$configuration[$configuration['application']]['storage_path']}"."\n");
fwrite($restore_script, "if [ $? -ne 0 ]; then echo 'Error during rsync execution!' >> \$RSYNC_LOGFILE; ERROR_COUNT=$((ERROR_COUNT+1)); fi"."\n");
fwrite($restore_script, "/usr/local/bin/rsync -Aax --log-file=\$RSYNC_LOGFILE --delete {$configuration[$configuration['application']]['backup_path']}/APPLICATION/themes {$configuration[$configuration['application']]['storage_path']}"."\n");
fwrite($restore_script, "if [ $? -ne 0 ]; then echo 'Error during rsync execution!' >> \$RSYNC_LOGFILE; ERROR_COUNT=$((ERROR_COUNT+1)); fi"."\n");
fwrite($restore_script, "/usr/local/bin/rsync -Aax --log-file=\$RSYNC_LOGFILE --delete {$configuration[$configuration['application']]['backup_path']}/DATA/ {$configuration[$configuration['application']]['download_path']}"."\n");
Expand Down Expand Up @@ -347,11 +344,6 @@ function change_perms($dir) {
});
//]]>
</script>
<!-- The Spinner Elements -->
<?php include("ext/owncloud/spinner.inc");?>
<script src="ext/owncloud/spin.min.js"></script>
<!-- use: onsubmit="spinner()" within the form tag -->

<script type="text/javascript">
<!--
function enable_change(enable_change) {
Expand Down Expand Up @@ -409,17 +401,6 @@ function change_application() {
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<?php html_titleline_checkbox("enable", gettext("NextOwnCloud"), $configuration['enable'], gettext("Enable"), "enable_change(false)");?>
<?php html_text("installation_directory", gettext("Installation directory"), sprintf(gettext("The extension is installed in %s"), $configuration['rootfolder']));?>
<?php
/*
* no longer neccessary -> owncloud latest >= 10.0
$curr_php = explode(".", PHP_VERSION);
if ($curr_php[0].".".$curr_php[1] > 7.0) {
if ($configuration['application'] == "OwnCloud") $out_str = "<a style='background-color: orange;'>&nbsp;<b>For this PHP version ownCloud 10.0.0 or higher is necessary, please check if this version is already available!</b>&nbsp;</a>";
}
else $out_str = "";
html_text("PHP_Version", gettext("PHP Version"), PHP_VERSION." ".$out_str);
*/
?>
<tr>
<td class="vncell"><?=gettext("Webserver")." ".gettext("Status");?></td>
<td class="vtable"><span name="getinfo_webserver" id="getinfo_webserver"><?=get_process_info()['webserver'];?></span></td>
Expand All @@ -436,7 +417,7 @@ function change_application() {
<td class="vtable">
<?php
if ($configuration['enable']) {
if (is_file("{$configuration['storage_path']}/.user.ini")) {
if (is_file("{$configuration['storage_path']}/index.php")) {
echo "<span id='getinfo_url'>{$configuration['url']}</span>&nbsp;&nbsp;&nbsp;";
if (is_file("{$config['websrv']['documentroot']}/nextowncloud-phpinfo.php")) {
echo "<span id='phpinfo_url'>{$configuration['phpinfo_url']}</span>";
Expand All @@ -448,9 +429,9 @@ function change_application() {
</tr>
</table>
<div id="remarks">
<?php html_remark("note", gettext("Note"), gettext("The values for <b>upload_max_filesize</b> and <b>post_max_size</b> will be set to 2 GB!")."<br />".
sprintf(gettext("Use the %s WebGUI > 'Administration' to change values and to update the application."), $configuration['application'])."<br /><b>".
sprintf(gettext("Always perform a %s prior to an application update!"), gettext("Backup"))."</b>");?>
<?php html_remark("note",
sprintf(gettext("Use the %s WebGUI > 'Administration' to change values and to update the application."), $configuration['application'])."<br /><b>".
sprintf(gettext("Always perform a %s prior to an application update!"), gettext("Backup"))."</b>");?>
</div>
<div id="submit">
<input name="save" type="submit" class="formbtn" value="<?=gettext("Save");?>"/>
Expand Down
2 changes: 1 addition & 1 deletion owncloud/owncloud-install.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
$version = "v0.3.2.1"; // extension version
$version = "v0.3.2.2"; // extension version
$appname = "NextOwnCloud"; // extension name
$config_name = "owncloud";

Expand Down
8 changes: 2 additions & 6 deletions owncloud/owncloud-update_extension.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,8 @@

bindtextdomain($domain, "/usr/local/share/locale"); // to get the right main menu language
include("fbegin.inc");
bindtextdomain($domain, "/usr/local/share/locale-owncloud"); ?>
<!-- The Spinner Elements -->
<?php include("ext/owncloud/spinner.inc");?>
<script src="ext/owncloud/spin.min.js"></script>
<!-- use: onsubmit="spinner()" within the form tag -->

bindtextdomain($domain, "/usr/local/share/locale-owncloud");
?>
<form action="owncloud-update_extension.php" method="post" name="iform" id="iform" onsubmit="spinner()">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td class="tabnavtbl">
Expand Down
2 changes: 0 additions & 2 deletions owncloud/owncloud/spin.min.js

This file was deleted.

58 changes: 0 additions & 58 deletions owncloud/owncloud/spinner.inc

This file was deleted.

3 changes: 3 additions & 0 deletions owncloud/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
Version Date Description
0.3.2.2 2018.09.23 F: remove predefined user.ini to prevent error message in ownCloud
C: update Ukrainian translation

0.3.2.1 2018.08.05 F: GUI translations not working due to name change to XigmaNAS
N: Arabic translation
N: Czech translation
Expand Down
2 changes: 1 addition & 1 deletion owncloud/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.2.1
0.3.2.2

0 comments on commit f426aa3

Please sign in to comment.