Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11902] XoopsModules/myalbum/trunk/htdocs/modules/ myalbum
|
From: <be...@us...> - 2013-08-13 23:10:47
|
Revision: 11902
http://sourceforge.net/p/xoops/svn/11902
Author: beckmi
Date: 2013-08-13 23:10:43 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Updating to 3.07 RC3 (see changelog.txt)
Modified Paths:
--------------
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/photomanager.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_block_tag.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_rphoto.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_tophits.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_topnews.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/myalbum.textsanitizer.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/photos.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/editphoto.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/imagemanager.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/assign_globals.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/draw_functions.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/functions.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/main.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/modinfo.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/photo.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_cpanel_admission.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_imagemanager.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_index.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_table.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_cpanel_admission.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_imagemanager.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_index.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_table.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_imagemanager.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_index.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_viewcat_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_viewcat_table.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_cpanel_admission.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_imagemanager.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_index.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_viewcat_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_viewcat_table.html
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -8,14 +8,14 @@
// GET vars
$pos = empty( $_GET[ 'pos' ] ) ? 0 : intval( $_GET[ 'pos' ] ) ;
-$num = empty( $_GET[ 'num' ] ) ? 20 : intval( $_GET[ 'num' ] ) ;
+$num = empty( $_GET[ 'num' ] ) ? 10 : intval( $_GET[ 'num' ] ) ;
$txt = empty( $_GET[ 'txt' ] ) ? '' : $GLOBALS['myts']->stripSlashesGPC( trim( $_GET[ 'txt' ] ) ) ;
if( ! empty( $_POST['action'] ) && $_POST['action'] == 'admit' && isset( $_POST['ids'] ) && is_array( $_POST['ids'] ) ) {
- $photosHandler = xoops_getmodulehandler('photos', $GLOBALS['mydirname']);
- @$photosHandler->setStatus($_POST[ 'ids' ], 1);
+ $photosHandler = xoops_getmodulehandler('photos');
+ @$photosHandler->setStatus($_POST[ 'ids' ], 1);
redirect_header( 'admission.php' , 2 , _ALBM_AM_ADMITTING ) ;
exit ;
@@ -26,7 +26,7 @@
// Double check for anti-CSRF
if( ! xoops_refcheck() ) die( "XOOPS_URL is not included in your REFERER" ) ;
- $photosHandler = xoops_getmodulehandler('photos', $GLOBALS['mydirname']);
+ $photosHandler = xoops_getmodulehandler('photos');
@$photosHandler->deletePhotos($_POST[ 'ids' ]);
redirect_header( "admission.php" , 2 , _ALBM_DELETINGPHOTO ) ;
@@ -57,9 +57,16 @@
// query for listing count
$numrows = $photosHandler->getCount($criteria);
+
+// Page Navigation
$nav = new XoopsPageNav( $numrows , $num , $pos , 'pos' , "num=$num&txt=" . urlencode($txt) ) ;
-$GLOBALS['xoopsTpl']->assign('nav_html', $nav->renderNav( 10 ));
+$nav_html = $nav->renderNav( 10 ) ;
+$GLOBALS['xoopsTpl']->assign('nav_html', $nav_html);
+$criteria = new Criteria('`status`', '0', '<=');
+$criteria->setStart($pos);
+$criteria->setLimit($num);
+
foreach( $photosHandler->getObjects($criteria, true) as $lid => $photo) {
$GLOBALS['xoopsTpl']->append('photos', $photo->toArray());
}
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -31,7 +31,7 @@
list( $imgcat_storetype,$imgcat_maxsize ) = $xoopsDB->fetchRow( $crs ) ;
// mime type look up
- $mime_types = array( 'gif' => 'image/gif' , 'png' => 'image/png' , 'jpg' => 'image/jpeg' , 'jpg' => 'image/jpeg' ) ;
+ $mime_types = array( 'gif' => 'image/gif' , 'png' => 'image/png' , 'jpg' => 'image/jpeg' , 'jpeg' => 'image/jpeg' ) ;
// INSERT loop
$srs = $xoopsDB->query( "SELECT lid,ext,title,date,status FROM $src_table_photos WHERE cid='$src_cid'" ) ;
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/photomanager.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/photomanager.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/photomanager.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -170,7 +170,7 @@
</form>
<p align='center' style='margin:0px;'>
$photonavinfo
- <a href='../submit.php?cid=$cid'><img src='../images/pictadd.gif' width='18' height='15' alt='"._AM_CAT_LINK_ADDPHOTOS."' title='"._AM_CAT_LINK_ADDPHOTOS."' /></a>
+ <a href='../submit.php?cid=$cid'><img src='" . $pathIcon16."/add.png' width='18' height='15' alt='"._AM_CAT_LINK_ADDPHOTOS."' title='"._AM_CAT_LINK_ADDPHOTOS."' /></a>
</p>
<form name='MainForm' action='?num=$num&cid=$cid' method='POST' style='margin-top:0px;'>
<table width='100%' border='0' cellspacing='0' cellpadding='4'>
@@ -196,7 +196,7 @@
$bgcolor = $status ? "#FFFFFF" : "#FFEEEE" ;
- $editbutton = "<a href='".XOOPS_URL."/modules/$mydirname/editphoto.php?lid=$lid' target='_blank'><img src='".XOOPS_URL."/modules/$mydirname/images/editicon.gif' border='0' alt='"._ALBM_EDITTHISPHOTO."' title='"._ALBM_EDITTHISPHOTO."' /></a> ";
+ $editbutton = "<a href='".XOOPS_URL."/modules/$mydirname/editphoto.php?lid=$lid' target='_blank'><img src='" . $pathIcon16."/edit.png' border='0' alt='"._ALBM_EDITTHISPHOTO."' title='"._ALBM_EDITTHISPHOTO."' /></a> ";
$deadlinkbutton = is_readable( "$photos_dir/{$lid}.{$ext}" ) ? "" : "<img src='".XOOPS_URL."/modules/$mydirname/images/deadlink.gif' border='0' alt='"._ALBM_AM_DEADLINKMAINPHOTO."' title='"._ALBM_AM_DEADLINKMAINPHOTO."' />" ;
if( $col == 0 ) echo "\t<tr>\n" ;
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_block_tag.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_block_tag.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_block_tag.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,22 +1,34 @@
<?php
+
+
function myalbum_tag_block_cloud_show($options)
{
+ if (file_exists($fileinc = XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php")) {
+ global $module_dirname;
include_once XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php";
return tag_block_cloud_show($options, $module_dirname);
+ }
}
function myalbum_tag_block_cloud_edit($options)
{
+ if (file_exists($fileinc = XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php")) {
include_once XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php";
return tag_block_cloud_edit($options);
+ }
}
function myalbum_tag_block_top_show($options)
{
+ if (file_exists($fileinc = XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php")) {
+ global $module_dirname;
include_once XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php";
return tag_block_top_show($options, $module_dirname);
+ }
}
function myalbum_tag_block_top_edit($options)
{
+ if (file_exists($fileinc = XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php")) {
include_once XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php";
return tag_block_top_edit($options);
+ }
}
-?>
\ No newline at end of file
+
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_rphoto.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_rphoto.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_rphoto.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -6,7 +6,7 @@
function b_myalbum_rphoto_show( $options )
{
- global $xoopsDB ;
+ global $xoopsDB, $mod_url ,$table_photos, $myalbum_normal_exts;
// For myAlbum-P < 2.70
if( strncmp( $options[0] , 'myalbum' , 7 ) != 0 ) {
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_tophits.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_tophits.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_tophits.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -6,7 +6,7 @@
function b_myalbum_tophits_show( $options )
{
- global $xoopsDB ;
+ global $xoopsDB, $table_photos, $mod_url, $myalbum_normal_exts, $myts ;
// For myAlbum-P < 2.70
if( strncmp( $options[0] , 'myalbum' , 7 ) != 0 ) {
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_topnews.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_topnews.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_topnews.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -6,7 +6,7 @@
function b_myalbum_topnews_show( $options )
{
- global $xoopsDB ;
+ global $xoopsDB, $mod_url ,$table_photos,$myalbum_normal_exts ;
// For myAlbum-P < 2.70
if( strncmp( $options[0] , 'myalbum' , 7 ) != 0 ) {
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/myalbum.textsanitizer.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/myalbum.textsanitizer.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/myalbum.textsanitizer.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -19,7 +19,7 @@
*
* @todo Sofar, this does nuttin' ;-)
*/
- function MyAlbumTextSanitizer()
+ function __construct()
{
}
@@ -32,7 +32,7 @@
* @static
* @staticvar object
*/
- function &getInstance()
+ static function &getInstance()
{
static $instance;
if (!isset($instance)) {
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/photos.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/photos.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/photos.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -119,7 +119,7 @@
$catHandler = xoops_getmodulehandler('cat');
$textHandler = xoops_getmodulehandler('text');
$userHandler = xoops_gethandler('user');
- $statusHandler = xoops_getmodulehandler('status');
+//mb $statusHandler = xoops_getmodulehandler('status');
$ret['photo'] = parent::toArray();
$cat = $catHandler->get($this->getVar('cid'));
@@ -134,7 +134,8 @@
}
$user = $userHandler->get($this->getVar('submitter'));
- $ret['status'] = $statusHandler->get($this->getVar('status'));
+//mb $ret['status'] = $statusHandler->get($this->getVar('status'));
+ $ret['status'] = $this->getVar('status'); //mb
$ret['user'] = $user->toArray();
return $ret;
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,7 +1,12 @@
2013-08-08 v3.07 RC 3
-- fixed: image is not sized properly (mamba)
-- fixed: in PhotoManagement, MyAlbum deletes all pictures, regardless which were selected (mamba)
+- fix: image is not sized properly (mamba)
+- fix: in PhotoManagement, MyAlbum deletes all pictures, regardless which were selected (mamba)
- updated to XOOPS Admin GUI (mamba)
+- fix: pagination in front, as well as in Submitted Photos tab (mamba)
+- fix: missing Smarty variables (mamba)
+- fix: blocks when there is no Tag module (mamba)
+- fix: missing variables in blocks (mamba)
+- added: delete icons in photo views
2012-06-26 v3.06
- fixed many bugs (cesag/black_beard)
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/editphoto.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/editphoto.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/editphoto.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -92,19 +92,25 @@
$submitter = intval( $_POST['submitter'] ) ;
}
- // status change
- if( $isadmin ) {
- $valid = empty( $_POST['valid'] ) ? 0 : intval( $_POST['valid'] ) ;
- if( empty( $_POST['old_status'] ) ) {
- if( $valid == 0 ) $valid = null ;
- else $valid = 1 ;
- } else {
- if( $valid == 0 ) $valid = 0 ;
- else $valid = 2 ;
- }
- } else {
- $valid = 2 ;
- }
+ // status change
+ if ($isadmin) {
+ $valid = empty($_POST['valid']) ? 0 : intval($_POST['valid']);
+ if (empty($_POST['old_status'])) {
+ if ($valid == 0) {
+ $valid = null;
+ } else {
+ $valid = 1;
+ }
+ } else {
+ if ($valid == 0) {
+ $valid = 1;
+ } else {
+ $valid = 2;
+ }
+ }
+ } else {
+ $valid = 2;
+ }
$cid = empty( $_POST['cid'] ) ? 0 : intval( $_POST['cid'] ) ;
@@ -166,11 +172,12 @@
$title = $GLOBALS['myts']->stripSlashesGPC( $_POST["title"] ) ;
$desc_text = $GLOBALS['myts']->stripSlashesGPC( $_POST["desc_text"] ) ;
$cid = intval( $_POST['cid'] ) ;
+ $ext = $_POST['ext'] ;
if ($GLOBALS['myalbumModuleConfig']['tag']) {
$tag_handler = xoops_getmodulehandler('tag', 'tag');
$tag_handler->updateByItem($_POST["tags"], $lid, $GLOBALS['myalbumModule']->getVar("dirname"), $cid);
}
- myalbum_update_photo( $lid , $cid , $title , $desc_text , $valid ) ;
+ myalbum_update_photo( $lid , $cid , $title , $desc_text , $valid ) ;
exit ;
}
@@ -269,5 +276,3 @@
myalbum_footer() ;
include( XOOPS_ROOT_PATH . "/footer.php" ) ;
-
-?>
\ No newline at end of file
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/imagemanager.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/imagemanager.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/imagemanager.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -119,6 +119,7 @@
'nicename' => $GLOBALS['myts']->htmlSpecialChars( $title ) ,
'src' => "$thumbs_url/{$lid}.{$image_ext}" ,
'can_edit' => ( ( $global_perms & GPERM_EDITABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
+ 'can_delete' => ( ( $global_perms & GPERM_DELETABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
'width_spec' => $width_spec ,
'xcodel' => $xcodel ,
'xcodec' => $xcodec ,
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/assign_globals.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/assign_globals.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/assign_globals.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -17,6 +17,7 @@
'lang_popular' => _ALBM_POPULAR ,
'lang_ratethisphoto' => _ALBM_RATETHISPHOTO ,
'lang_editthisphoto' => _ALBM_EDITTHISPHOTO ,
+ 'lang_deletethisphoto' => _ALBM_DELETE_THIS_PHOTO ,
'lang_guestname' => _ALBM_CAPTION_GUESTNAME ,
'lang_category' => _ALBM_CAPTION_CATEGORY ,
'lang_nomatch' => _ALBM_NOMATCH ,
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/draw_functions.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/draw_functions.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/draw_functions.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -66,7 +66,8 @@
extract($photo->toArray(true));
$text = $text_handler->get($photo->getVar('lid'));
$cat = $cat_handler->get($photo->getVar('cid'));
-
+ $ext = $photo->vars['ext']['value'];
+
if( in_array( strtolower( $ext ) , $myalbum_normal_exts ) ) {
$imgsrc_thumb = $photo->getThumbsURL() ;
$imgsrc_photo = $photo->getPhotoURL() ;
@@ -144,6 +145,7 @@
'ahref_photo' => $ahref_photo ,
'width_spec' => $width_spec ,
'can_edit' => ( ( $global_perms & GPERM_EDITABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
+ 'can_delete' => ( ( $global_perms & GPERM_DELETABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
'submitter' => $submitter ,
'submitter_name' => $submitter_name ,
'hits' => $hits ,
@@ -218,6 +220,7 @@
'imgsrc_photo' => $imgsrc_photo ,
'width_spec' => $width_spec ,
'can_edit' => ( ( $global_perms & GPERM_EDITABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
+ 'can_delete' => ( ( $global_perms & GPERM_DELETABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
'hits' => $hits ,
'rating' => $rating ,
'rank' => floor( $rating - 0.001 ) ,
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/functions.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/functions.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/functions.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -248,7 +248,7 @@
return 2 ;
}
echo __LINE__.'<br/>';
- if( $bundled_2 ) {
+ if( !$bundled_2 ) {
$dst_img = imagecreate( $new_w , $new_h ) ;
imagecopyresampled( $dst_img , $src_img , 0 , 0 , 0 , 0 , $new_w , $new_h , $width , $height ) ;
} else {
@@ -698,9 +698,17 @@
$photo->setVar('cid', $cid);
$photo->setVar('title', $title);
- $photo->setVar('ext', $ext);
- $photo->setVar('res_x', $dim[0]);
- $photo->setVar('res_y', $dim[1]);
+
+if ($ext !='') $photo->setVar('ext', $ext);
+if ($x !='') $photo->setVar('res_x', $x);
+if ($y !='') $photo->setVar('res_y', $y);
+
+
+
+$cid = empty( $_POST['cid'] ) ? 0 : intval( $_POST['cid'] ) ;
+
+
+
if ($photos_handler->insert($photo, true)) {
$text->setVar('description', $desc);
@$text_handler->insert($text, true);
@@ -799,6 +807,7 @@
$html = $GLOBALS['myts']->displayTarea($html, 1, 1, 1, 1, 1, 1, 1);
$ret = '';
$i=0;
+ if ($html != "") {
if ($i<4) {
foreach(explode('.',strip_tags($html)) as $raw) {
if ($i<4) {
@@ -817,6 +826,7 @@
} else continue;
}
} else continue;
+ }
return trim($ret);
}
?>
\ No newline at end of file
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/main.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/main.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/main.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -10,7 +10,7 @@
define( "_ALBM_BTN_SELECTALL","Select All");
define( "_ALBM_BTN_SELECTNONE","Select None");
define( "_ALBM_BTN_SELECTRVS","Select Reverse");
-define( "_ALBM_FMT_PHOTONUM","%s every a page");
+define( "_ALBM_FMT_PHOTONUM","%s per page");
define( "_ALBM_AM_ADMISSION","Admit Photos");
define( "_ALBM_AM_ADMITTING","Admitted photo(s)");
define( "_ALBM_AM_LABEL_ADMIT","Admit the photos you checked");
@@ -99,6 +99,7 @@
define("_ALBM_LIDDESC","Record Number (Smaller is latter)");
define("_ALBM_NOSHOTS","No Screenshots Available");
define("_ALBM_EDITTHISPHOTO","Edit This Photo");
+define("_ALBM_DELETE_THIS_PHOTO","Delete This Photo");
define("_ALBM_DESCRIPTIONC","Description");
define("_ALBM_EMAILC","Email");
define("_ALBM_CATEGORYC","Category");
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/modinfo.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/modinfo.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/modinfo.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -116,5 +116,6 @@
define("_ALBM_CFG_DESCENDOFURL","If you change this you will have to modify .htaccess SEO (see /docs)");
define("_ALBM_CFG_ENDOFRSS","End of URL for .htaccess SEO (RSS output)");
define("_ALBM_CFG_DESCENDOFRSS","If you change this you will have to modify .htaccess SEO (see /docs)");
+define("_ALBM_ACTION","Actions");
}
?>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/photo.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/photo.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/photo.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -10,6 +10,42 @@
$lid = empty( $_GET['lid'] ) ? 0 : intval( $_GET['lid'] ) ;
$cid = empty( $_GET['cid'] ) ? 0 : intval( $_GET['cid'] ) ;
+if(isset($_GET['op'])) {
+ $op = $_GET['op'];
+} else {
+ $op = 'default';
+}
+
+// Switch operations
+
+function deleteImage($lid)
+{
+ global $global_perms;
+ $photos_handler = xoops_getmodulehandler('photos', $GLOBALS['mydirname']);
+ $photo_obj = $photos_handler->get($lid);
+
+ if (!($global_perms & GPERM_DELETABLE)) {
+ redirect_header("photo.php", 3, _NOPERM);
+ exit;
+ }
+
+ // anti-CSRF
+ if( ! xoopsSecurity::checkReferer() ) die( "XOOPS_URL is not included in your REFERER" ) ;
+
+ // get and check lid is valid
+ if( $lid < 1 ) die( "Invalid photo id." ) ;
+
+ $photos_handler->delete($photo_obj) ;
+
+redirect_header( "index.php" , 2 , _ALBM_DBUPDATED ) ;
+}
+
+switch ($op) {
+ case "delete":
+ deleteImage($lid);
+ case "default":
+ default:
+
myalbum_updaterating( $lid ) ;
$photos_handler = xoops_getmodulehandler('photos', $GLOBALS['mydirname']);
@@ -147,4 +183,4 @@
include( $GLOBALS['xoops']->path("footer.php") ) ;
-?>
\ No newline at end of file
+}
\ No newline at end of file
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_cpanel_admission.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_cpanel_admission.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_cpanel_admission.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -5,7 +5,7 @@
<input type='hidden' name='num' value='<{$num}>'>
<input type='text' name='txt' value='<{$txt}>'>
<input type='submit' value='<{$smarty.const._ALBM_AM_BUTTON_EXTRACT}>' />
- <{$nav_html}>
+ <{$nav_html}>
</form>
<form name='MainForm' action='' method='POST' style='margin-top:0px;'>
<input type='hidden' name='action' value='' />
@@ -23,7 +23,7 @@
<tr class="<{cycle value='even,odd'}>">
<td><img src='<{$thumbs_url}>/<{$photo.photo.lid}>.<{$photo.photo.ext}>'/></td>
<td><input type='checkbox' name='ids[]' value='<{$photo.photo.lid}>' /></td>
- <td><a href='<{$xoops_url}>/modules/<{$mydirname}>/editphoto.php?lid=$photo.photo.lid' target='_blank'><img src='<{$xoops_url}>/modules/<{$mydirname}>/images/editicon.gif' border='0' alt='<{$smarty.const._ALBM_EDITTHISPHOTO}>' title='<{$smarty.const._ALBM_EDITTHISPHOTO}>' /></a></td>
+ <td><a href='<{$xoops_url}>/modules/<{$mydirname}>/editphoto.php?lid=$photo.photo.lid' target='_blank'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$smarty.const._ALBM_EDITTHISPHOTO}>' title='<{$smarty.const._ALBM_EDITTHISPHOTO}>' /></a></td>
<td><{$photo.user.uname}></td>
<td><a href='<{$photos_url}>/<{$photo.lid}>.<{$photo.ext}>' target='_blank'><{$photo.photo.title}></a></td>
<td width='100%'><{$photo.text.description}></td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_imagemanager.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_imagemanager.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_imagemanager.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -84,7 +84,7 @@
<td>
<input type="hidden" name="photo_id[]" value="<{$photo.lid}>" />
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='' /></a>
<{/if}>
<{$photo.nicename}>
</td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_index.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_index.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_index.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -14,7 +14,7 @@
<{$category_options}>
</select>
<{$photo_global_sum}>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</form>
</td>
</tr>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -10,7 +10,7 @@
<span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}> <{$photo.title}></span>
</td>
<td align='right'>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</td>
</tr>
</table>
@@ -36,7 +36,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -27,7 +27,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_list.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_list.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,37 +1,37 @@
-<{strip}>
-<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
-<table width="100%" cellspacing="0" class="outer">
- <tr>
- <td class="even">
- <br />
- <{include file="db:myalbum0_header.html"}>
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
- <td align='left'>
- <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
- </td>
- <td align='right'>
- <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
- </td>
- </tr>
- </table>
- <{if count( $subcategories ) > 0 }>
- <hr />
- <{include file="db:myalbum0_categories.html"}>
- <{/if}>
- </td>
- </tr>
-</table>
-<br />
+<{strip}>
+<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
+<table width="100%" cellspacing="0" class="outer">
+ <tr>
+ <td class="even">
+ <br />
+ <{include file="db:myalbum0_header.html"}>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
+ <td align='left'>
+ <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
+ </td>
+ <td align='right'>
+ <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ </td>
+ </tr>
+ </table>
+ <{if count( $subcategories ) > 0 }>
+ <hr />
+ <{include file="db:myalbum0_categories.html"}>
+ <{/if}>
+ </td>
+ </tr>
+</table>
+<br />
<{if $photo_small_sum < 1 }>
<div align="center">
<{$lang_nomatch}>
</div>
<{else}>
- <table width="100%" cellspacing="0" class="outer">
- <tr>
+ <table width="100%" cellspacing="0" class="outer">
+ <tr>
<td class="even" align="left">
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<div align="center">
<{$lang_sortby}>
<{$lang_title}> (<a href="viewcat.php?cid=<{$category_id}>&uid=<{$uid}>&orderby=titleA"><img src="images/up.gif" border="0" align="middle" alt="" /></a><a href="viewcat.php?cid=<{$category_id}>&uid=<{$uid}>&orderby=titleD"><img src="images/down.gif" border="0" align="middle" alt="" /></a>)
@@ -44,16 +44,16 @@
<b><{$lang_cursortedby}></b>
<br />
<br />
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<hr />
<{/if}>
@@ -64,19 +64,19 @@
<{/foreach}>
</table>
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<hr />
<div align="center">
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<{/if}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_table.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_table.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_table.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,38 +1,38 @@
-<{strip}>
-<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
-<table width="100%" cellspacing="0" class="outer">
- <tr>
- <td class="even">
- <br />
- <{include file="db:myalbum0_header.html"}>
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
- <td align='left'>
- <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
- </td>
- <td align='right'>
- <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
- </td>
- </tr>
- </table>
- <{if count( $subcategories ) > 0 }>
- <hr />
- <{include file="db:myalbum0_categories.html"}>
- <{/if}>
- </td>
- </tr>
-</table>
-<br />
+<{strip}>
+<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
+<table width="100%" cellspacing="0" class="outer">
+ <tr>
+ <td class="even">
+ <br />
+ <{include file="db:myalbum0_header.html"}>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
+ <td align='left'>
+ <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
+ </td>
+ <td align='right'>
+ <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ </td>
+ </tr>
+ </table>
+ <{if count( $subcategories ) > 0 }>
+ <hr />
+ <{include file="db:myalbum0_categories.html"}>
+ <{/if}>
+ </td>
+ </tr>
+</table>
+<br />
<{if $photo_small_sum < 1 }>
<div align="center">
<{$lang_nomatch}>
</div>
<{else}>
- <table width="100%" cellspacing="0" class="outer">
- <tr>
+ <table width="100%" cellspacing="0" class="outer">
+ <tr>
<td class="even" align="left">
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<div align="center">
<{$lang_sortby}>
<{$lang_title}> (<a href="viewcat.php?cid=<{$category_id}>&orderby=titleA"><img src="images/up.gif" border="0" align="middle" alt="" /></a><a href="viewcat.php?cid=<{$category_id}>&orderby=titleD"><img src="images/down.gif" border="0" align="middle" alt="" /></a>)
@@ -45,16 +45,16 @@
<b><{$lang_cursortedby}></b>
<br />
<br />
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<hr />
<{/if}>
@@ -73,19 +73,19 @@
</tr>
</table>
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<hr />
<div align="center">
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<{/if}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_cpanel_admission.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_cpanel_admission.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_cpanel_admission.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -23,7 +23,7 @@
<tr class="<{cycle value='even,odd'}>">
<td><img src='<{$thumbs_url}>/<{$photo.photo.lid}>.<{$photo.photo.ext}>'/></td>
<td><input type='checkbox' name='ids[]' value='<{$photo.photo.lid}>' /></td>
- <td><a href='<{$xoops_url}>/modules/<{$mydirname}>/editphoto.php?lid=$photo.photo.lid' target='_blank'><img src='<{$xoops_url}>/modules/<{$mydirname}>/images/editicon.gif' border='0' alt='<{$smarty.const._ALBM_EDITTHISPHOTO}>' title='<{$smarty.const._ALBM_EDITTHISPHOTO}>' /></a></td>
+ <td><a href='<{$xoops_url}>/modules/<{$mydirname}>/editphoto.php?lid=$photo.photo.lid' target='_blank'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$smarty.const._ALBM_EDITTHISPHOTO}>' title='<{$smarty.const._ALBM_EDITTHISPHOTO}>' /></a></td>
<td><{$photo.user.uname}></td>
<td><a href='<{$photos_url}>/<{$photo.lid}>.<{$photo.ext}>' target='_blank'><{$photo.photo.title}></a></td>
<td width='100%'><{$photo.text.description}></td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_imagemanager.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_imagemanager.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_imagemanager.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -84,7 +84,7 @@
<td>
<input type="hidden" name="photo_id[]" value="<{$photo.lid}>" />
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='' /></a>
<{/if}>
<{$photo.nicename}>
</td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_index.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_index.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_index.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -14,7 +14,7 @@
<{$category_options}>
</select>
<{$photo_global_sum}>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</form>
</td>
</tr>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -10,7 +10,7 @@
<span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}> <{$photo.title}></span>
</td>
<td align='right'>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</td>
</tr>
</table>
@@ -36,7 +36,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -27,7 +27,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_list.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_list.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,37 +1,37 @@
-<{strip}>
-<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
-<table width="100%" cellspacing="0" class="outer">
- <tr>
- <td class="even">
- <br />
- <{include file="db:myalbum1_header.html"}>
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
- <td align='left'>
- <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
- </td>
- <td align='right'>
- <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
- </td>
- </tr>
- </table>
- <{if count( $subcategories ) > 0 }>
- <hr />
- <{include file="db:myalbum1_categories.html"}>
- <{/if}>
- </td>
- </tr>
-</table>
-<br />
+<{strip}>
+<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
+<table width="100%" cellspacing="0" class="outer">
+ <tr>
+ <td class="even">
+ <br />
+ <{include file="db:myalbum1_header.html"}>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
+ <td align='left'>
+ <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
+ </td>
+ <td align='right'>
+ <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ </td>
+ </tr>
+ </table>
+ <{if count( $subcategories ) > 0 }>
+ <hr />
+ <{include file="db:myalbum1_categories.html"}>
+ <{/if}>
+ </td>
+ </tr>
+</table>
+<br />
<{if $photo_small_sum < 1 }>
<div align="center">
<{$lang_nomatch}>
</div>
<{else}>
- <table width="100%" cellspacing="0" class="outer">
- <tr>
+ <table width="100%" cellspacing="0" class="outer">
+ <tr>
<td class="even" align="left">
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<div align="center">
<{$lang_sortby}>
<{$lang_title}> (<a href="viewcat.php?cid=<{$category_id}>&uid=<{$uid}>&orderby=titleA"><img src="images/up.gif" border="0" align="middle" alt="" /></a><a href="viewcat.php?cid=<{$category_id}>&uid=<{$uid}>&orderby=titleD"><img src="images/down.gif" border="0" align="middle" alt="" /></a>)
@@ -44,16 +44,16 @@
<b><{$lang_cursortedby}></b>
<br />
<br />
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<hr />
<{/if}>
@@ -64,19 +64,19 @@
<{/foreach}>
</table>
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<hr />
<div align="center">
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<{/if}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_table.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_table.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_table.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,38 +1,38 @@
-<{strip}>
-<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
-<table width="100%" cellspacing="0" class="outer">
- <tr>
- <td class="even">
- <br />
- <{include file="db:myalbum1_header.html"}>
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
- <td align='left'>
- <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
- </td>
- <td align='right'>
- <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
- </td>
- </tr>
- </table>
- <{if count( $subcategories ) > 0 }>
- <hr />
- <{include file="db:myalbum1_categories.html"}>
- <{/if}>
- </td>
- </tr>
-</table>
-<br />
+<{strip}>
+<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
+<table width="100%" cellspacing="0" class="outer">
+ <tr>
+ <td class="even">
+ <br />
+ <{include file="db:myalbum1_header.html"}>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
+ <td align='left'>
+ <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
+ </td>
+ <td align='right'>
+ <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ </td>
+ </tr>
+ </table>
+ <{if count( $subcategories ) > 0 }>
+ <hr />
+ <{include file="db:myalbum1_categories.html"}>
+ <{/if}>
+ </td>
+ </tr>
+</table>
+<br />
<{if $photo_small_sum < 1 }>
<div align="center">
<{$lang_nomatch}>
</div>
<{else}>
- <table width="100%" cellspacing="0" class="outer">
- <tr>
+ <table width="100%" cellspacing="0" class="outer">
+ <tr>
<td class="even" align="left">
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<div align="center">
<{$lang_sortby}>
<{$lang_title}> (<a href="viewcat.php?cid=<{$category_id}>&orderby=titleA"><img src="images/up.gif" border="0" align="middle" alt="" /></a><a href="viewcat.php?cid=<{$category_id}>&orderby=titleD"><img src="images/down.gif" border="0" align="middle" alt="" /></a>)
@@ -45,16 +45,16 @@
<b><{$lang_cursortedby}></b>
<br />
<br />
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<hr />
<{/if}>
@@ -73,19 +73,19 @@
</tr>
</table>
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<hr />
<div align="center">
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<{/if}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_imagemanager.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_imagemanager.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_imagemanager.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -84,7 +84,7 @@
<td>
<input type="hidden" name="photo_id[]" value="<{$photo.lid}>" />
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='' /></a>
<{/if}>
<{$photo.nicename}>
</td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_index.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_index.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_index.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -14,7 +14,7 @@
<{$category_options}>
</select>
<{$photo_global_sum}>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</form>
</td>
</tr>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -10,7 +10,7 @@
<span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}> <{$photo.title}></span>
</td>
<td align='right'>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</td>
</tr>
</table>
@@ -36,7 +36,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -27,7 +27,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_viewcat_list.html
====================================...
[truncated message content] |
