Changeset 1636

Timestamp:

Dec 6, 2006, 2:07:03 AM (17 years ago)

Author:

rvelices

Message:

feature 583: notification infromation can be filtered by the requester
(optionnally no comments/new users...)
small lang correction in header.tpl

Location:

trunk

Files:

• feed.php (modified) (1 diff)
• include/menubar.inc.php (modified) (1 diff)
• language/en_UK.iso-8859-1/common.lang.php (modified) (3 diffs)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (3 diffs)
• notification.php (modified) (2 diffs)
• template/yoga/header.tpl (modified) (2 diffs)
• template/yoga/notification.tpl (modified) (1 diff)

trunk/feed.php

@@ -145 +145 @@
 // +-----------------------------------------------------------------------+
 
-$news = news($user['last_check'], $dbnow, true, true);
-
-if (count($news) > 0)
-{
-  $item = new FeedItem();
-  $item->title = sprintf(l10n('New on %s'), $dbnow);
-  $item->link = $conf['gallery_url'];
-
-  // content creation
-  $item->description = '<ul>';
-  foreach ($news as $line)
+if ( !isset($_GET['image_only']) )
+{
+  $news = news($user['last_check'], $dbnow, true, true);
+
+  if (count($news) > 0)
   {
-    $item->description.= '<li>'.$line.'</li>';
-  }
-  $item->description.= '</ul>';
-  $item->descriptionHtmlSyndicated = true;
-
-  $item->date = ts_to_iso8601(mysqldt_to_ts($dbnow));
-  $item->author = 'PhpWebGallery notifier';
-  $item->guid= sprintf('%s', $dbnow);;
-
-  $rss->addItem($item);
-
-  $query = '
+    $item = new FeedItem();
+    $item->title = sprintf(l10n('New on %s'),
+        format_date($dbnow, 'mysql_datetime') );
+    $item->link = $conf['gallery_url'];
+
+    // content creation
+    $item->description = '<ul>';
+    foreach ($news as $line)
+    {
+      $item->description.= '<li>'.$line.'</li>';
+    }
+    $item->description.= '</ul>';
+    $item->descriptionHtmlSyndicated = true;
+
+    $item->date = ts_to_iso8601(mysqldt_to_ts($dbnow));
+    $item->author = 'PhpWebGallery notifier';
+    $item->guid= sprintf('%s', $dbnow);;
+
+    $rss->addItem($item);
+
+    $query = '
 UPDATE '.USER_FEED_TABLE.'
   SET last_check = \''.$dbnow.'\'
   WHERE id = \''.$_GET['feed'].'\'
 ;';
+    pwg_query($query);
+  }
+}
+else
+{ // update the last check to avoid deletion by maintenance task
+  $query = '
+UPDATE '.USER_FEED_TABLE.'
+  SET last_check = \''.$dbnow.'\'
+  WHERE id = \''.$_GET['feed'].'\'
+;';
   pwg_query($query);
 }
-
 
 // build items for new images/albums

trunk/include/menubar.inc.php

@@ -283 +283 @@
   'summary',
   array(
-    'TITLE'=>l10n('notification'),
+    'TITLE'=>l10n('RSS feed'),
     'NAME'=>l10n('Notification'),
     'U_SUMMARY'=> get_root_url().'notification.php',

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -313 +313 @@
 $lang['Category'] = 'Category';
 $lang['Close this window'] = 'Close this window';
+$lang['Complete RSS feed'] = 'Complete RSS feed (images, comments)';
 $lang['Confirm Password'] = 'Confirm Password';
 $lang['Connection settings'] = 'Connection settings';
@@ -337 +338 @@
 $lang['Help'] = 'Help';
 $lang['Identification'] = 'Identification';
+$lang['Image only RSS feed'] = 'Image only RSS feed';
 $lang['Keyword'] = 'Keyword';
 $lang['Keywords'] = 'Keywords';
@@ -509 +511 @@
 $lang['no_category'] = 'Home';
 $lang['no_rate'] = 'no rate';
-$lang['notification'] = 'notification';
 $lang['only_members'] = 'Only members can access this page';
 $lang['password updated'] = 'password updated';

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -312 +312 @@
 $lang['Category'] = 'Catégorie';
 $lang['Close this window'] = 'Fermer cette fenêtre';
+$lang['Complete RSS feed'] = 'Flux RSS complet (images, commentaires)';
 $lang['Confirm Password'] = 'Confirmer le mot de passe';
 $lang['Connection settings'] = 'Paramètres de connexion';
@@ -336 +337 @@
 $lang['Help'] = 'Aide';
 $lang['Identification'] = 'Identification';
+$lang['Image only RSS feed'] = 'Flux RSS des images';
 $lang['Keyword'] = 'Mot-clef';
 $lang['Keywords'] = 'Mots-clef';
@@ -508 +510 @@
 $lang['no_category'] = 'Accueil';
 $lang['no_rate'] = 'pas de note';
-$lang['notification'] = 'notification';
 $lang['only_members'] = 'Seuls les membres enregistrés peuvent accéder à cette page';
 $lang['password updated'] = 'mot de passe mis à jour';

trunk/notification.php

@@ -53 +53 @@
 
 $feed_url=PHPWG_ROOT_PATH.'feed.php?feed='.$page['feed'];
+$feed_image_only_url=$feed_url.'&image_only';
+
 // +-----------------------------------------------------------------------+
 // |                        template initialization                        |
@@ -75 +77 @@
 $template->assign_vars(
   array(
-    'FEED_URL' => $feed_url,
+    'U_FEED' => $feed_url,
+    'U_FEED_IMAGE_ONLY' => $feed_image_only_url,
     'U_HOME' => make_index_url(),
     )

trunk/template/yoga/header.tpl

@@ -17 +17 @@
 <!-- BEGIN first -->
 <link rel="first" title="{lang:first_page}" href="{first.U_IMG}" >
-<link rel="up" title="{lang:thumbails}" href="{U_UP}" >
+<link rel="up" title="{lang:thumbnails}" href="{U_UP}" >
 <!-- END first -->
 <!-- BEGIN previous -->
@@ -27 +27 @@
 <!-- BEGIN last -->
 <link rel="last" title="{lang:last_page}" href="{last.U_IMG}" >
-<link rel="up" title="{lang:thumbails}" href="{U_UP}" >
+<link rel="up" title="{lang:thumbnails}" href="{U_UP}" >
 <!-- END last -->
 <link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/layout.css">

trunk/template/yoga/notification.tpl

@@ -10 +10 @@
   <p>{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}</p>
 
-  <p><a href="{FEED_URL}">{lang:RSS feed}</a></p>
+  <p><a href="{U_FEED_IMAGE_ONLY}">{lang:Image only RSS feed}</a></p>
+  <p><a href="{U_FEED}">{lang:Complete RSS feed}</a></p>
 </div>