Changeset 32262

Timestamp:

Jun 21, 2020, 8:41:03 PM (4 years ago)

Author:

ddtddt

Message:

[memories] bug more 15 photos year 1 / add date in pwg bloc / in block show always bar

Location:

extensions/memories

Files:

• blockhome/main.inc.php (modified) (3 diffs)
• blockhome/stuffs_homepfoya.tpl (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)

extensions/memories/blockhome/main.inc.php

@@ -46 +46 @@
           $daydate=date("Y-m-d", strtotime('-1 year'));
         }
-        
+        $template->clear_assign('pfoyas');
         for ($i = 1; $i <= $confpfoya['pfoya_datemax']; $i++) {
         $daydate2=date("Y-m-d", strtotime('-'.$i.' year'));
@@ -119 +119 @@
     LIMIT 0, '.$pfoyanip.'
   ;';
-
+if(empty($query)){
+        if($_SESSION['memodate']<$confpfoya['pfoya_nip']){
+                $_SESSION['memodate']+=1;
+                redirect($_SERVER["REQUEST_URI"]);
+        }
+}
+  
+  
     $page['items'] = array_from_query($query, 'id');
         $page['start'] = 0;
@@ -131 +138 @@
 include(PHPWG_ROOT_PATH.'include/category_default.inc.php');
 
-if (!empty($pwg_stuffs_tpl_thumbnails_var))
-{
+if (empty($pwg_stuffs_tpl_thumbnails_var)){
+  $template->assign('NOPHOTOPFOYA','b');
+}
+  $template->assign('pfoyadata',l10n('Photos from').' '.format_date($daydate));
   $block['thumbnails'] = $pwg_stuffs_tpl_thumbnails_var;
   $block['derivative_params'] = ImageStdParams::get_by_type(IMG_THUMB);
   $block['TEMPLATE'] = realpath(PFOYA_PATH.'/blockhome/stuffs_homepfoya.tpl');
-}
-
 $page = $page_save;
 $template->assign('THUMBNAILS', $tpl_save);

extensions/memories/blockhome/stuffs_homepfoya.tpl

@@ -73 +73 @@
 <div class="pfoya"><a href="{$PFOAYALINK}">{'more photos'|@translate} ...</a></div>
 {/if}
+
+{if isset($NOPHOTOPFOYA)}
+{'no photos memories'|@translate}
+{/if}

extensions/memories/language/en_UK/plugin.lang.php

@@ -41 +41 @@
 $lang['link in blocks'] = 'link in blocks';
 $lang['link to memories page'] = 'link to memories page';
+$lang['no photos memories'] = 'no photos memories';

extensions/memories/language/fr_FR/plugin.lang.php

@@ -42 +42 @@
 $lang['link in blocks'] = 'lien dans le blocs';
 $lang['link to memories page'] = 'lien vers la page souvenirs';
+$lang['no photos memories'] = 'pas de photo souvenir';

extensions/memories/main.inc.php

@@ -123 +123 @@
                 listyears();
         }
-          if($testurl[1]=='1-year-ago'){
+          if(substr($testurl[1],0,10)=='1-year-ago'){
                 if (!in_array('memories-1-year-ago', $tokens)){return;}
                         $daydate=date("Y-m-d", strtotime('-1 year'));