[Feed-collector-svn] SF.net SVN: feed-collector: [126] trunk

[<C1...@us...>]

Revision: 126
          http://feed-collector.svn.sourceforge.net/feed-collector/?rev=126&view=rev
Author:   C167
Date:     2007-06-06 09:54:31 -0700 (Wed, 06 Jun 2007)

Log Message:
-----------
some changes

Modified Paths:
--------------
    trunk/page_add_tag.php
    trunk/page_show_feed_tag.php
    trunk/styles/default/page_show_feed_tag.tpl

Modified: trunk/page_add_tag.php
===================================================================
--- trunk/page_add_tag.php	2007-06-06 10:30:11 UTC (rev 125)
+++ trunk/page_add_tag.php	2007-06-06 16:54:31 UTC (rev 126)
@@ -11,48 +11,41 @@
 
 require_once "inc/config.php";
 error_reporting(E_ALL);
-############
-# DATABASE #
-############
+
+/* DATABASE */
 require_once "./inc/database.php";
 
-###########
-# SESSION #
-###########
+/* SESSION */
 require_once "./inc/session.php";
 
-################
-# FEED-Manager #
-################
+/* FEED-Manager */
 require_once "class/Feed_manager.php";
 $feed = new Feed_manager($db);
 
-##############
-# HTTP-Class #
-##############
+/* HTTP-Class */
 require_once "HTTP.php";
 
-###############
-# Tag-Manager #
-###############
+/* Tag-Manager */
 require_once "class/Tag_manager.php";
 $tag_manager = new Tag_Manager($db);
 
-################
-# User-Manager #
-################
+/* User-Manager */
 require_once "class/User_manager.php";
 $user = new User_manager($db);
 
 if (false === HTTP_Session :: get("logged_in", false)) {
-	HTTP :: redirect("./page_login.php?cameFrom=page_add_tag.php");
+	//HTTP :: redirect("./page_login.php?cameFrom=page_add_tag.php");
 }
 
 $page = "add_tag";
 
-############
-# LANGUAGE #
-############
+/* STYLE */
+require_once "inc/styles.php";
+
+/* SMARTY */
+require_once "inc/smarty.php";
+
+/* LANGUAGE */
 require_once "./inc/language.php";
 
 if(empty($_GET['feed'])) {
@@ -64,61 +57,41 @@
 	$tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']);
 }
 if (!$tag_manager->hasTags($_GET['feed'])) {
-	$main .= sprintf("            <p>%s</p\n", _("There are no tags yet!"));
+	$smarty->assign('has_tags', false);
+	$smarty->assign('no_tags_message', _("There are no tags yet!"));
 } else {
-	$main .= sprintf("          <div id=\"tags\">\n" .
-	"            <div id=\"tags_title\">%s</div>\n", _("Tags"));
-	$tags = $tag_manager->getTags($_GET['feed']);
-	if (count($tags) == 1) {
-		$main .= sprintf("            <a href=\"./page_show_feed_tag.php?tag=%s\">%s</a>", $tags[0], $tags[0]);
-	} else {
-		foreach ($tags as $id => $tag) {
-			$main .= "            <a href=\"./page_show_feed_tag.php?tag=$tag\">$tag</a>";
-			if ($id !== (count($tags) - 1)) {
-				$main .= ", ";
-			}
-			$main .= "\n";
-		}
-	}
-	$main .= "          </div>\n";
+	$smarty->assign('has_tags', true);
+	$smarty->assign('tags_title', _("Tags"));
+	$smarty->assign('tags_list', $tag_manager->getTags($_GET['feed']));
 }
-$main .= displayAddForm();
 
-#####################
-# BUILD THE CONTENT #
-#####################
-// get the design
-$design = file_get_contents("styles/default/page_add_tag.tpl", "r");
-
 # Header
 // title
-$title = "Feed-Collector";
-$design = str_replace("<!-- title -->", $title, $design);
+$smarty->assign('title', "Feed-Collector");
 
 // related sites
 require_once "./inc/upperBar.php";
-$design = str_replace("<!-- related sites -->", $related_sites, $design);
 
 // midHeader title left
-$midHeader_title_left = sprintf("        <h1 class=\"headerTitle\">%s</h1>\n        <div class=\"headerSubTitle\" title=\"Message'\">\n          %s\n        </div>", _("Feed-Collector"), _("{ stay up to date with all your news feeds! }"));
-$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design);
+$smarty->assign('page_title', _("Feed-Collector"));
+$smarty->assign('sub_title', _("{ stay up to date with all your news feeds! }"));
 
 // midHeader title right
 require_once "./inc/userstatus_display.php";
-$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
 
 // navigation
 require_once "inc/navigation.php";
-$design = str_replace("<!-- navigation -->", $navigation, $design);
 
 // main
-$design = str_replace("<!-- main -->", $main, $design);
+$smarty->assign('formtitle', _("Add Tag"));
+$smarty->assign('tag_name', _("tag name"));
+$smarty->assign('submit', _("Submit!"));
 
-# footer
-require_once "./inc/footer.php";
-$design = str_replace("<!-- footer -->", $footer, $design);
+# Footer
+$smarty->assign('admin_email', $admin['email']);
+$smarty->assign('updated', _("Updated"));
 
-echo $design;
+$smarty->display("page_add_tag.tpl");
 
 function displayAddForm() {
 	$form = sprintf("          <div id=\"addTags_form\">\n" .
@@ -139,4 +112,4 @@
 	"          </div>\n", $_SERVER['PHP_SELF'] . "?feed=" . $_GET['feed'], _("Add Tag"), _("tag name"), _("Submit!"));
 	return $form;
 }
-?>
\ No newline at end of file
+?>

Modified: trunk/page_show_feed_tag.php
===================================================================
--- trunk/page_show_feed_tag.php	2007-06-06 10:30:11 UTC (rev 125)
+++ trunk/page_show_feed_tag.php	2007-06-06 16:54:31 UTC (rev 126)
@@ -10,155 +10,93 @@
 
 require_once "inc/config.php";
 error_reporting(E_ALL);
-############
-# DATABASE #
-############
+
+/* DATABASE */
 require_once "./inc/database.php";
 
-###########
-# SESSION #
-###########
+/* SESSION */
 require_once "./inc/session.php";
 
-################
-# Feed-Manager #
-################
+/* Feed-Manager */
 require_once "class/Feed_manager.php";
-$feed = new Feed_manager($db);
+$feed_manager = new Feed_manager($db);
 
-################
-# User-Manager #
-################
+/* User-Manager */
 require_once "class/User_manager.php";
 $user = new User_manager($db);
 
-###############
-# Tag-Manager #
-###############
+/* Tag-Manager */
 require_once "class/Tag_manager.php";
 $tag_manager = new Tag_Manager($db);
 
-##############
-# HTTP-Class #
-##############
+/* HTTP-Class */
 require_once "HTTP.php";
 
 $page = "show_feed_tag";
 
-############
-# LANGUAGE #
-############
-require_once "./inc/language.php";
+/* STYLES */
+require_once "inc/styles.php";
 
-// Now we're going to replace the placeholders in the template with the important content
-//
-if (!isset ($_GET['tag'])) {
-	$form = displaySearchForm();
-	$main = sprintf("        <p class=\"space\">%s<br /><br /><br /><br /></p>", _("You did not select a tag, please select one on the input-field on the right side of the site... -->"));
-} else {
-	$form = displaySearchForm();
-	//$main = createFeedsTable($_GET['tag'], $tag_manager, $feed);
-	$main = createSelectionTable($_GET['tag'], $tag_manager, $feed);
-}
+/* SMARTY */
+require_once "inc/smarty.php";
 
-$design = file_get_contents("styles/default/page_show_feed_tag.tpl", "r");
+/* LANGUAGE */
+require_once "./inc/language.php";
 
 # Header
 // title
-$title = "Feed-Collector";
-$design = str_replace("<!-- title -->", $title, $design);
+$smarty->assign('title', "Feed-Collector");
 
 // related sites
 require_once "./inc/upperBar.php";
-$design = str_replace("<!-- related sites -->", $related_sites, $design);
 
 // midHeader title left
-$midHeader_title_left = sprintf("        <h1 class=\"headerTitle\">%s</h1>\n        <div class=\"headerSubTitle\" title=\"Message'\">\n          %s\n        </div>", _("Feed-Collector"), _("{ stay up to date with all your news feeds! }"));
-$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design);
+$smarty->assign('page_title', _("Feed-Collector"));
+$smarty->assign('sub_title', _("{ stay up to date with all your news feeds! }"));
 
 // midHeader title right
 require_once "./inc/userstatus_display.php";
-$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
 
 // navigation
 require_once "inc/navigation.php";
-$design = str_replace("<!-- navigation -->", $navigation, $design);
 
 # Main copy
 // main
-$design = str_replace("<!-- main -->", $main, $design);
-
-# sideBar
-// rightSideBar
-$design = str_replace("<!-- rightSideBar -->", $form, $design);
-
-# footer
-require_once "./inc/footer.php";
-$design = str_replace("<!-- footer -->", $footer, $design);
-
-echo $design;
-
-function createSelectionTable($tag, $tag_manager, $feed_manager) {
-	$feeds = $tag_manager->getFeedsByTag($tag);
+$smarty->assign('no_tag_str', _("You did not select a tag, please select one on the input-field on the right side of the site... -->"));
+$smarty->assign('table_summary', "Feed List");
+$smarty->assign('feed_list_str', _("Feed List"));
+$smarty->assign('site_str', _("Site"));
+$smarty->assign('feed_str', _("Feed"));
+$smarty->assign('tags_str', _("Tags"));
+$smarty->assign('languages_str', _("Languages"));
+if (isset ($_GET['tag'])) {
+	$feeds = $tag_manager->getFeedsByTag($_GET['tag']);
 	if (false === $feeds) {
-		return "error!!!";
-	}
-	$return = sprintf("        <p class=\"tagname\">%s</p>\n", $_GET['tag']);
-	$return .= sprintf("          <table summary=\"\">\n" .
-	"            <tr>\n" .
-	"              <th>%s</th>\n" .
-	"              <th>%s</th>\n" .
-	"              <th>%s</th>\n" .
-	"              <th class=\"language_flag\"><img src=\"pic/lang/International.gif\" alt=\"%s\" /></th>\n" .
-	"            </tr>\n", _("Feed List"), _("Site"), _("Feed"), _("Tags"), _("Languages"));
-	$items = $feed_manager->getSpecFeeds($feeds);
-	foreach ($items as $list) {
-		$return .= sprintf("            <tr>\n" .
-		"              <td><a href=\"./page_show_feed?feed=%s\">%s</a></td>\n" .
-		"              <td><a href=\"%s\">%s</a></td>\n", $list['feed_url'], $list['feed_name'], $list['site_url'], $list['site_name']);
-		if (false === $tag_manager->hasTags($list['feed_url'])) {
-			$return .= "              <td>&nbsp;</td>\n";
-		} else {
-			$tags = $tag_manager->getTags($list['feed_url']);
-			if (count($tags) == 1) {
-				$return .= sprintf("            <td><a href=\"./page_show_feed_tag.php?tag=%s\">%s</a></td>\n", $tags[0], $tags[0]);
+		$smarty->assign('error', true);
+	} else {
+		$i = 0;
+		$feed_list = array ();
+		foreach ($feed_manager->getSpecFeeds($feeds) as $list) {
+			$feed_list[$i] = $list;
+			if( true === $tag_manager->hasTags($list['feed_url'])) {
+				$feed_list[$i]['has_tags'] = true;
+				$feed_list[$i]['tag_list'] = $tag_manager->getTags($list['feed_url']);
 			} else {
-				$return .= "            <td>\n";
-				foreach ($tags as $id => $tag) {
-					$taglink = str_replace(" ", "%20", $tag);
-					$return .= "<a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>";
-					if ($id !== (count($tags) - 1)) {
-						$return .= ", ";
-					}
-				}
-				$return .= "            </td>\n";
+				$feed_list[$i]['hast_tags'] = false;
 			}
 		}
-		$return .= sprintf("              <td class=\"right_side\"><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" .
-		"            </tr>\n", $list['site_lang'], $list['site_lang']);
 	}
-
-	$return .= "          </table>";
-	return $return;
 }
 
+# sideBar
+// rightSideBar
+$smarty->assign('tags_str', _("Tags"));
+$smarty->assign('formtitle', _("Select a Tag"));
+$smarty->assign('submit', _("Submit!"));
 
-function displaySearchForm() {
+# footer
+$smarty->assign('admin_email', $admin['email']);
+$smarty->assign('updated', _("Updated"));
+$smarty->display("page_show_feed_tag.tpl");
 
-	$rightSideBar = sprintf("        <p class=\"sideBarTitle\">%s</p>\n\n", _("Tags"));
-	$rightSideBar .= sprintf("          <div id=\"searchTag_form\">\n" .
-	"            <form action=\"%s\" method=\"get\" accept-charset=\"UTF-8\">\n" .
-	"              <div id=\"formtitle\">%s</div>\n" .
-	"              <div class=\"left\">\n" .
-	"              </div>\n" .
-	"              <div class=\"right\">\n" .
-	"                <div class=\"formField\" ><input type=\"text\" name=\"tag\" size=\"10\" maxlength=\"20\" /></div>\n" .
-	"              </div>\n" .
-	"              <div id=\"formButtons\">\n" .
-	"                <input type=\"submit\" value=\"%s\" name=\"submit\" />\n" .
-	"              </div>\n" .
-	"            </form>\n" .
-	"          </div>\n", $_SERVER['PHP_SELF'], _("Select a Tag"), _("Submit!"));
-	return $rightSideBar;
-}
-?>
\ No newline at end of file
+?>

Modified: trunk/styles/default/page_show_feed_tag.tpl
===================================================================
--- trunk/styles/default/page_show_feed_tag.tpl	2007-06-06 10:30:11 UTC (rev 125)
+++ trunk/styles/default/page_show_feed_tag.tpl	2007-06-06 16:54:31 UTC (rev 126)
@@ -1,60 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
-  <head>
-    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" />
-    <meta name="author" content="haran" />
-    <meta name="generator" content="haran" />
+{include file="html_header.tpl"}
+{include file="page_header.tpl"}
 
-    <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feed_tag-screen.css" media="screen, tv, projection" title="Default" />
-    <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" />
-    <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" />
-    <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" />
-    <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" />
-
-    <title><!-- title --></title>
-  </head>
-
-  <body>
-    <!-- For non-visual user agents: -->
-      <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div>
-
-    <!-- ##### Header ##### -->
-
-    <div id="header">
-      <div class="superHeader">
-<!-- related sites -->
-      </div>
-
-      <div class="midHeader">
-<!-- midHeader title left -->
-
-        <br class="doNotDisplay doNotPrint" />
-
-        <div class="headerLogin">
-<!-- midHeader title right -->
-        </div>
-      </div>
-
-      <div class="subHeader">
-<!-- navigation -->
-      </div>
-    </div>
-
     <!-- ##### Main Copy ##### -->
     <div class="rightSideBar">
-<!-- rightSideBar -->
+      <p class="sideBarTitle">{$tags_str}</p>
+      <div id="searchTag_form">
+        <form action="{$smarty.server.PHP_SELF}" method="get" accept-charset="UTF-8">
+          <div id="formtitle">{$formtitle}</div>
+          <div class="left"></div>
+          <div class="right">
+            <div class="formField"><input type="text" name="tag" size="10" maxlength="20" /></div>
+          </div>
+          <div id="formButtons">
+            <input type="submit" value="{$submit}" name="submit" />
+          </div>
+        </form>
+      </div>
     </div>
+
     <div id="main-copy">
-      
-<!-- main -->
+{if isset($smarty.get.tag) and !$error}
+      <p class="tagname">{$smarty.get.tag}</p>
+        <table summary="{$table_summary|default:""}">
+	  <thead>
+            <tr>
+              <th>{$feed_list_str}</th>
+              <th>{$site_str}</th>
+              <th>{$feed_str}</th>
+              <th class="language_flag">{html_image file="pic/lang/International.gif" alt=$languages_str}</th>
+            </tr>
+	  </thead>
+	  <tbody>
+  {foreach from=$feed_list item=i name="feed_list"}
+            <tr>
+              <td><a href="./page_show_feed?feed={$i.feed_url|escape:"url"}">{$i.feed_name}</a></td>
+              <td><a href="{$i.site_url|escape:"url"}">{$i.site_name}</a></td>
+    {if $i.has_tags}
+              <td>
+      {foreach from=$i.tag_list item=j name="tag_list"}
+                <a href="./page_show_feed_tag.php?tag={$j|escape:"url"}">{$j}</a>
+      {/foreach}
+              </td>
+    {/if}
+              <td class="right_side">{html_image file="pic/lang/{$i.site_lang}.gif alt=$i.site_lang}</td>
+            </tr>
+  {/foreach}
+         </tbody>
+       </table>
+        
+{elseif $error}
+      <p>ERROR</p>
+{else}
+      <p class="space">{$no_tag_str}<br /><br /><br /><br /></p>
+{/if}
     </div>
     
-    <!-- ##### Footer ##### -->
-
-    <div id="footer">
-<!-- footer -->
-    </div>
-  </body>
-</html>
+{include file="page_footer.tpl"}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.