Merge pull request #86 from ggoffy/master

fixed several bugs
XoopsModules25x · Mar 5, 2022 · e649730 · e649730
2 parents 3c11f5d + ec54d5c
commit e649730
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -4,6 +4,9 @@
  - code cleaning (PS inspect code) (goffy)
  - added new update procedure (goffy)
  - updated viewerjs to last version (goffy)
+ - added chmod in install/update (cesagonchu/goffy)
+ - hide download button when album is empty (cesagonchu/goffy)
+ - fixed bug with download zip (cesagonchu/goffy)
 
 <h5>1.15 RC2</h5>  [2021/04/19]
 <hr>

diff --git a/download.php b/download.php
@@ -77,12 +77,12 @@
                 header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
                 header('Cache-Control: public');
                 header('Content-Description: File Transfer');
-                header('Content-type: application/octet-stream');
+                header('Content-type: application/zip');
                 header('Content-Disposition: attachment; filename="' . $archive_file_name . '"');
                 header('Content-Transfer-Encoding: binary');
-                header('Content-Length: ' . filesize($archive_file_path));
-                ob_end_flush();
-                @readfile($archive_file_path);
+                header('Content-Length: ' . \filesize($archive_file_path));
+                \flush();
+                \readfile($archive_file_path);
                 \unlink($archive_file_path);
 
                 // mark all images of album as downloaded

diff --git a/include/oninstall.php b/include/oninstall.php
@@ -74,6 +74,7 @@ function xoops_module_install_wggallery(\XoopsModule $module)
         //    foreach (\array_keys($GLOBALS['uploadFolders']) as $i) {
         foreach (\array_keys($configurator->uploadFolders) as $i) {
             $utility::createFolder($configurator->uploadFolders[$i]);
+            chmod($configurator->uploadFolders[$i], 0777);
         }
     }
 

diff --git a/templates/wggallery_albumitem_1.tpl b/templates/wggallery_albumitem_1.tpl
@@ -41,7 +41,7 @@
                 <a class='btn btn-default wgg-btn' href='index.php?op=list&amp;subm_id=<{$album.alb_submitter}>' title='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'>
                     <span class = "wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>submitter.png' alt='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'></span><{if $displayButtonText|default:false}><{$album.submitter}><{/if}></a>
             <{/if}>
-            <{if $album.download|default:''}>
+            <{if $album.download|default:'' && $album.nb_images|default:0 > 0}>
                 <a class='btn btn-default wgg-btn' href='<{$wggallery_url}>/download.php?op=album&amp;alb_id=<{$album.id}>' title='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'>
                     <img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>download.png' alt='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'><{if $displayButtonText|default:false}><{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}><{/if}></a>
             <{/if}>

diff --git a/templates/wggallery_albumitem_2.tpl b/templates/wggallery_albumitem_2.tpl
@@ -1,3 +1,4 @@
+
 <{if $album.image|default:''}>
     <div class='center'>
         <{if $album.nb_images|default:''}>
@@ -36,7 +37,7 @@
         <a class='btn btn-default wgg-btn' href='index.php?op=list&amp;subm_id=<{$album.alb_submitter}>' title='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'>
             <span class = "wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>submitter.png' alt='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'></span><{if $displayButtonText|default:false}><{$album.submitter}><{/if}></a>
     <{/if}>
-    <{if $album.download|default:''}>
+    <{if $album.download|default:'' && $album.nb_images|default:0 > 0}>
         <a class='btn btn-default wgg-btn' href='<{$wggallery_url}>/download.php?op=album&amp;alb_id=<{$album.id}>' title='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'>
             <img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>download.png' alt='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'><{if $displayButtonText|default:false}><{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}><{/if}></a>
     <{/if}>

diff --git a/templates/wggallery_albums_default.tpl b/templates/wggallery_albums_default.tpl
@@ -1,4 +1,5 @@
 <{include file='db:wggallery_header.tpl'}>
+
 <{if $albums_list|default:''}>
 	<div class='col-sm-12 col-sm-8'>
 	<div class='panel panel-<{$panel_type|default:''}>'>
@@ -57,7 +58,7 @@
                             <a class='btn btn-default wgg-btn' href='albums.php?op=delete&amp;alb_id=<{$album.id}>&amp;alb_pid=<{$album.pid}>' title='<{$smarty.const._DELETE}>'>
                                 <img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>delete.png' alt='<{$smarty.const._DELETE}>'><{if $displayButtonText|default:false}><{$smarty.const._DELETE}><{/if}></a>
                         <{/if}>
-                        <{if 0 == $album.iscoll|default:0 && $album.download|default:''}>
+                        <{if 0 == $album.iscoll|default:0 && $album.download|default:'' && $album.nb_images|default:0 > 0}>
                             <a class='btn btn-default wgg-btn' href='<{$wggallery_url}>/download.php?op=album&amp;alb_id=<{$album.id}>' title='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'>
                                 <img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>download.png' alt='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'><{if $displayButtonText|default:false}><{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}><{/if}></a>
                         <{/if}>