From: <bed...@us...> - 2006-11-01 22:42:05
|
Revision: 46 http://svn.sourceforge.net/easybox-mod/?rev=46&view=rev Author: bedelaitre Date: 2006-11-01 14:41:54 -0800 (Wed, 01 Nov 2006) Log Message: ----------- [ 1586222 ] Retour ?\195?\160 l'explorateur des photos ?\195?\160 la fin du diaporama Modified Paths: -------------- trunk/_framework/fonctions_partagees.inc.php trunk/module/diaporama/index1.php Modified: trunk/_framework/fonctions_partagees.inc.php =================================================================== --- trunk/_framework/fonctions_partagees.inc.php 2006-11-01 21:55:13 UTC (rev 45) +++ trunk/_framework/fonctions_partagees.inc.php 2006-11-01 22:41:54 UTC (rev 46) @@ -89,6 +89,8 @@ RETURN($RACINE_REP.'module/dvd/index1.php'); }elseif($retour=='webtv'){ RETURN($RACINE_REP.'module/webmedia/index1.php?start='.get_variable('webmedia_min')); + }elseif($retour=='photo'){ + RETURN($RACINE_REP.'module/diaporama/index1.php?start='.get_variable('photomin').'&rep='.urlencode(get_variable('lastrep'))); }else{ RETURN($RACINE_REP.'module/_menu/menu.php'); } Modified: trunk/module/diaporama/index1.php =================================================================== --- trunk/module/diaporama/index1.php 2006-11-01 21:55:13 UTC (rev 45) +++ trunk/module/diaporama/index1.php 2006-11-01 22:41:54 UTC (rev 46) @@ -5,6 +5,7 @@ $FORCED = 1; } + $extension = $ini[explorateur][ext_photo]; $ext_ok = explode(",",$extension); $ext = $ext_ok; @@ -160,10 +161,19 @@ if (isset($_GET['delais']) AND $aff+1 < count($files)) { $delais = $_GET['delais']; -}else{ +} elseif (isset($_GET['delais']) AND ($aff+1 == count($files))) + { + $message = 'Redirection vers les photos ...'; + set_refresh(2,'2;url='.page_retour_film(),true); + } +else{ $delais = 0; } +//Ajout dans la base de donn\xE9e pour les retours +save_variable('lastexpl', 'photo'); +save_variable('lastrep', $rep); +save_variable('photomin', $min); if(isset($aff)){ @@ -179,7 +189,12 @@ $smarty->assign('aff',$aff); $smarty->display('photo.tpl'); -}else{ +}elseif(isset($message)) +{ + $smarty->assign('AVERTISSEMENT',$message); + $smarty->display('avertissement.tpl'); +} else +{ $LINK['red']= $MODULE.'_menu/menu.php'; $smarty->assign('CONTENT',$smarty->fetch('explorateur_photo.tpl')); $smarty->display('interface.tpl'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |