Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11900] XoopsModules/extgallery/trunk/modules/ extgallery
|
From: <be...@us...> - 2013-08-12 23:08:09
|
Revision: 11900
http://sourceforge.net/p/xoops/svn/11900
Author: beckmi
Date: 2013-08-12 23:08:07 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
added .jpeg extension, update to 1.12 Beta 1
Modified Paths:
--------------
XoopsModules/extgallery/trunk/modules/extgallery/admin/photo.php
XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt
XoopsModules/extgallery/trunk/modules/extgallery/public-download.php
XoopsModules/extgallery/trunk/modules/extgallery/xoops_version.php
Modified: XoopsModules/extgallery/trunk/modules/extgallery/admin/photo.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/admin/photo.php 2013-08-11 23:49:58 UTC (rev 11899)
+++ XoopsModules/extgallery/trunk/modules/extgallery/admin/photo.php 2013-08-12 23:08:07 UTC (rev 11900)
@@ -96,7 +96,7 @@
$dir = opendir($batchRep);
while ($f = readdir($dir)) {
if(is_file($batchRep.$f)) {
- if(preg_match("/.*gif/",strtolower($f)) || preg_match("/.*jpg/",strtolower($f)) || preg_match("/.*png/",strtolower($f))) {
+ if(preg_match("/.*gif/",strtolower($f)) || preg_match("/.*jpg/",strtolower($f)) || preg_match("/.*jpeg/",strtolower($f)) ||preg_match("/.*png/",strtolower($f))) {
$photos[] = $f;
}
}
@@ -583,7 +583,7 @@
}
// For xoops tag
if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../../tag'))){
- require_once XOOPS_ROOT_PATH.'/modules/tag/include/formtag.php';
+ require_once XOOPS_ROOT_PATH.'/modules/tag/include/formtag.php';
$form->addElement(new XoopsFormTag('tag', 60, 255, '', 0));
}
$form->addElement(new XoopsFormHidden("op", 'add_photo'));
@@ -598,7 +598,7 @@
$dir = opendir($rep);
while ($f = readdir($dir)) {
if(is_file($rep.$f)) {
- if(preg_match("/.*gif/",strtolower($f)) || preg_match("/.*jpg/",strtolower($f)) || preg_match("/.*png/",strtolower($f))) {
+ if(preg_match("/.*gif/",strtolower($f)) || preg_match("/.*jpg/",strtolower($f)) || preg_match("/.*jpeg/",strtolower($f)) ||preg_match("/.*png/",strtolower($f))) {
$nbPhotos++;
}
}
Modified: XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt 2013-08-11 23:49:58 UTC (rev 11899)
+++ XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt 2013-08-12 23:08:07 UTC (rev 11900)
@@ -1,4 +1,9 @@
============================
+2013-08-12: Version 1.12 Beta 1
+============================
+- added .jpeg extension
+
+============================
2012-12-18: Version 1.11
============================
- Updated PEAR
Modified: XoopsModules/extgallery/trunk/modules/extgallery/public-download.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/public-download.php 2013-08-11 23:49:58 UTC (rev 11899)
+++ XoopsModules/extgallery/trunk/modules/extgallery/public-download.php 2013-08-12 23:08:07 UTC (rev 11900)
@@ -1,66 +1,67 @@
-<?php
-/**
- * ExtGallery User area
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Zoullou (http://www.zoullou.net)
- * @package ExtGallery
- * @version $Id$
- */
-
-
-require '../../mainfile.php';
-include_once XOOPS_ROOT_PATH.'/modules/extgallery/class/publicPerm.php';
-
-if(!isset($_GET['id'])) {
- $photoId = 0;
-} else {
- $photoId = intval($_GET['id']);
-}
-
-$photoHandler = xoops_getmodulehandler('publicphoto', 'extgallery');
-$photo = $photoHandler->get($photoId);
-
-$permHandler = ExtgalleryPublicPermHandler::getHandler();
-if(!$permHandler->isAllowed($xoopsUser, 'public_download', $photo->getVar('cat_id'))) {
- redirect_header("index.php");
- exit;
-}
-
-switch(strtolower(strrchr($photo->getVar('photo_name'), "."))) {
- case ".png": $type = "image/png"; break;
- case ".gif": $type = "image/gif"; break;
- case ".jpg": $type = "image/jpeg"; break;
- default: $type = "application/octet-stream"; break;
-}
-
-header("Content-Type: ".$type."");
-header("Content-Disposition: attachment; filename=\"".$photo->getVar('photo_name')."\"");
-
-if($photo->getVar('photo_havelarge')) {
- if($permHandler->isAllowed($xoopsUser, 'public_download_original', $photo->getVar('cat_id')) && $photo->getVar('photo_orig_name') != "") {
- $photoName = "original/".$photo->getVar('photo_orig_name');
- } else {
- $photoName = "large/large_".$photo->getVar('photo_name');
- }
-} else {
- $photoName = "medium/".$photo->getVar('photo_name');
-}
-
-$photoHandler->updateDownload($photoId);
-
-if($photo->getVar('photo_serveur') == "") {
- readfile(XOOPS_ROOT_PATH."/uploads/extgallery/public-photo/".$photoName);
-} else {
- readfile($photo->getVar('photo_serveur').$photoName);
-}
-
+<?php
+/**
+ * ExtGallery User area
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Zoullou (http://www.zoullou.net)
+ * @package ExtGallery
+ * @version $Id$
+ */
+
+
+require '../../mainfile.php';
+include_once XOOPS_ROOT_PATH.'/modules/extgallery/class/publicPerm.php';
+
+if(!isset($_GET['id'])) {
+ $photoId = 0;
+} else {
+ $photoId = intval($_GET['id']);
+}
+
+$photoHandler = xoops_getmodulehandler('publicphoto', 'extgallery');
+$photo = $photoHandler->get($photoId);
+
+$permHandler = ExtgalleryPublicPermHandler::getHandler();
+if(!$permHandler->isAllowed($xoopsUser, 'public_download', $photo->getVar('cat_id'))) {
+ redirect_header("index.php");
+ exit;
+}
+
+switch(strtolower(strrchr($photo->getVar('photo_name'), "."))) {
+ case ".png": $type = "image/png"; break;
+ case ".gif": $type = "image/gif"; break;
+ case ".jpg": $type = "image/jpeg"; break;
+ case ".jpeg": $type = "image/jpeg"; break;
+ default: $type = "application/octet-stream"; break;
+}
+
+header("Content-Type: ".$type."");
+header("Content-Disposition: attachment; filename=\"".$photo->getVar('photo_name')."\"");
+
+if($photo->getVar('photo_havelarge')) {
+ if($permHandler->isAllowed($xoopsUser, 'public_download_original', $photo->getVar('cat_id')) && $photo->getVar('photo_orig_name') != "") {
+ $photoName = "original/".$photo->getVar('photo_orig_name');
+ } else {
+ $photoName = "large/large_".$photo->getVar('photo_name');
+ }
+} else {
+ $photoName = "medium/".$photo->getVar('photo_name');
+}
+
+$photoHandler->updateDownload($photoId);
+
+if($photo->getVar('photo_serveur') == "") {
+ readfile(XOOPS_ROOT_PATH."/uploads/extgallery/public-photo/".$photoName);
+} else {
+ readfile($photo->getVar('photo_serveur').$photoName);
+}
+
?>
\ No newline at end of file
Modified: XoopsModules/extgallery/trunk/modules/extgallery/xoops_version.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/xoops_version.php 2013-08-11 23:49:58 UTC (rev 11899)
+++ XoopsModules/extgallery/trunk/modules/extgallery/xoops_version.php 2013-08-12 23:08:07 UTC (rev 11900)
@@ -17,7 +17,7 @@
*/
$modversion['name'] = _MI_EXTGAL_NAME;
-$modversion['version'] = 1.11;
+$modversion['version'] = 1.12;
$modversion['description'] = _MI_EXTGAL_DESC;
$modversion['credits'] = "http://www.zoullou.net/";
$modversion['author'] = "Zoullou";
@@ -25,7 +25,7 @@
$modversion['license'] = "GPL see LICENSE";
$modversion['official'] = 0;
$modversion['image'] = "images/extgallery_logo.png";
-$modversion['dirname'] = "extgallery";
+$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['onInstall'] = 'include/install_function.php';
$modversion['onUpdate'] = 'include/update_function.php';
$modversion['min_php'] = '5.2';
@@ -33,7 +33,7 @@
$modversion['min_admin']='1.1';
$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
-$modversion["module_status"] = "Final";
+$modversion["module_status"] = "Beta 1";
// Admin menu
// Set to 1 if you want to display menu generated by system module
|
