Thread: [Feed-collector-svn] SF.net SVN: feed-collector: [99] trunk (Page 2)
Status: Beta
Brought to you by:
c167
Menu
▾
▴
feed-collector-svn
|
From: <c1...@us...> - 2007-01-10 22:13:20
|
Revision: 99
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=99&view=rev
Author: c167
Date: 2007-01-10 14:12:47 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/inc/navigation.php
trunk/page_add_new_feed.php
trunk/page_add_tag.php
trunk/page_login.php
trunk/page_main.php
trunk/page_personal.php
trunk/page_register.php
trunk/page_show_all_feeds.php
trunk/page_show_feed.php
trunk/page_show_feed_tag.php
trunk/styles/default/page_login-screen.css
trunk/styles/default/page_main-screen.css
trunk/styles/default/page_personal-screen.css
trunk/styles/default/page_register-screen.css
Modified: trunk/inc/navigation.php
===================================================================
--- trunk/inc/navigation.php 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/inc/navigation.php 2007-01-10 22:12:47 UTC (rev 99)
@@ -57,12 +57,12 @@
" <a href=\"./page_show_feed_tag.php\"$show_feed_tag>%s</a> |\n" .
" <a href=\"./page_add_new_feed.php\"$add_new_feed>%s</a> |\n" .
" <a href=\"./page_show_feed.php\"$show_feed>%s</a> |\n" .
-" <a href=\"./page_add_tag.php?%s\"$add_tag>%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Display a Feed"), !empty($_GET['feed']) ? "feed=" .$_GET['feed'] : "", _("Add a Tag"));
+" <a href=\"./page_add_tag.php?%s\"$add_tag>%s</a> |\n", dgettext("navigation", "Home"), dgettext("navigation", "Show all Feeds"), dgettext("navigation", "Feeds by TAG"), dgettext("navigation", "Add a Feed"), dgettext("navigation", "Display a Feed"), !empty($_GET['feed']) ? "feed=" .$_GET['feed'] : "", dgettext("navigation", "Add a Tag"));
if (false === HTTP_Session :: get("logged_in", false)) {
$navigation .= sprintf(" <a href=\"./page_login.php\"$login>%s</a> |\n" .
- " <a href=\"./page_register.php\"$register>%s</a>", _("Login"), _("Register"));
+ " <a href=\"./page_register.php\"$register>%s</a>", dgettext("navigation", "Login"), dgettext("navigation", "Register"));
} else {
$navigation .= sprintf(" <a href=\"./page_personal.php\"$personal>%s</a> |\n" .
- " <a href=\"./page_logout.php?returnto=page_main.php\">%s</a>", _("Personal Page"), _("LogOut"));
+ " <a href=\"./page_logout.php?returnto=page_main.php\">%s</a>", dgettext("navigation", "Personal Page"), dgettext("navigation", "LogOut"));
}
?>
Modified: trunk/page_add_new_feed.php
===================================================================
--- trunk/page_add_new_feed.php 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_add_new_feed.php 2007-01-10 22:12:47 UTC (rev 99)
@@ -80,7 +80,7 @@
$user = new User_manager($db);
if (false === HTTP_Session :: get("logged_in", false)) {
- //HTTP :: redirect("./page_login.php");
+ HTTP :: redirect("./page_login.php");
}
$page = "add_new_feed";
@@ -97,15 +97,18 @@
}
elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
$language = $_GET['lang'];
+ HTTP_Session :: set("lang", $_GET['lang']);
}
elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
$language = HTTP_Session :: get("lang");
} else {
$language = "en_EN";
}
+putenv("LANG=$language");
setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
#####################
# BUILD THE CONTENT #
Modified: trunk/page_add_tag.php
===================================================================
--- trunk/page_add_tag.php 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_add_tag.php 2007-01-10 22:12:47 UTC (rev 99)
@@ -87,19 +87,24 @@
if (true === HTTP_Session :: get("logged_in", false)) {
$user->setUserId(HTTP_Session :: get("uid"));
$language = $user->getUserLanguage();
- if(!in_array($language, $langs)) {
+ if (!in_array($language, $langs)) {
$language = "en_EN";
}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+ HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
$language = HTTP_Session :: get("lang");
} else {
$language = "en_EN";
}
+putenv("LANG=$language");
setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
$main = "";
if (isset ($_POST['tag'])) {
Modified: trunk/page_login.php
===================================================================
--- trunk/page_login.php 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_login.php 2007-01-10 22:12:47 UTC (rev 99)
@@ -76,19 +76,24 @@
if (true === HTTP_Session :: get("logged_in", false)) {
$user->setUserId(HTTP_Session :: get("uid"));
$language = $user->getUserLanguage();
- if(!in_array($language, $langs)) {
+ if (!in_array($language, $langs)) {
$language = "en_EN";
}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+ HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
$language = HTTP_Session :: get("lang");
} else {
$language = "en_EN";
}
+putenv("LANG=$language");
setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
################
# User-Manager #
@@ -187,23 +192,15 @@
if (!is_null($error)) {
switch ($error) {
case LOGIN_WRONG_VALUES :
- $id_username = "error";
- $id_password = "error";
$message = sprintf(" <p>%s</p>\n", _("Unknown username. If you don't have a username then please <a href=\"./page_register.php\">register</a> a new one"));
break;
case LOGIN_INACTIVE :
- $id_username = "error";
- $id_password = "error";
$message = sprintf(" <p>%s</p>\n", _("This useraccount is not active. You should have received a mail with an access-key. If not, please look at your spam-folder or send a mail to the site-admin."));
break;
default :
- $id_username = "ok";
- $id_password = "ok";
$message = sprintf(" <p>%s</p>\n", _("Please enter your username and your password to login. Cookies have to be enabled from this point."));
}
} else {
- $id_username = "ok";
- $id_password = "ok";
$message = sprintf(" <p>%s</p>\n", _("Please enter your username and your password to login. Cookies have to be enabled from this point."));
}
@@ -215,12 +212,12 @@
" <th colspan=\"2\">%s</th>\n" .
" </tr>\n" .
" <tr>\n" .
- " <td class=\"left_side\" class=\"formElem_$id_username\">%s</td>\n" .
- " <td class=\"right_side\" class=\"formField_$id_username\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></td>\n" .
+ " <td class=\"formElem\">%s</td>\n" .
+ " <td class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></td>\n" .
" </tr>\n" .
" <tr>\n" .
- " <td class=\"left_side\" class=\"formElem_$id_password\">%s</td>\n" .
- " <td class=\"right_side\" class=\"formField_$id_password\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" /></td>\n" .
+ " <td class=\"formElem\">%s</td>\n" .
+ " <td class=\"formField\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" /></td>\n" .
" </tr>\n" .
" <tr id=\"formButtons\">\n" .
" <td colspan=\"2\"><input type=\"submit\" value=\"%s\" name=\"submit\" /><input type=\"reset\" value=\"%s\" /></td>\n" .
Modified: trunk/page_main.php
===================================================================
--- trunk/page_main.php 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_main.php 2007-01-10 22:12:47 UTC (rev 99)
@@ -75,22 +75,23 @@
if (true === HTTP_Session :: get("logged_in", false)) {
$user->setUserId(HTTP_Session :: get("uid"));
$language = $user->getUserLanguage();
- if(!in_array($language, $langs)) {
+ if (!in_array($language, $langs)) {
$language = "en_EN";
}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+ HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
$language = HTTP_Session :: get("lang");
} else {
$language = "en_EN";
}
-//echo $language;
putenv("LANG=$language");
setlocale(LC_ALL, $language);
-//echo "<br />";
bindtextdomain("page_main", "./i18n");
-//echo "<br />";
+bindtextdomain("navigation", "./i18n");
textdomain("page_main");
//
@@ -107,7 +108,13 @@
# body
// related sites
-$related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+if (true === HTTP_Session :: get("logged_in", false)) {
+ $related_sites = sprintf(" <span>%s</span>\n" .
+ " <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
+ " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+} else {
+ $related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+}
$design = str_replace("<!-- related sites -->", $related_sites, $design);
// midHeader title left
@@ -118,7 +125,7 @@
if (false === HTTP_Session :: get("logged_in", false)) {
$midHeader_title_right = sprintf(" <p>%s</p>", _("You are not logged in"));
} else {
- if(HTTP_Session :: get("username", false) == false) {
+ if (HTTP_Session :: get("username", false) == false) {
$username = $user->getUsername();
} else {
$username = HTTP_Session :: get("username");
Modified: trunk/page_personal.php
===================================================================
--- trunk/page_personal.php 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_personal.php 2007-01-10 22:12:47 UTC (rev 99)
@@ -79,19 +79,24 @@
if (true === HTTP_Session :: get("logged_in", false)) {
$user->setUserId(HTTP_Session :: get("uid"));
$language = $user->getUserLanguage();
- if(!in_array($language, $langs)) {
+ if (!in_array($language, $langs)) {
$language = "en_EN";
}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+ HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
$language = HTTP_Session :: get("lang");
} else {
$language = "en_EN";
}
+putenv("LANG=$language");
setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
//
Modified: trunk/page_register.php
===================================================================
--- trunk/page_register.php 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_register.php 2007-01-10 22:12:47 UTC (rev 99)
@@ -82,25 +82,31 @@
$user = new User_manager($db);
$page = "register";
+
############
# LANGUAGE #
############
if (true === HTTP_Session :: get("logged_in", false)) {
$user->setUserId(HTTP_Session :: get("uid"));
$language = $user->getUserLanguage();
- if(!in_array($language, $langs)) {
+ if (!in_array($language, $langs)) {
$language = "en_EN";
}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+ HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
$language = HTTP_Session :: get("lang");
} else {
$language = "en_EN";
}
+putenv("LANG=$language");
setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
#####################
@@ -185,7 +191,6 @@
" <td class=\"formField\">\n" .
" <select name=\"language\">\n" .
" <option value=\"en_EN\">%s</option>\n" .
- //" <option value=\"de_DE\" selected=\"selected\">German</option>\n" .
" <option value=\"de_DE\">%s</option>\n" .
" </select>\n" .
" </td>\n" .
Modified: trunk/page_show_all_feeds.php
===================================================================
--- trunk/page_show_all_feeds.php 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_show_all_feeds.php 2007-01-10 22:12:47 UTC (rev 99)
@@ -90,19 +90,24 @@
if (true === HTTP_Session :: get("logged_in", false)) {
$user->setUserId(HTTP_Session :: get("uid"));
$language = $user->getUserLanguage();
- if(!in_array($language, $langs)) {
+ if (!in_array($language, $langs)) {
$language = "en_EN";
}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+ HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
$language = HTTP_Session :: get("lang");
} else {
$language = "en_EN";
}
+putenv("LANG=$language");
setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
//
Modified: trunk/page_show_feed.php
===================================================================
--- trunk/page_show_feed.php 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_show_feed.php 2007-01-10 22:12:47 UTC (rev 99)
@@ -81,19 +81,24 @@
if (true === HTTP_Session :: get("logged_in", false)) {
$user->setUserId(HTTP_Session :: get("uid"));
$language = $user->getUserLanguage();
- if(!in_array($language, $langs)) {
+ if (!in_array($language, $langs)) {
$language = "en_EN";
}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+ HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
$language = HTTP_Session :: get("lang");
} else {
$language = "en_EN";
}
+putenv("LANG=$language");
setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
//
Modified: trunk/page_show_feed_tag.php
===================================================================
--- trunk/page_show_feed_tag.php 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_show_feed_tag.php 2007-01-10 22:12:47 UTC (rev 99)
@@ -81,21 +81,25 @@
if (true === HTTP_Session :: get("logged_in", false)) {
$user->setUserId(HTTP_Session :: get("uid"));
$language = $user->getUserLanguage();
- if(!in_array($language, $langs)) {
+ if (!in_array($language, $langs)) {
$language = "en_EN";
}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+ HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
$language = HTTP_Session :: get("lang");
} else {
$language = "en_EN";
}
+putenv("LANG=$language");
setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
-
// Now we're going to replace the placeholders in the template with the important content
//
if (!isset ($_GET['tag'])) {
Modified: trunk/styles/default/page_login-screen.css
===================================================================
--- trunk/styles/default/page_login-screen.css 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/styles/default/page_login-screen.css 2007-01-10 22:12:47 UTC (rev 99)
@@ -26,50 +26,40 @@
border-bottom: 1px solid rgb(204, 204, 204);
}
-.left_side,.right_side {
- padding-top: 1%;
- padding-bottom: 1%;
+.formElem {
width: 49%;
+ text-align: center;
+ border-bottom: 1px solid rgb(117, 144, 174);
}
-.right_side {
+.formField {
+ padding: 1%;
+ width: 49%;
border-left: 1px solid rgb(117, 144, 174);
+ border-bottom: 1px solid rgb(117, 144, 174);
}
-
-.formElem_ok,.formElem_error {
- text-align: center;
-}
-
-.formElem_ok input {
+.formField input {
+ margin-left: 2%;
background-color: yellow;
}
-.formElem_error input {
- background-color: red;
+#formButtons {
+ margin-left: 1%;
+ margin-right: 1%;
+ padding-left: 1%;
+ padding-right: 1%;
}
-.formField_ok input {
- background-color: yellow;
-}
-
-.formField_error input {
- background-color: red;
-}
-
#formButtons td {
text-align: center;
background-color: rgb(117, 144, 174);
margin-top: 6em;
padding-top: 1em;
padding-bottom: 1em;
-/* border-top: 2px solid rgb(204, 204, 204);*/
}
-#formButtons {
- margin-left: 1%;
- margin-right: 1%;
- padding-left: 1%;
- padding-right: 1%;
+#formButtons input {
+ margin-left: 1em;
}
.quarter,.oneThird,.half,.twoThirds,.fullWidth {
Modified: trunk/styles/default/page_main-screen.css
===================================================================
--- trunk/styles/default/page_main-screen.css 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/styles/default/page_main-screen.css 2007-01-10 22:12:47 UTC (rev 99)
@@ -98,7 +98,7 @@
/* use with an empty <p> element to add padding to the end of a text box */
border: 1px solid white;
}
-
+/*
.noBorderOnLeft {
border-left: none;
}
@@ -106,16 +106,15 @@
.dividingBorderAbove {
border-top: 1px solid rgb(204, 204, 204);
}
-
+*/
/* More elegant alternatives to .noBorderOnLeft & .dividingBorderAbove
* that don't require the creation of new classes - but which are not
* supported by MSIE - are the following:
- *
- * .rowOfBoxes > div:first-child {
- * border-left: none;
- * }
- *
- * .rowOfBoxes + .rowOfBoxes {
- * border-top: 1px solid rgb(204,204,204);
- * }
- */
\ No newline at end of file
+ */
+.rowOfBoxes > div:first-child {
+ border-left: none;
+}
+
+.rowOfBoxes + .rowOfBoxes {
+ border-top: 1px solid rgb(204,204,204);
+}
\ No newline at end of file
Modified: trunk/styles/default/page_personal-screen.css
===================================================================
--- trunk/styles/default/page_personal-screen.css 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/styles/default/page_personal-screen.css 2007-01-10 22:12:47 UTC (rev 99)
@@ -13,12 +13,20 @@
float: left;
width: 28%;
}
+/*
+.column1 {
+ border-right: 1px solid rgb(204, 204, 204);
+}
.column2 { /* Renders the column dividers */
border-left: 1px solid rgb(204, 204, 204);
border-right: 1px solid rgb(204, 204, 204);
}
+.column3 {
+ border-left: 1px solid rgb(204, 204, 204);
+}*/
+
.feed_headline {
padding-bottom: 1em;
text-align: center;
@@ -31,8 +39,8 @@
background-color: rgb(61, 92, 122);
}
-.column1 .feed_headline {
-
+.column1 .feed_headline a {
+ color: white;
}
.column1 ul {
@@ -40,8 +48,8 @@
border: 1px solid rgb(61, 92, 122);
}
-.column2 .feed_headline {
-
+.column2 .feed_headline a {
+ color: white;
}
.column2 ul {
@@ -49,8 +57,8 @@
margin-top: 0;
}
-.column3 .feed_headline {
-
+.column3 .feed_headline a {
+ color: white;
}
.column3 ul {
Modified: trunk/styles/default/page_register-screen.css
===================================================================
--- trunk/styles/default/page_register-screen.css 2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/styles/default/page_register-screen.css 2007-01-10 22:12:47 UTC (rev 99)
@@ -49,11 +49,30 @@
padding-left: 5%;
border-left: 1px solid rgb(204, 204, 204);
}
-
+/*
#formButtons {
text-align: center;
background-color: rgb(117, 144, 174);
margin-top: 16em;
padding: 1ex 10px;
border-top: 1px solid rgb(204, 204, 204);
+}*/
+
+#formButtons {
+ margin-left: 1%;
+ margin-right: 1%;
+ padding-left: 1%;
+ padding-right: 1%;
+}
+
+#formButtons td {
+ text-align: center;
+ background-color: rgb(117, 144, 174);
+ margin-top: 6em;
+ padding-top: 1em;
+ padding-bottom: 1em;
+}
+
+#formButtons input {
+ margin-left: 1em;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <c1...@us...> - 2007-01-12 23:46:14
|
Revision: 100
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=100&view=rev
Author: c167
Date: 2007-01-12 15:46:14 -0800 (Fri, 12 Jan 2007)
Log Message:
-----------
big enhancements, reduced file-size by putting some parts into extra files, VERSION 100, YEAH
Modified Paths:
--------------
trunk/SQL/mysql.setup.php
trunk/class/Feed_manager.php
trunk/class/Tag_manager.php
trunk/class/User_manager.php
trunk/inc/config.php
trunk/inc/navigation.php
trunk/index.php
trunk/page_add_new_feed.php
trunk/page_add_tag.php
trunk/page_login.php
trunk/page_logout.php
trunk/page_main.php
trunk/page_personal.php
trunk/page_register.php
trunk/page_show_all_feeds.php
trunk/page_show_feed.php
trunk/page_show_feed_tag.php
trunk/statistics.php
trunk/styles/default/header-screen.css
trunk/styles/default/page_personal-screen.css
trunk/update_feeds.php
Added Paths:
-----------
trunk/inc/database.php
trunk/inc/footer.php
trunk/inc/language.php
trunk/inc/session.php
trunk/inc/upperBar.php
trunk/inc/userstatus_display.php
Modified: trunk/SQL/mysql.setup.php
===================================================================
--- trunk/SQL/mysql.setup.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/SQL/mysql.setup.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -1,55 +1,116 @@
<?php
+/**
+ * Created on 23.10.06
+ * This file contains the MySQL-Querys for preparing the database
+ * @since 49 - 23.10.06
+ * @author c167 <c1...@us...>
+ * @package feed-collector
+ */
+
/*
-* Creates the Database for the script
-* @rights root
-*/
-$sql_setup['database'] = 'CREATE DATABASE `news-collector`;';
+ * @database feed-collector
+ */
/*
-* Creates the User for the script
-* @rights root
-*/
+ * @table Dummy feed-table
+ */
+$dummyFeed = "CREATE TABLE `f_{feed_db_name}` (
+ `ID` bigint(20) unsigned NOT NULL auto_increment,
+ `title` varchar(255) collate utf8_bin NOT NULL,
+ `url` varchar(255) collate utf8_bin NOT NULL,
+ `summary` varchar(255) collate utf8_bin default NULL,
+ `hash` char(32) collate utf8_bin NOT NULL,
+ `updated` int(11) NOT NULL,
+ PRIMARY KEY (`ID`),
+ UNIQUE KEY `key` (`hash`),
+ KEY `title` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin ;";
/*
-* Grants privilegies to the user.
-* @rights root
-*/
-$sql_setup['grant'] = 'GRANT ALL PRIVILEGES ON `news-collector`.* TO \'news-collector\'@\'localhost\'WITH GRANT OPTION;';
+ * @table feeds
+ */
+$feeds = "CREATE TABLE `feeds` (
+ `ID` int(10) unsigned NOT NULL auto_increment,
+ `site_name` varchar(255) character set latin1 NOT NULL,
+ `site_url` varchar(255) character set latin1 NOT NULL,
+ `site_lang` varchar(255) character set latin1 NOT NULL,
+ `site_img` varchar(255) character set latin1 NOT NULL,
+ `feed_name` varchar(255) character set latin1 NOT NULL,
+ `feed_description` varchar(255) collate utf8_bin NOT NULL,
+ `feed_url` varchar(255) character set latin1 NOT NULL,
+ `feed_type` varchar(10) character set latin1 NOT NULL,
+ `feed_db_name` varchar(30) character set latin1 NOT NULL,
+ `feed_lang` varchar(6) character set latin1 NOT NULL,
+ `feed_img` varchar(255) character set latin1 NOT NULL,
+ `is_active` tinyint(1) NOT NULL default '0',
+ `last_change` int(11) NOT NULL default '0',
+ `added` int(10) NOT NULL,
+ `items` bigint(20) NOT NULL,
+ PRIMARY KEY (`ID`),
+ KEY `site_name` (`site_name`,`site_url`),
+ KEY `items` (`items`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin ;";
/*
-* Creates the Channels-Table, that will contain the basic information about the channels
-* @rights user
-*/
-$sql_setup['crate_channels'] = 'CREATE TABLE `feeds` (' . ' `ID` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, ' . ' `site_name` VARCHAR(255) NOT NULL, ' . ' `site_url` VARCHAR(255) NOT NULL, ' . ' `site_lang` VARCHAR(255) NOT NULL, ' . ' `site_img` VARCHAR(255) NOT NULL, ' . ' `feed_name` VARCHAR(255) NOT NULL, ' . ' `feed_url` VARCHAR(255) NOT NULL, ' . ' `feed_type` VARCHAR(10) NOT NULL, ' . ' `feed_lang` VARCHAR(6) NOT NULL, ' . ' `feed_img` VARCHAR(255) NOT NULL, ' . ' `is_active` BOOL NOT NULL DEFAULT \'0\', ' . ' `last_change` INT NOT NULL DEFAULT \'0\',' . ' INDEX (`site_name`, `site_url`)' . ' )' . ' ENGINE = myisam;';
+ * @table news
+ */
+$news = "CREATE TABLE `news` (
+ `ID` int(10) unsigned NOT NULL auto_increment,
+ `headline` varchar(255) collate utf8_bin NOT NULL,
+ `summary` varchar(255) collate utf8_bin NOT NULL,
+ `content` text collate utf8_bin NOT NULL,
+ `published` int(11) NOT NULL,
+ PRIMARY KEY (`ID`),
+ KEY `headline` (`headline`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin ;";
/*
-CREATE TABLE `channels` (
-`ID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`site_name` VARCHAR( 255 ) NOT NULL ,
-`site_url` VARCHAR( 255 ) NOT NULL ,
-`site_lang` VARCHAR( 255 ) NOT NULL ,
-`feed_name` VARCHAR( 255 ) NOT NULL ,
-`feed_url` VARCHAR( 255 ) NOT NULL ,
-`feed_type` VARCHAR( 10 ) NOT NULL ,
-`feed_lang` VARCHAR( 6 ) NOT NULL ,
-`is_active` BOOL NOT NULL ,
-`last_change` TIMESTAMP NOT NULL DEFAULT '1111111111',
-`encoding` VARCHAR( 20 ) NOT NULL ,
-`temp` VARCHAR( 255 ) NOT NULL ,
-INDEX ( `feed_name` )
-) ENGINE = MYISAM ;
-*/
+ * @table sessiondata
+ */
+$sessiondata = "CREATE TABLE `sessiondata` (
+ `id` char(32) NOT NULL,
+ `expiry` int(10) unsigned NOT NULL default '0',
+ `data` text NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;";
+
/*
-* Content of a "Dummy TABLE, that will be used every time a new feed is added.
-* @rights user
-*/
-$sql = 'CREATE TABLE `f_' . $feed_db_name . '` (' . ' `ID` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, ' . ' `title` VARCHAR(255) NOT NULL, ' . ' `url` VARCHAR(255) NOT NULL, ' . ' `time` INT NOT NULL,' . ' INDEX (`title`, `url`)' . ' )' . ' ENGINE = myisam;';
-/* important:
- * ALTER TABLE `f_heise_security` ADD `summary` VARCHAR( 255 ) NOT NULL FIRST ;
+ * @table statistic
+ */
+$statistic = "CREATE TABLE `statistic` (
+ `number_of_feeds` int(10) unsigned NOT NULL,
+ `number_of_items` bigint(20) unsigned NOT NULL,
+ `fav_feed` varchar(255) character set utf8 collate utf8_bin NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;";
-ALTER TABLE `f_heise_security` ADD INDEX ( `summary` ) ;
+/*
+ * @table tags
*/
-$sql = 'ALTER TABLE `f_heise_security`' . ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin';
+$tags = "CREATE TABLE `tags` (
+ `id` bigint(20) unsigned NOT NULL auto_increment,
+ `setBy` varchar(25) collate utf8_bin NOT NULL,
+ `tag` varchar(25) collate utf8_bin NOT NULL,
+ `feed` varchar(255) collate utf8_bin NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `tag` (`tag`,`feed`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin ;";
+
+/*
+ * @table users
+ */
+$users = "CREATE TABLE `users` (
+ `ID` bigint(20) NOT NULL auto_increment,
+ `name` varchar(255) collate utf8_bin NOT NULL,
+ `email` varchar(255) collate utf8_bin NOT NULL,
+ `pass` char(32) collate utf8_bin NOT NULL,
+ `language` varchar(7) collate utf8_bin NOT NULL default 'en_EN',
+ `columns` text collate utf8_bin NOT NULL,
+ `state` varchar(20) collate utf8_bin NOT NULL,
+ `last_action` int(11) NOT NULL default '0',
+ PRIMARY KEY (`ID`),
+ UNIQUE KEY `email` (`email`),
+ KEY `name` (`name`,`pass`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin ;";
?>
\ No newline at end of file
Modified: trunk/class/Feed_manager.php
===================================================================
--- trunk/class/Feed_manager.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/class/Feed_manager.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,11 +3,11 @@
/**
* Created on 09.07.2006
- *
- * This file is used to
+ * This file contains the Feed-Manager
* @version 1.2
* @since 20 - 09.07.2006
* @author c167 <c1...@us...>
+ * @package feed-collector
*/
class Feed_Manager {
Modified: trunk/class/Tag_manager.php
===================================================================
--- trunk/class/Tag_manager.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/class/Tag_manager.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,10 +3,10 @@
/**
* Created on 11.12.2006
- *
- * This file is used to
+ * This file contains the Tag-Manager
* @since 74 - 11.12.2006
* @author c167 <c1...@us...>
+ * @package feed-collector
*/
class Tag_Manager {
Modified: trunk/class/User_manager.php
===================================================================
--- trunk/class/User_manager.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/class/User_manager.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,11 +3,10 @@
/**
* Created on 25.11.2006
- *
- * This file is used to
- * @version 1.2
+ * This file contains the User-Manager
* @since 58 - 25.11.2006
* @author c167 <c1...@us...>
+ * @package feed-collector
*/
/**
Modified: trunk/inc/config.php
===================================================================
--- trunk/inc/config.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/inc/config.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -13,12 +13,12 @@
*/
// Database-configuration
-$db['type'] = "mysql"; // SQL_DB-Type
-$db['host'] = "localhost"; // The hostname
-$db['port'] = ""; // The Port. Nomally, the default port is right.
-$db['user'] = "feed-collector"; // The User that has access to the DB
-$db['passwd'] = "feed-collector"; // The password of this user
-$db['database'] = "feed-collector"; // The name of the database
+$db['type'] = "mysql"; // SQL_DB-Type
+$db['host'] = "localhost"; // The hostname
+$db['port'] = ""; // The Port. Nomally, the default port is right.
+$db['user'] = "feed-collector"; // The User that has access to the DB
+$db['passwd'] = "feed-collector"; // The password of this user
+$db['database'] = "feed-collector"; // The name of the database
// Session-configuration
$session['time']['expire'] = 60 * 60 * 24;
Added: trunk/inc/database.php
===================================================================
--- trunk/inc/database.php (rev 0)
+++ trunk/inc/database.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Created on 12.01.2007
+ * Contains the main database-functions needed by any script
+ * @since 100 - 12.01.2007
+ * @author C167 <c1...@us...>
+ * @package feed-collector
+ */
+require_once "MDB2.php";
+$dsn = array (
+ 'phptype' => $db['type'],
+ 'username' => $db['user'],
+ 'password' => $db['passwd'],
+ 'hostspec' => $db['host'],
+ 'database' => $db['database']
+);
+$options = array (
+ 'debug' => 2,
+ 'result_buffering' => true,
+ 'portability' => MDB2_PORTABILITY_ALL
+);
+$db = & MDB2 :: factory($dsn, $options);
+if (PEAR :: isError($db)) {
+ echo $db->getMessage();
+ echo "<br />";
+ echo $db->getDebugInfo();
+} else {
+}
+$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+?>
Added: trunk/inc/footer.php
===================================================================
--- trunk/inc/footer.php (rev 0)
+++ trunk/inc/footer.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created on 12.01.2007
+ * This file contains the footer
+ * @since 100 - 12.01.2007
+ * @author C167 <c1...@us...>
+ * @package feed-collector
+ */
+
+// footer
+$footer = sprintf(" <span class=\"doNotPrint\">\n" .
+ " For comments or questions about this website, please\n" .
+ " <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n" .
+ " </span>\n\n" .
+ " <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n" .
+ " • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •");
+?>
Added: trunk/inc/language.php
===================================================================
--- trunk/inc/language.php (rev 0)
+++ trunk/inc/language.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Created on 12.01.2007
+ * Contains the language-setter
+ * @since 100 - 12.01.2007
+ * @author C167 <c1...@us...>
+ * @package feed-collector
+ */
+
+if (true === HTTP_Session :: get("logged_in", false)) {
+ $user->setUserId(HTTP_Session :: get("uid"));
+ $language = $user->getUserLanguage();
+ if (!in_array($language, $langs)) {
+ $language = "en_EN";
+ }
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+ $language = $_GET['lang'];
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+ $language = HTTP_Session :: get("lang");
+} else {
+ $language = "en_EN";
+}
+HTTP_Session :: set("lang", $language);
+putenv("LANG=$language");
+setlocale(LC_ALL, $language);
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+bindtextdomain("userstatus_display", "./i18n");
+textdomain("page_main");
+?>
Modified: trunk/inc/navigation.php
===================================================================
--- trunk/inc/navigation.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/inc/navigation.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,9 +3,10 @@
/**
* Created on 05.01.2007
- *
- *
+ * Creates the navigation-bar
+ * @since 93 - 05.01.2007
* @author C167 <c1...@us...>
+ * @package feed-collector
*/
$hl = " class=\"highlight\"";
Added: trunk/inc/session.php
===================================================================
--- trunk/inc/session.php (rev 0)
+++ trunk/inc/session.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Created on 12.01.2007
+ * Contains the session-relatet stuff
+ * @since 100 - 12.01.2007
+ * @author C167 <c1...@us...>
+ * @package feed-collector
+ */
+require_once "HTTP/Session.php";
+$options = array (
+ 'dsn' => & $db,
+ 'table' => $session['container']['tablename'],
+ 'autooptimize' => $session['container']['autooptimize']
+);
+HTTP_Session :: setContainer('MDB2', $options);
+HTTP_Session :: start();
+HTTP_Session :: setExpire($session['time']['expire']);
+HTTP_Session :: setIdle($session['time']['idle']);
+
+if (true === HTTP_Session :: isNew()) {
+ HTTP_Session :: set("logged_in", false);
+}
+?>
Added: trunk/inc/upperBar.php
===================================================================
--- trunk/inc/upperBar.php (rev 0)
+++ trunk/inc/upperBar.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Created on 13.01.2007
+ * Contains the bar on top of the page
+ * @since 100 - 13.01.2007
+ * @author C167 <c1...@us...>
+ * @package feed-collector
+ */
+if (false === HTTP_Session :: get("logged_in", false)) {
+ $related_sites = sprintf(" <span>%s</span>\n" .
+ " <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
+ " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>\n", _("Related Sites:"));
+} else {
+ $related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+}
+?>
Added: trunk/inc/userstatus_display.php
===================================================================
--- trunk/inc/userstatus_display.php (rev 0)
+++ trunk/inc/userstatus_display.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Created on 12.01.2007
+ * Contains the script to display the user-status
+ * @since 100 - 12.01.2007
+ * @author C167 <c1...@us...>
+ * @package feed-collector
+ */
+if (false === HTTP_Session :: get("logged_in", false)) {
+ $midHeader_title_right = sprintf(" <p>%s</p>", dgettext("userstatus_display", "You are not logged in"));
+} else {
+ if (HTTP_Session :: get("username", false) == false) {
+ $username = $user->getUsername();
+ } else {
+ $username = HTTP_Session :: get("username");
+ }
+ $midHeader_title_right = sprintf(" <p>%s %s</p>", dgettext("userstatus_display", "Hello"), $username);
+}
+?>
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/index.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -2,8 +2,11 @@
/**
- * Dummy Page
- * @author C167 <c1...@us...>
+ * Created on 30.08.2006
+ * Dummy page
+ * @since 56 - 17.11.2006
+ * @author c167 <c1...@us...>
+ * @package feed-collector
*/
require_once "HTTP.php";
Modified: trunk/page_add_new_feed.php
===================================================================
--- trunk/page_add_new_feed.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/page_add_new_feed.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,8 +3,7 @@
/**
* Created on 30.08.2006
- *
- * @version 1
+ * Lets a user add a new feed
* @since 56 - 17.11.2006
* @author c167 <c1...@us...>
* @package feed-collector
@@ -22,46 +21,13 @@
############
# DATABASE #
############
-require_once "MDB2.php";
-$dsn = array (
- 'phptype' => $db['type'],
- 'username' => $db['user'],
- 'password' => $db['passwd'],
- 'hostspec' => $db['host'],
- 'database' => $db['database']
-);
-$options = array (
- 'debug' => 2,
- 'result_buffering' => true,
- 'portability' => MDB2_PORTABILITY_ALL
-);
-$db = & MDB2 :: factory($dsn, $options);
-if (PEAR :: isError($db)) {
- echo $db->getMessage();
- echo "<br />";
- echo $db->getDebugInfo();
-} else {
-}
-$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+require_once "./inc/database.php";
###########
# SESSION #
###########
-require_once "HTTP/Session.php";
-$options = array (
- 'dsn' => & $db,
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
-);
-HTTP_Session :: setContainer('MDB2', $options);
-HTTP_Session :: start();
-HTTP_Session :: setExpire($session['time']['expire']);
-HTTP_Session :: setIdle($session['time']['idle']);
+require_once "./inc/session.php";
-if (true === HTTP_Session :: isNew()) {
- HTTP_Session :: set("logged_in", false);
-}
-
################
# FEED-Manager #
################
@@ -80,35 +46,16 @@
$user = new User_manager($db);
if (false === HTTP_Session :: get("logged_in", false)) {
- HTTP :: redirect("./page_login.php");
+ HTTP :: redirect("./page_login.php?cameFrom=page_add_new_feed.php");
}
+$user->updateUserAction();
$page = "add_new_feed";
############
# LANGUAGE #
############
-if (true === HTTP_Session :: get("logged_in", false)) {
- $user->setUserId(HTTP_Session :: get("uid"));
- $language = $user->getUserLanguage();
- if (!in_array($language, $langs)) {
- $language = "en_EN";
- }
-}
-elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
- $language = $_GET['lang'];
- HTTP_Session :: set("lang", $_GET['lang']);
-}
-elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
- $language = HTTP_Session :: get("lang");
-} else {
- $language = "en_EN";
-}
-putenv("LANG=$language");
-setlocale(LC_ALL, $language);
-bindtextdomain("page_main", "./i18n");
-bindtextdomain("navigation", "./i18n");
-textdomain("page_main");
+require_once "./inc/language.php";
#####################
# BUILD THE CONTENT #
@@ -122,7 +69,7 @@
$design = str_replace("<!-- title -->", $title, $design);
// related sites
-$related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+require_once "./inc/upperBar.php";
$design = str_replace("<!-- related sites -->", $related_sites, $design);
// midHeader title left
@@ -130,16 +77,7 @@
$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design);
// midHeader title right
-if (false === HTTP_Session :: get("logged_in", false)) {
- $midHeader_title_right = sprintf(" <p>%s</p>", _("You are not logged in"));
-} else {
- if (HTTP_Session :: get("username", false) == false) {
- $username = $user->getUsername();
- } else {
- $username = HTTP_Session :: get("username");
- }
- $midHeader_title_right = sprintf(" <p>%s %s</p>", _("Hello"), $username);
-}
+require_once "./inc/userstatus_display.php";
$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
// navigation
@@ -192,8 +130,7 @@
$design = str_replace("<!-- main -->", $main, $design);
# footer
-// footer
-$footer = sprintf(" <span class=\"doNotPrint\">\n For comments or questions about this website, please\n <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n </span>\n\n <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •");
+require_once "./inc/footer.php";
$design = str_replace("<!-- footer -->", $footer, $design);
echo $design;
Modified: trunk/page_add_tag.php
===================================================================
--- trunk/page_add_tag.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/page_add_tag.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,8 +3,7 @@
/**
* Created on 30.08.2006
- *
- * @version 1
+ * Lets a user add a tag to a feed
* @since 56 - 17.11.2006
* @author c167 <c1...@us...>
* @package feed-collector
@@ -15,43 +14,13 @@
############
# DATABASE #
############
-require_once "MDB2.php";
-$dsn = array (
- 'phptype' => $db['type'],
- 'username' => $db['user'],
- 'password' => $db['passwd'],
- 'hostspec' => $db['host'],
- 'database' => $db['database']
-);
-$options = array (
- 'debug' => 2,
- 'result_buffering' => true,
- 'portability' => MDB2_PORTABILITY_ALL
-);
-$db = & MDB2 :: factory($dsn, $options);
-if (PEAR :: isError($db)) {
+require_once "./inc/database.php";
-}
-$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
-
###########
# SESSION #
###########
-require_once "HTTP/Session.php";
-$options = array (
- 'dsn' => & $db,
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
-);
-HTTP_Session :: setContainer('MDB2', $options);
-HTTP_Session :: start();
-HTTP_Session :: setExpire($session['time']['expire']);
-HTTP_Session :: setIdle($session['time']['idle']);
+require_once "./inc/session.php";
-if (true === HTTP_Session :: isNew()) {
- HTTP_Session :: set("logged_in", false);
-}
-
################
# FEED-Manager #
################
@@ -76,7 +45,7 @@
$user = new User_manager($db);
if (false === HTTP_Session :: get("logged_in", false)) {
- HTTP :: redirect("./page_login.php");
+ HTTP :: redirect("./page_login.php?cameFrom=page_add_tag.php");
}
$page = "add_tag";
@@ -84,27 +53,7 @@
############
# LANGUAGE #
############
-if (true === HTTP_Session :: get("logged_in", false)) {
- $user->setUserId(HTTP_Session :: get("uid"));
- $language = $user->getUserLanguage();
- if (!in_array($language, $langs)) {
- $language = "en_EN";
- }
-}
-elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
- $language = $_GET['lang'];
- HTTP_Session :: set("lang", $_GET['lang']);
-}
-elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
- $language = HTTP_Session :: get("lang");
-} else {
- $language = "en_EN";
-}
-putenv("LANG=$language");
-setlocale(LC_ALL, $language);
-bindtextdomain("page_main", "./i18n");
-bindtextdomain("navigation", "./i18n");
-textdomain("page_main");
+require_once "./inc/language.php";
$main = "";
if (isset ($_POST['tag'])) {
@@ -143,7 +92,7 @@
$design = str_replace("<!-- title -->", $title, $design);
// related sites
-$related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+require_once "./inc/upperBar.php";
$design = str_replace("<!-- related sites -->", $related_sites, $design);
// midHeader title left
@@ -151,16 +100,7 @@
$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design);
// midHeader title right
-if (false === HTTP_Session :: get("logged_in", false)) {
- $midHeader_title_right = sprintf(" <p>%s</p>", _("You are not logged in"));
-} else {
- if(HTTP_Session :: get("username", false) == false) {
- $username = $user->getUsername();
- } else {
- $username = HTTP_Session :: get("username");
- }
- $midHeader_title_right = sprintf(" <p>%s %s</p>", _("Hello"), $username);
-}
+require_once "./inc/userstatus_display.php";
$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
// navigation
@@ -171,8 +111,7 @@
$design = str_replace("<!-- main -->", $main, $design);
# footer
-// footer
-$footer = sprintf(" <span class=\"doNotPrint\">\n For comments or questions about this website, please\n <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n </span>\n\n <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •");
+require_once "./inc/footer.php";
$design = str_replace("<!-- footer -->", $footer, $design);
echo $design;
Modified: trunk/page_login.php
===================================================================
--- trunk/page_login.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/page_login.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,8 +3,7 @@
/**
* Created on 30.08.2006
- *
- * @version 1
+ * Lets a user log in
* @since 56 - 17.11.2006
* @author c167 <c1...@us...>
* @package feed-collector
@@ -22,46 +21,13 @@
############
# DATABASE #
############
-require_once "MDB2.php";
-$dsn = array (
- 'phptype' => $db['type'],
- 'username' => $db['user'],
- 'password' => $db['passwd'],
- 'hostspec' => $db['host'],
- 'database' => $db['database']
-);
-$options = array (
- 'debug' => 2,
- 'result_buffering' => true,
- 'portability' => MDB2_PORTABILITY_ALL
-);
-$db = & MDB2 :: factory($dsn, $options);
-if (PEAR :: isError($db)) {
- /*echo $db->getMessage();
- echo "<br />";
- echo $db->getDebugInfo();*/
-}
-$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+require_once "./inc/database.php";
###########
# SESSION #
###########
-require_once "HTTP/Session.php";
-$options = array (
- 'dsn' => & $db,
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
-);
-HTTP_Session :: setContainer('MDB2', $options);
-HTTP_Session :: start();
-HTTP_Session :: setExpire($session['time']['expire']);
-HTTP_Session :: setIdle($session['time']['idle']);
+require_once "./inc/session.php";
-if (true === HTTP_Session :: isNew()) {
- HTTP_Session :: set("logged_in", false);
-
-}
-
##############
# HTTP-Class #
##############
@@ -73,27 +39,7 @@
############
# LANGUAGE #
############
-if (true === HTTP_Session :: get("logged_in", false)) {
- $user->setUserId(HTTP_Session :: get("uid"));
- $language = $user->getUserLanguage();
- if (!in_array($language, $langs)) {
- $language = "en_EN";
- }
-}
-elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
- $language = $_GET['lang'];
- HTTP_Session :: set("lang", $_GET['lang']);
-}
-elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
- $language = HTTP_Session :: get("lang");
-} else {
- $language = "en_EN";
-}
-putenv("LANG=$language");
-setlocale(LC_ALL, $language);
-bindtextdomain("page_main", "./i18n");
-bindtextdomain("navigation", "./i18n");
-textdomain("page_main");
+require_once "./inc/language.php";
################
# User-Manager #
@@ -154,7 +100,7 @@
$design = str_replace("<!-- title -->", $title, $design);
// related sites
-$related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+require_once "./inc/upperBar.php";
$design = str_replace("<!-- related sites -->", $related_sites, $design);
// midHeader title left
@@ -162,16 +108,7 @@
$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design);
// midHeader title right
-if (false === HTTP_Session :: get("logged_in", false)) {
- $midHeader_title_right = sprintf(" <p>%s</p>", _("You are not logged in"));
-} else {
- if (HTTP_Session :: get("username", false) == false) {
- $username = $user->getUsername();
- } else {
- $username = HTTP_Session :: get("username");
- }
- $midHeader_title_right = sprintf(" <p>%s %s</p>", _("Hello"), $username);
-}
+require_once "./inc/userstatus_display.php";
$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
// navigation
@@ -182,8 +119,7 @@
$design = str_replace("<!-- main -->", $main, $design);
# footer
-// footer
-$footer = sprintf(" <span class=\"doNotPrint\">\n For comments or questions about this website, please\n <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n </span>\n\n <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •");
+require_once "./inc/footer.php";
$design = str_replace("<!-- footer -->", $footer, $design);
echo $design;
@@ -223,8 +159,9 @@
" <td colspan=\"2\"><input type=\"submit\" value=\"%s\" name=\"submit\" /><input type=\"reset\" value=\"%s\" /></td>\n" .
" </tr>\n" .
" </table>\n" .
+ " <input type=\"hidden\" name=\"cameFrom\" value=\"%s\" />\n" .
" </form>\n" .
- " </div>\n", $_SERVER['PHP_SELF'], _("Login"), _("Username"), _("Password"), _("Submit!"), _("Reset!"));
+ " </div>\n", $_SERVER['PHP_SELF'], _("Login"), _("Username"), _("Password"), _("Submit!"), _("Reset!"), !empty($_GET['cameFrom']) ? $_GET['cameFrom'] : "");
return $form;
}
Modified: trunk/page_logout.php
===================================================================
--- trunk/page_logout.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/page_logout.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,49 +3,22 @@
/**
* Created on 29.12.2006
- *
- *
+ * Logs a user out
+ * @since 60 - 12.11.2006
* @author C167 <c1...@us...>
+ * @package feed-collector
*/
require_once "inc/config.php";
error_reporting(E_ALL);
############
# DATABASE #
############
-require_once "MDB2.php";
-$dsn = array (
- 'phptype' => $db['type'],
- 'username' => $db['user'],
- 'password' => $db['passwd'],
- 'hostspec' => $db['host'],
- 'database' => $db['database']
-);
-$options = array (
- 'debug' => 2,
- 'result_buffering' => true,
- 'portability' => MDB2_PORTABILITY_ALL
-);
-$db = & MDB2 :: factory($dsn, $options);
-if (PEAR :: isError($db)) {
- /*echo $db->getMessage();
- echo "<br />";
- echo $db->getDebugInfo();*/
-}
-$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+require_once "./inc/database.php";
###########
# SESSION #
###########
-require_once "HTTP/Session.php";
-$options = array (
- 'dsn' => & $db,
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
-);
-HTTP_Session :: setContainer('MDB2', $options);
-HTTP_Session :: start();
-HTTP_Session :: setExpire($session['time']['expire']);
-HTTP_Session :: setIdle($session['time']['idle']);
+require_once "./inc/session.php";
##############
# HTTP-Class #
Modified: trunk/page_main.php
===================================================================
--- trunk/page_main.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/page_main.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -4,7 +4,6 @@
/**
* Created on 30.08.2006
* This file is called if someone wants the main page or doesn't select any page
- * @version 1
* @since 46 - 19.10.2006
* @author c167 <c1...@us...>
* @package feed-collector
@@ -15,40 +14,12 @@
############
# DATABASE #
############
-require_once "MDB2.php";
-$dsn = array (
- 'phptype' => $db['type'],
- 'username' => $db['user'],
- 'password' => $db['passwd'],
- 'hostspec' => $db['host'],
- 'database' => $db['database']
-);
-$options = array (
- 'debug' => 2,
- 'result_buffering' => true,
- 'portability' => MDB2_PORTABILITY_ALL
-);
-$db = & MDB2 :: factory($dsn, $options);
-if (PEAR :: isError($db)) {
- echo $db->getMessage();
- echo "<br />";
- echo $db->getDebugInfo();
-}
-$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+require_once "./inc/database.php";
###########
# SESSION #
###########
-require_once "HTTP/Session.php";
-$options = array (
- 'dsn' => & $db,
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
-);
-HTTP_Session :: setContainer('MDB2', $options);
-HTTP_Session :: start();
-HTTP_Session :: setExpire($session['time']['expire']);
-HTTP_Session :: setIdle($session['time']['idle']);
+require_once "./inc/session.php";
#########
# FEEDS #
@@ -72,27 +43,7 @@
############
# LANGUAGE #
############
-if (true === HTTP_Session :: get("logged_in", false)) {
- $user->setUserId(HTTP_Session :: get("uid"));
- $language = $user->getUserLanguage();
- if (!in_array($language, $langs)) {
- $language = "en_EN";
- }
-}
-elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
- $language = $_GET['lang'];
- HTTP_Session :: set("lang", $_GET['lang']);
-}
-elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
- $language = HTTP_Session :: get("lang");
-} else {
- $language = "en_EN";
-}
-putenv("LANG=$language");
-setlocale(LC_ALL, $language);
-bindtextdomain("page_main", "./i18n");
-bindtextdomain("navigation", "./i18n");
-textdomain("page_main");
+require_once "./inc/language.php";
//
// Now we're going to replace the placeholders in the template with the important content
@@ -108,13 +59,7 @@
# body
// related sites
-if (true === HTTP_Session :: get("logged_in", false)) {
- $related_sites = sprintf(" <span>%s</span>\n" .
- " <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
- " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
-} else {
- $related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
-}
+require_once "./inc/upperBar.php";
$design = str_replace("<!-- related sites -->", $related_sites, $design);
// midHeader title left
@@ -122,16 +67,7 @@
$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design);
// midHeader title right
-if (false === HTTP_Session :: get("logged_in", false)) {
- $midHeader_title_right = sprintf(" <p>%s</p>", _("You are not logged in"));
-} else {
- if (HTTP_Session :: get("username", false) == false) {
- $username = $user->getUsername();
- } else {
- $username = HTTP_Session :: get("username");
- }
- $midHeader_title_right = sprintf(" <p>%s %s</p>", _("Hello"), $username);
-}
+require_once "./inc/userstatus_display.php";
$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
// navigation
@@ -194,8 +130,7 @@
$design = str_replace("<!-- box 4 -->", $box_4, $design);
# footer
-// footer
-$footer = " <span class=\"doNotPrint\">\n For comments or questions about this website, please\n <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n </span>\n\n <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •";
+require_once "./inc/footer.php";
$design = str_replace("<!-- footer -->", $footer, $design);
echo $design;
Modified: trunk/page_personal.php
===================================================================
--- trunk/page_personal.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/page_personal.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,8 +3,7 @@
/**
* Created on 30.08.2006
- * This file is called if someone wants the main page or doesn't select any page
- * @version 1
+ * Display the users personal page
* @since 46 - 19.10.2006
* @author c167 <c1...@us...>
* @package feed-collector
@@ -15,26 +14,7 @@
############
# DATABASE #
############
-require_once "MDB2.php";
-$dsn = array (
- 'phptype' => $db['type'],
- 'username' => $db['user'],
- 'password' => $db['passwd'],
- 'hostspec' => $db['host'],
- 'database' => $db['database']
-);
-$options = array (
- 'debug' => 2,
- 'result_buffering' => true,
- 'portability' => MDB2_PORTABILITY_ALL
-);
-$db = & MDB2 :: factory($dsn, $options);
-if (PEAR :: isError($db)) {
- echo $db->getMessage();
- echo "<br />";
- echo $db->getDebugInfo();
-}
-$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+require_once "./inc/database.php";
########
# HTTP #
@@ -44,21 +24,8 @@
###########
# SESSION #
###########
-require_once "HTTP/Session.php";
-$options = array (
- 'dsn' => & $db,
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
-);
-HTTP_Session :: setContainer('MDB2', $options);
-HTTP_Session :: start();
-HTTP_Session :: setExpire($session['time']['expire']);
-HTTP_Session :: setIdle($session['time']['idle']);
+require_once "./inc/session.php";
-if(false === HTTP_Session :: get("logged_in", false)) {
- HTTP :: redirect("./page_login.php");
-}
-
################
# Feed-Manager #
################
@@ -70,35 +37,15 @@
################
require_once "class/User_manager.php";
$user = new User_manager($db);
+$user->updateUserAction();
$page = "personal";
############
# LANGUAGE #
############
-if (true === HTTP_Session :: get("logged_in", false)) {
- $user->setUserId(HTTP_Session :: get("uid"));
- $language = $user->getUserLanguage();
- if (!in_array($language, $langs)) {
- $language = "en_EN";
- }
-}
-elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
- $language = $_GET['lang'];
- HTTP_Session :: set("lang", $_GET['lang']);
-}
-elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
- $language = HTTP_Session :: get("lang");
-} else {
- $language = "en_EN";
-}
-putenv("LANG=$language");
-setlocale(LC_ALL, $language);
-bindtextdomain("page_main", "./i18n");
-bindtextdomain("navigation", "./i18n");
-textdomain("page_main");
+require_once "./inc/language.php";
-
//
// Now we're going to replace the placeholders in the template with the important content
//
@@ -113,7 +60,7 @@
$design = str_replace("<!-- title -->", $title, $design);
// related sites
-$related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+require_once "./inc/upperBar.php";
$design = str_replace("<!-- related sites -->", $related_sites, $design);
// midHeader title left
@@ -121,16 +68,7 @@
$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design);
// midHeader title right
-if (false === HTTP_Session :: get("logged_in", false)) {
- $midHeader_title_right = sprintf(" <p>%s</p>", _("You are not logged in"));
-} else {
- if(HTTP_Session :: get("username", false) == false) {
- $username = $user->getUsername();
- } else {
- $username = HTTP_Session :: get("username");
- }
- $midHeader_title_right = sprintf(" <p>%s %s</p>", _("Hello"), $username);
-}
+require_once "./inc/userstatus_display.php";
$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
// navigation
@@ -179,8 +117,7 @@
$design = str_replace("<!-- main -->", $main, $design);
# footer
-// footer
-$footer = sprintf(" <span class=\"doNotPrint\">\n %s\n <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n </span>\n\n <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •", _("For comments or questions about this website, please"));
+require_once "./inc/footer.php";
$design = str_replace("<!-- footer -->", $footer, $design);
echo $design;
@@ -193,7 +130,7 @@
$return .= sprintf(" <div class=\"feed_headline\">\n <a href=\"%s\">%s</a>\n </div>\n <ul>\n", $feed_info['site_url'], $feed_info['feed_name']);
$items = $feed->getNewestItems($col, 10);
for ($i = 0; $i < count($items); $i++) {
- $return .= sprintf(" <li><a href=\"%s\">%s</a></li>\n", $items[$i]['url'], $items[$i]['title']);
+ $return .= sprintf(" <li><a href=\"%s\">%s</a></li>\n", $items[$i]['url'], str_replace("&", "&", $items[$i]['title']));
}
$return .= " </ul>\n </div>\n";
}
Modified: trunk/page_register.php
===================================================================
--- trunk/page_register.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/page_register.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,8 +3,7 @@
/**
* Created on 30.08.2006
- *
- * @version 1
+ * Registers new users
* @since 56 - 17.11.2006
* @author c167 <c1...@us...>
* @package feed-collector
@@ -22,48 +21,13 @@
############
# DATABASE #
############
-require_once "MDB2.php";
-$dsn = array (
- 'phptype' => $db['type'],
- 'username' => $db['user'],
- 'password' => $db['passwd'],
- 'hostspec' => $db['host'],
- 'database' => $db['database']
-);
-$options = array (
- 'debug' => 2,
- 'result_buffering' => true,
- 'portability' => MDB2_PORTABILITY_ALL
-);
-$db = & MDB2 :: factory($dsn, $options);
-if (PEAR :: isError($db)) {
- echo $db->getMessage();
- echo "<br />";
- echo $db->getDebugInfo();
-} else {
-}
-$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+require_once "./inc/database.php";
###########
# SESSION #
###########
-require_once "HTTP/Session.php";
-$options = array (
- 'dsn' => & $db,
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
-);
-HTTP_Session :: setContainer('MDB2', /*$session['container']['options']*/
-$options);
-HTTP_Session :: start();
-HTTP_Session :: setExpire($session['time']['expire']);
-HTTP_Session :: setIdle($session['time']['idle']);
+require_once "./inc/session.php";
-if (true === HTTP_Session :: isNew()) {
- HTTP_Session :: set("logged_in", false);
-
-}
-
################
# FEED-Manager #
################
@@ -86,29 +50,8 @@
############
# LANGUAGE #
############
-if (true === HTTP_Session :: get("logged_in", false)) {
- $user->setUserId(HTTP_Session :: get("uid"));
- $language = $user->getUserLanguage();
- if (!in_array($language, $langs)) {
- $language = "en_EN";
- }
-}
-elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
- $language = $_GET['lang'];
- HTTP_Session :: set("lang", $_GET['lang']);
-}
-elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
- $language = HTTP_Session :: get("lang");
-} else {
- $language = "en_EN";
-}
-putenv("LANG=$language");
-setlocale(LC_ALL, $language);
-bindtextdomain("page_main", "./i18n");
-bindtextdomain("navigation", "./i18n");
-textdomain("page_main");
+require_once "./inc/language.php";
-
#####################
# BUILD THE CONTENT #
#####################
@@ -121,7 +64,7 @@
$design = str_replace("<!-- title -->", $title, $design);
// related sites
-$related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+require_once "./inc/upperBar.php";
$design = str_replace("<!-- related sites -->", $related_sites, $design);
// midHeader title left
@@ -153,8 +96,7 @@
$design = str_replace("<!-- main -->", $main, $design);
# footer
-// footer
-$footer = sprintf(" <span class=\"doNotPrint\">\n For comments or questions about this website, please\n <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n </span>\n\n <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •");
+require_once "./inc/footer.php";
$design = str_replace("<!-- footer -->", $footer, $design);
echo $design;
Modified: trunk/page_show_all_feeds.php
===================================================================
--- trunk/page_show_all_feeds.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/page_show_all_feeds.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,8 +3,7 @@
/**
* Created on 30.08.2006
- * This file is called if someone wants the main page or doesn't select any page
- * @version 1
+ * Shows all the feeds
* @since 46 - 19.10.2006
* @author c167 <c1...@us...>
* @package feed-collector
@@ -15,40 +14,12 @@
############
# DATABASE #
############
-require_once "MDB2.php";
-$dsn = array (
- 'phptype' => $db['type'],
- 'username' => $db['user'],
- 'password' => $db['passwd'],
- 'hostspec' => $db['host'],
- 'database' => $db['database']
-);
-$options = array (
- 'debug' => 2,
- 'result_buffering' => true,
- 'portability' => MDB2_PORTABILITY_ALL
-);
-$db = & MDB2 :: factory($dsn, $options);
-if (PEAR :: isError($db)) {
- echo $db->getMessage();
- echo "<br />";
- echo $db->getDebugInfo();
-}
-$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+require_once "./inc/database.php";
###########
# SESSION #
###########
-require_once "HTTP/Session.php";
-$options = array (
- 'dsn' => & $db,
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
-);
-HTTP_Session :: setContainer('MDB2', $options);
-HTTP_Session :: start();
-HTTP_Session :: setExpire($session['time']['expire']);
-HTTP_Session :: setIdle($session['time']['idle']);
+require_once "./inc/session.php";
#########
# FEEDS #
@@ -87,29 +58,8 @@
############
# LANGUAGE #
############
-if (true === HTTP_Session :: get("logged_in", false)) {
- $user->setUserId(HTTP_Session :: get("uid"));
- $language = $user->getUserLanguage();
- if (!in_array($language, $langs)) {
- $language = "en_EN";
- }
-}
-elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
- $language = $_GET['lang'];
- HTTP_Session :: set("lang", $_GET['lang']);
-}
-elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
- $language = HTTP_Session :: get("lang");
-} else {
- $language = "en_EN";
-}
-putenv("LANG=$language");
-setlocale(LC_ALL, $language);
-bindtextdomain("page_main", "./i18n");
-bindtextdomain("navigation", "./i18n");
-textdomain("page_main");
+require_once "./inc/language.php";
-
//
// Now we're going to replace the placeholders in the template with the important content
//
@@ -124,7 +74,7 @@
# body
// related sites
-$related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+require_once "./inc/upperBar.php";
$design = str_replace("<!-- related sites -->", $related_sites, $design);
// midHeader title left
@@ -132,16 +82,7 @@
$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design);
// midHeader title right
-if (false === HTTP_Session :: get("logged_in", false)) {
- $midHeader_title_right = sprintf(" <p>%s</p>", _("You are not logged in"));
-} else {
- if(HTTP_Session :: get("username", false) == false) {
- $username = $user->getUsername();
- } else {
- $username = HTTP_Session :: get("username");
- }
- $midHeader_title_right = sprintf(" <p>%s %s</p>", _("Hello"), $username);
-}
+require_once "./inc/userstatus_display.php";
$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
// navigation
@@ -162,8 +103,7 @@
//$design = str_replace("<!-- page-navigation -->", $page_navigation, $design);
# footer
-// footer
-$footer = " <span class=\"doNotPrint\">\n For comments or questions about this website, please\n <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n </span>\n\n <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •";
+require_once "./inc/footer.php";
$design = str_replace("<!-- footer -->", $footer, $design);
echo $design;
Modified: trunk/page_show_feed.php
===================================================================
--- trunk/page_show_feed.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/page_show_feed.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,8 +3,7 @@
/**
* Created on 30.08.2006
- * This file is called if someone wants the main page or doesn't select any page
- * @version 1
+ * Shows one specific feed
* @since 46 - 19.10.2006
* @author c167 <c1...@us...>
* @package feed-collector
@@ -15,40 +14,12 @@
############
# DATABASE #
############
-require_once "MDB2.php";
-$dsn = array (
- 'phptype' => $db['type'],
- 'username' => $db['user'],
- 'password' => $db['passwd'],
- 'hostspec' => $db['host'],
- 'database' => $db['database']
-);
-$options = array (
- 'debug' => 2,
- 'result_buffering' => true,
- 'portability' => MDB2_PORTABILITY_ALL
-);
-$db = & MDB2 :: factory($dsn, $options);
-if (PEAR :: isError($db)) {
- echo $db->getMessage();
- echo "<br />";
- echo $db->getDebugInfo();
-}
-$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+require_once "./inc/database.php";
###########
# SESSION #
###########
-require_once "HTTP/Session.php";
-$options = array (
- 'dsn' => & $db,
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
-);
-HTTP_Session :: setContainer('MDB2', $options);
-HTTP_Session :: start();
-HTTP_Session :: setExpire($session['time']['expire']);
-HTTP_Session :: setIdle($session['time']['idle']);
+require_once "./inc/session.php";
################
# Feed-Manager #
@@ -78,29 +49,8 @@
############
# LANGUAGE #
############
-if (true === HTTP_Session :: get("logged_in", false)) {
- $user->setUserId(HTTP_Session :: get("uid"));
- $language = $user->getUserLanguage();
- if (!in_array($language, $langs)) {
- $language = "en_EN";
- }
-}
-elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
- $language = $_GET['lang'];
- HTTP_Session :: set("lang", $_GET['lang']);
-}
-elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
- $language = HTTP_Session :: get("lang");
-} else {
- $language = "en_EN";
-}
-putenv("LANG=$language");
-setlocale(LC_ALL, $language);
-bindtextdomain("page_main", "./i18n");
-bindtextdomain("navigation", "./i18n");
-textdomain("page_main");
+require_once "./inc/language.php";
-
//
// Now we're going to replace the placeholders in the template with the important content
//
@@ -119,7 +69,7 @@
$design = str_replace("<!-- title -->", $title, $design);
// related sites
-$related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+require_once "./inc/upperBar.php";
$design = str_replace("<!-- related sites -->", $related_sites, $design);
// midHeader title left
@@ -127,16 +77,7 @@
$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design);
// midHeader title right
-if (false === HTTP_Session :: get("logged_in", false)) {
- $midHeader_title_right = sprintf(" <p>%s</p>", _("You are not logged in"));
-} else {
- if(HTTP_Session :: get("username", false) == false) {
- $username = $user->getUsername();
- } else {
- $username = HTTP_Session :: get("username");
- }
- $midHeader_title_right = sprintf(" <p>%s %s</p>", _("Hello"), $username);
-}
+require_once "./inc/userstatus_display.php";
$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
// navigation
@@ -174,8 +115,7 @@
$design = str_replace("<!-- rightSideBar -->", $rightSideBar, $design);
# footer
-// footer
-$footer = sprintf(" <span class=\"doNotPrint\">\n %s\n <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n </span>\n\n <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •", _("For comments or questions about this website, please"));
+require_once "./inc/footer.php";
$design = str_replace("<!-- footer -->", $footer, $design);
echo $design;
Modified: trunk/page_show_feed_tag.php
===================================================================
--- trunk/page_show_feed_tag.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/page_show_feed_tag.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -3,7 +3,7 @@
/**
* Created on 30.08.2006
- *
+ * Shows the feeds that have a specific tag
* @author c167 <c1...@us...>
* @package feed-collector
*/
@@ -13,42 +13,12 @@
############
# DATABASE #
############
-require_once "MDB2.php";
-$dsn = array (
- 'phptype' => $db['type'],
- 'username' => $db['user'],
- 'password' => $db['passwd'],
- 'hostspec' => $db['host'],
- 'database' => $db['database']
-);
-$options = array (
- 'debug' => 2,
- 'result_buffering' => true,
- 'portability' => MDB2_PORTABILITY_ALL
-);
-$db = & MDB2 :: factory($dsn, $options);
-if (PEAR :: isError($db)) {
- echo $db->getMessage();
- echo "<br />";if (isset ($_POST['tag'])) {
- $tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']);
-}
- echo $db->getDebugInfo();
-}
-$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+require_once "./inc/database.php";
###########
# SESSION #
###########
-require_once "HTTP/Session.php";
-$options = array (
- 'dsn' => & $db,
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
-);
-HTTP_Session :: setContainer('MDB2', $options);
-HTTP_Session :: start();
-HTTP_Session :: setExpire($session['time']['expire']);
-HTTP_Session :: setIdle($session['time']['idle']);
+require_once "./inc/session.php";
################
# Feed-Manager #
@@ -78,27 +48,7 @@
############
# LANGUAGE #
############
-if (true === HTTP_Session :: get("logged_in", false)) {
- $user->setUserId(HTTP_Session :: get("uid"));
- $language = $user->getUserLanguage();
- if (!in_array($language, $langs)) {
- $language = "en_EN";
- }
-}
-elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
- $language = $_GET['lang'];
- HTTP_Session :: set("lang", $_GET['lang']);
-}
-elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
- $language = HTTP_Session :: get("lang");
-} else {
- $language = "en_EN";
-}
-putenv("LANG=$language");
-setlocale(LC_ALL, $language);
-bindtextdomain("page_main", "./i18n");
-bindtextdomain("navigation", "./i18n");
-textdomain("page_main");
+require_once "./inc/language.php";
// Now we're going to replace the placeholders in the template with the important content
//
@@ -119,7 +69,7 @@
$design = str_replace("<!-- title -->", $title, $design);
// related sites
-$related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+require_once "./inc/upperBar.php";
$design = str_replace("<!-- related sites -->", $related_sites, $design);
// midHeader title left
@@ -127,16 +77,7 @@
$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design);
// midHeader title right
-if (false === HTTP_Session :: get("logged_in", false)) {
- $midHeader_title_right = sprintf(" <p>%s</p>", _("You are not logged in"));
-} else {
- if(HTTP_Session :: get("username", false) == false) {
- $username = $user->getUsername();
- } else {
- $username = HTTP_Session :: get("username");
- }
- $midHeader_title_right = sprintf(" <p>%s %s</p>", _("Hello"), $username);
-}
+require_once "./inc/userstatus_display.php";
$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
// navigation
@@ -152,8 +93,7 @@
$design = str_replace("<!-- rightSideBar -->", $form, $design);
# footer
-// footer
-$footer = sprintf(" <span class=\"doNotPrint\">\n %s\n <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n </span>\n\n <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •", _("For comments or questions about this website, please"));
+require_once "./inc/footer.php";
$design = str_replace("<!-- footer -->", $footer, $design);
echo $design;
Modified: trunk/statistics.php
===================================================================
--- trunk/statistics.php 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/statistics.php 2007-01-12 23:46:14 UTC (rev 100)
@@ -5,13 +5,13 @@
* This file is the main-control for the statistics.
* It is optional, so there is no need to make it work ;)
*/
+echo date("d.m.y H:m:s", 1168190812);
require_once "MDB2.php";
require_once "Log.php"; // Logger
// some other stuff
require_once "inc/config.php";
-require_once "inc/definitions.php";
$conf = array (
'error_prepend' => "<tt>",
'error_append' => "</tt>",
@@ -87,4 +87,5 @@
}
echo $return;
echo "<br />";
+
?>
\ No newline at end of file
Modified: trunk/styles/default/header-screen.css
===================================================================
--- trunk/styles/default/header-screen.css 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/styles/default/header-screen.css 2007-01-12 23:46:14 UTC (rev 100)
@@ -14,6 +14,7 @@
padding: 0.5ex 10px;
}
+
.superHeader span {
color: rgb(195, 196, 210);
background-color: transparent;
Modified: trunk/styles/default/page_personal-screen.css
===================================================================
--- trunk/styles/default/page_personal-screen.css 2007-01-10 22:12:47 UTC (rev 99)
+++ trunk/styles/default/page_personal-screen.css 2007-01-12 23:46:14 UTC (rev 100)
@@ -18,7 +18,7 @@
border-right: 1px solid rgb(204, 204, 204);
}
-.column2 { /* Renders the column dividers */
+.column2 { /* Renders the column dividers *//*
border-left: 1px solid rgb(204, 204, 204);
border-right: 1px solid rgb(204, 204, 204);
}
Modified: trunk/update_feeds.php
===================================================================
--- trunk/update_feeds.php 2007-01...
[truncated message content] |
|
From: <c1...@us...> - 2007-01-14 22:31:53
|
Revision: 101
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=101&view=rev
Author: c167
Date: 2007-01-14 14:31:46 -0800 (Sun, 14 Jan 2007)
Log Message:
-----------
some changes, new translations
Modified Paths:
--------------
trunk/i18n/de_DE/LC_MESSAGES/navigation.mo
trunk/i18n/de_DE/LC_MESSAGES/navigation.po
trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.mo
trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po
trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.mo
trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.po
trunk/i18n/de_DE/LC_MESSAGES/page_login.mo
trunk/i18n/de_DE/LC_MESSAGES/page_login.po
trunk/i18n/de_DE/LC_MESSAGES/page_main.mo
trunk/i18n/de_DE/LC_MESSAGES/page_main.po
trunk/i18n/de_DE/LC_MESSAGES/page_personal.mo
trunk/i18n/de_DE/LC_MESSAGES/page_personal.po
trunk/i18n/de_DE/LC_MESSAGES/page_register.mo
trunk/i18n/de_DE/LC_MESSAGES/page_register.po
trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.mo
trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.po
trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.mo
trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.po
trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.mo
trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.po
trunk/i18n/de_DE/LC_MESSAGES/update_feeds.po
trunk/inc/database.php
trunk/inc/footer.php
trunk/inc/language.php
trunk/inc/navigation.php
trunk/inc/session.php
trunk/inc/upperBar.php
trunk/inc/userstatus_display.php
trunk/page_register.php
trunk/update_feeds.php
Added Paths:
-----------
trunk/i18n/de_DE/LC_MESSAGES/update_feeds.mo
trunk/i18n/de_DE/LC_MESSAGES/upperBar.mo
trunk/i18n/de_DE/LC_MESSAGES/upperBar.po
trunk/i18n/de_DE/LC_MESSAGES/userstatus_display.mo
trunk/i18n/de_DE/LC_MESSAGES/userstatus_display.po
Modified: trunk/i18n/de_DE/LC_MESSAGES/navigation.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/navigation.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/navigation.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/navigation.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: navigation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-08 22:46+0100\n"
-"PO-Revision-Date: 2007-01-08 22:50+0100\n"
+"POT-Creation-Date: 2007-01-13 17:10+0100\n"
+"PO-Revision-Date: 2007-01-14 22:46+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: page_add_new_feed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 14:57+0100\n"
-"PO-Revision-Date: 2007-01-06 15:05+0100\n"
+"POT-Creation-Date: 2007-01-13 17:04+0100\n"
+"PO-Revision-Date: 2007-01-14 22:51+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,36 +16,27 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: page_add_new_feed.php:120
-msgid "Related Sites:"
+#: page_add_new_feed.php:76
+msgid "Feed-Collector"
msgstr ""
-#: page_add_new_feed.php:124
-msgid "Feed-Collector"
-msgstr "Feed-Collector"
-
-#: page_add_new_feed.php:124
+#: page_add_new_feed.php:76
msgid "{ stay up to date with all your news feeds! }"
msgstr "{ bleiben Sie mit den News auf dem neuesten Stand! }"
-#: page_add_new_feed.php:129
-msgid "You are not logged in"
-msgstr "Sie sind nicht eingelogged"
+#: page_add_new_feed.php:103 page_add_new_feed.php:118
+msgid "Error, please check everything..."
+msgstr "Ein Fehler ist aufgetreten. Bitte Überprüfen Sie Ihre Eingaben..."
-#: page_add_new_feed.php:136
-msgid "Hello"
-msgstr "Hallo"
-
-#: page_add_new_feed.php:158
+#: page_add_new_feed.php:125
msgid "Marked fields have to be filled!"
-msgstr "Markierte Felder muessen gefüllt werden!"
+msgstr "Markierte Felde müssen gefüllt werden"
-#: page_add_new_feed.php:174
+#: page_add_new_feed.php:139
msgid "Add a feed"
-msgstr "Füge einen Feed hinzu"
+msgstr "Einen Feed hinzufügen"
-#: page_add_new_feed.php:174
-#, fuzzy
+#: page_add_new_feed.php:139
msgid ""
"<b>How do I do that?</b><br />\n"
" The Scripts need some information about the site that creates "
@@ -54,99 +45,99 @@
"<b>Wie mache ich das?<br /><br />\n"
" Das Script ben&oouml;tigt einige Informationen über die Seite, von der das"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "ADD IT!"
msgstr ""
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Site Name"
-msgstr ""
+msgstr "Seitenname"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Site URL"
-msgstr ""
+msgstr "Seiten-URL"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Site Language"
-msgstr ""
+msgstr "Seitensprache"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "English"
-msgstr ""
+msgstr "Englisch"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "German"
-msgstr ""
+msgstr "Deutsch"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Site Image"
-msgstr ""
+msgstr "Seiten-Icon"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Feed Name"
-msgstr ""
+msgstr "Feed-name"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Feed Description"
-msgstr ""
+msgstr "Feed-beschreibung"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Feed URL"
-msgstr ""
+msgstr "Feed-URL"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Feed Type"
-msgstr ""
+msgstr "Feed-Typ"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "ATOM 1.0"
-msgstr ""
+msgstr "ATOM 1.0"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "RDF 0.9"
-msgstr ""
+msgstr "RDF 0.9"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Feed Database Name"
-msgstr ""
+msgstr "Feed-DB-Name"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Feed Language"
-msgstr ""
+msgstr "Feed-Sprache"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Feed Image"
-msgstr ""
+msgstr "Fed-Icon"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Active?"
-msgstr ""
+msgstr "Aktiv?"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Yes!"
-msgstr ""
+msgstr "Jawollja!"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "No!"
-msgstr ""
+msgstr "Nie und nimmer!"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Submit!"
-msgstr ""
+msgstr "Absenden!"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Reset"
-msgstr ""
+msgstr "Zurücksetzen"
-#: page_add_new_feed.php:259
+#: page_add_new_feed.php:224
msgid "Marked fields are required"
-msgstr ""
+msgstr "Markierte Felder muessen gefüllt werden!"
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: page_add_tag\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 14:57+0100\n"
-"PO-Revision-Date: 2007-01-06 15:07+0100\n"
+"POT-Creation-Date: 2007-01-13 17:04+0100\n"
+"PO-Revision-Date: 2007-01-14 22:52+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,39 +16,31 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: page_add_tag.php:111
+#: page_add_tag.php:63
+msgid "There are no tags yet!"
+msgstr "Es sind noch keine Tags hinzugefügt worden"
+
+#: page_add_tag.php:66
msgid "Tags"
msgstr "Tags"
-#: page_add_tag.php:143
-msgid "Related Sites:"
+#: page_add_tag.php:99
+msgid "Feed-Collector"
msgstr ""
-#: page_add_tag.php:147
-msgid "Feed-Collector"
-msgstr "Feed-Collector"
-
-#: page_add_tag.php:147
+#: page_add_tag.php:99
msgid "{ stay up to date with all your news feeds! }"
msgstr "{ bleiben Sie mit den News auf dem neuesten Stand! }"
-#: page_add_tag.php:152
-msgid "You are not logged in"
-msgstr "Sie sind nicht eingelogged"
-
-#: page_add_tag.php:159
-msgid "Hello"
-msgstr "Hallo"
-
-#: page_add_tag.php:193
+#: page_add_tag.php:135
msgid "Add Tag"
-msgstr "Füge Tag hinzu"
+msgstr "Tag hinzufügen"
-#: page_add_tag.php:193
+#: page_add_tag.php:135
msgid "tag name"
-msgstr "Tag Name"
+msgstr "Tag-Name"
-#: page_add_tag.php:193
+#: page_add_tag.php:135
msgid "Submit!"
-msgstr "Abschicken!"
+msgstr "Absenden!"
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_login.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_login.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_login.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_login.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: page_login\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 14:57+0100\n"
-"PO-Revision-Date: 2007-01-06 15:12+0100\n"
+"POT-Creation-Date: 2007-01-13 17:05+0100\n"
+"PO-Revision-Date: 2007-01-14 22:53+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,66 +16,50 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: page_login.php:151
-msgid "Related Sites:"
+#: page_login.php:107
+msgid "Feed-Collector"
msgstr ""
-#: page_login.php:155
-msgid "Feed-Collector"
-msgstr "Feed-Collector"
-
-#: page_login.php:155
+#: page_login.php:107
msgid "{ stay up to date with all your news feeds! }"
msgstr "{ bleiben Sie mit den News auf dem neuesten Stand! }"
-#: page_login.php:160
-msgid "You are not logged in"
-msgstr "Sie sind nicht eingelogged"
-
-#: page_login.php:167
-msgid "Hello"
-msgstr "Hallo"
-
-#: page_login.php:191
+#: page_login.php:131
msgid ""
"Unknown username. If you don't have a username then please <a href=\"./"
"page_register.php\">register</a> a new one"
msgstr "Unbekannter Benutzername. Wenn Sie noch keinen Account haben, <a href=\"./page_register.php\">registrieren</a> Sie sich bitte einen neuen"
-#: page_login.php:196
+#: page_login.php:134
msgid ""
"This useraccount is not active. You should have received a mail with an "
"access-key. If not, please look at your spam-folder or send a mail to the "
"site-admin."
msgstr "Dieser Benutzeraccount ist nickt aktiv. Sie sollten eine Mail mit einem Zugangsschlüssel erhalten haben. Wenn nicht, schauen Sie bitte in ihren Spam-Ordner oder senden Sie eine Mail an den Administrator dieser Seite."
-#: page_login.php:201 page_login.php:206
+#: page_login.php:137 page_login.php:140
msgid ""
"Please enter your username and your password to login. Cookies have to be "
"enabled from this point."
msgstr "Bitte geben Sie ihren Benutzernamen und Ihr Passwort ein, um sich anzumelden. Cookies müssen ab hier aktiviert sein."
-#: page_login.php:227
+#: page_login.php:164
msgid "Login"
msgstr "Anmelden"
-#: page_login.php:227
+#: page_login.php:164
msgid "Username"
msgstr "Benutzername"
-#: page_login.php:227
+#: page_login.php:164
msgid "Password"
msgstr "Passwort"
-#: page_login.php:227
+#: page_login.php:164
msgid "Submit!"
msgstr "Absenden!"
-#: page_login.php:227
+#: page_login.php:164
msgid "Reset!"
msgstr "Zurücksetzen!"
-#: page_login.php:227
-msgid "All fields are required"
-msgstr "Alle Felder müssen ausgefüllt werden"
-
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_main.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_main.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_main.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_main.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: page_main\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 15:41+0100\n"
-"PO-Revision-Date: 2007-01-06 15:54+0100\n"
+"POT-Creation-Date: 2007-01-13 17:05+0100\n"
+"PO-Revision-Date: 2007-01-14 22:57+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,31 +16,19 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../../page_main.php:107
-msgid "Related Sites:"
+#: page_main.php:66
+msgid "Feed-Collector"
msgstr ""
-#: ../../../page_main.php:111
-msgid "Feed-Collector"
-msgstr "Feed-Collector"
-
-#: ../../../page_main.php:111
+#: page_main.php:66
msgid "{ stay up to date with all your news feeds! }"
msgstr "{ bleiben Sie mit den News auf dem neuesten Stand! }"
-#: ../../../page_main.php:116
-msgid "You are not logged in"
-msgstr "Sie sind nicht eingelogged"
-
-#: ../../../page_main.php:123
-msgid "Hello"
-msgstr "Hallo"
-
-#: ../../../page_main.php:133
+#: page_main.php:79
msgid "Welcome!"
msgstr "Willkommen!"
-#: ../../../page_main.php:133
+#: page_main.php:79
msgid ""
"<p>This is the home of Feed-Collector, an database-driven news-reader.\n"
" It is written to automaticaly collect news from other "
@@ -73,64 +61,63 @@
" so kann man immer hierherkommen und in der Datenbank auch nach älteren News suchen</p>\n"
" <p>Benutzer können sich registrieren um Zugriff auf ihre persönliche Seite zu erhalten, \n"
" die ihre persönliche Zusammenstellung der interessanten News bietet. \n"
-" Sobald man sich registriert hat, kann man damit beginnen die Seite zu verändern \n"
-" modify his page by adding and removing news feeds. Dazu muss man nur die \n"
+" Sobald man sich registriert hat, kann man damit beginnen die Seite zu verändern. \n"
+" Dazu muss man nur die \n"
" <a href=\"./page_select_feeds.php\">Feed-Übersicht</a> anschauen und Feeds aus-/ oder abwählen \n</p>"
-#: ../../../page_main.php:141
+#: page_main.php:87
msgid "Latest News"
msgstr "News"
-#: ../../../page_main.php:148
+#: page_main.php:94
msgid "More News »"
-msgstr ""
+msgstr "Weitere Neuigkeiten »"
-#: ../../../page_main.php:153
+#: page_main.php:99
msgid "Statistic"
msgstr "Statistik"
-#: ../../../page_main.php:153
+#: page_main.php:99
msgid "Fedds in the Database: "
msgstr "Feeds in der DB: "
-#: ../../../page_main.php:153
+#: page_main.php:99
msgid "Items over all:"
-msgstr "Items insg.:"
+msgstr "Items Insgesamt:"
-#: ../../../page_main.php:153
+#: page_main.php:99
msgid "Average items per feed:"
-msgstr "Items/Feed:"
+msgstr "Items pro Feed"
-#: ../../../page_main.php:153
+#: page_main.php:99
msgid "[ATOM 1.0] feeds:"
-msgstr "[ATOM 1.0] Feeds:"
+msgstr "[ATOM 1.0]-Feeds:"
-#: ../../../page_main.php:153
+#: page_main.php:99
msgid "[RDF 0.9] feeds:"
-msgstr "[RDF 0.9] Feeds:"
+msgstr "[RDF 0.9]-Feeds:"
-#: ../../../page_main.php:153
+#: page_main.php:99
msgid "[RSS 2.0] feeds:"
-msgstr "[RSS 2.0] Feeds:"
+msgstr "[RSS 2.0]-Feeds:"
-#: ../../../page_main.php:153
+#: page_main.php:99
msgid "[RSS 1.0] feeds"
-msgstr "[RSS 1.0] Feeds"
+msgstr "[RSS 1.0]-Feeds"
-#: ../../../page_main.php:158
+#: page_main.php:104
msgid "biggest feeds"
-msgstr "Grösste Feeds"
+msgstr "Gröste Feeds"
-#: ../../../page_main.php:161 ../../../page_main.php:171
-#: ../../../page_main.php:181
+#: page_main.php:107 page_main.php:117 page_main.php:127
msgid " Items"
msgstr " Items"
-#: ../../../page_main.php:168
+#: page_main.php:114
msgid "random feeds"
-msgstr "Zuf. Feeds"
+msgstr "Zufällige Feeds"
-#: ../../../page_main.php:178
+#: page_main.php:124
msgid "Newest feeds"
-msgstr "Neuste Feeds"
+msgstr "Neueste Feeds"
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_personal.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_personal.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_personal.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_personal.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: page_personal\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 14:58+0100\n"
-"PO-Revision-Date: 2007-01-06 15:17+0100\n"
+"POT-Creation-Date: 2007-01-13 17:05+0100\n"
+"PO-Revision-Date: 2007-01-14 22:57+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,27 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: page_personal.php:111
-msgid "Related Sites:"
+#: page_personal.php:67
+msgid "Feed-Collector"
msgstr ""
-#: page_personal.php:115
-msgid "Feed-Collector"
-msgstr "Feed-Collector"
-
-#: page_personal.php:115
+#: page_personal.php:67
msgid "{ stay up to date with all your news feeds! }"
msgstr "{ bleiben Sie mit den News auf dem neuesten Stand! }"
-#: page_personal.php:120
-msgid "You are not logged in"
-msgstr "Sie sind nicht angemeldet"
-
-#: page_personal.php:127
-msgid "Hello"
-msgstr "Hallo"
-
-#: page_personal.php:178
-msgid "For comments or questions about this website, please"
-msgstr ""
-
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_register.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_register.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_register.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_register.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: page_register\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 14:58+0100\n"
-"PO-Revision-Date: 2007-01-06 15:21+0100\n"
+"POT-Creation-Date: 2007-01-13 17:05+0100\n"
+"PO-Revision-Date: 2007-01-14 23:00+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,27 +16,23 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: page_register.php:118
-msgid "Related Sites:"
+#: page_register.php:71
+msgid "Feed-Collector"
msgstr ""
-#: page_register.php:122
-msgid "Feed-Collector"
-msgstr "Feed-Collector"
-
-#: page_register.php:122
+#: page_register.php:71
msgid "{ stay up to date with all your news feeds! }"
msgstr "{ bleiben Sie mit den News auf dem neuesten Stand! }"
-#: page_register.php:141
+#: page_register.php:90
msgid "An error occured"
msgstr "Ein Fehler ist aufgetreten"
-#: page_register.php:157
+#: page_register.php:105
msgid "Registration"
msgstr "Registrierung"
-#: page_register.php:157
+#: page_register.php:105
msgid ""
"<b>Why register?</b><br />\n"
" If you register, you'll have a personal page with lots of free "
@@ -46,43 +42,47 @@
" Wenn Sie sich registrieren werden Sie Zugriff auf eine persönliche Seite bekommen, "
"die viel Platz bietet, um Ihre persönlichen Feeds darauf zu plazieren (Nur durch die Gr&oouml;sse ihres Fensters Beschränkt)"
-#: page_register.php:199
+#: page_register.php:146
msgid "Registration information"
msgstr "Registrierungsinformationen"
-#: page_register.php:199
+#: page_register.php:146
msgid "Username"
msgstr "Benutzername"
-#: page_register.php:199
+#: page_register.php:146
msgid "E-MAIL-address"
msgstr "E-MAIL-Adresse"
-#: page_register.php:199
+#: page_register.php:146
msgid "Password"
msgstr "Passwort"
-#: page_register.php:199
+#: page_register.php:146
msgid "Repeat password"
msgstr "Passwort wiederholen"
-#: page_register.php:199
+#: page_register.php:146
msgid "Language"
msgstr "Sprache"
-#: page_register.php:199
+#: page_register.php:146
msgid "English"
msgstr "Englisch"
-#: page_register.php:199
+#: page_register.php:146
msgid "German"
msgstr "Deutsch"
-#: page_register.php:199
+#: page_register.php:146
msgid "Submit!"
msgstr "Absenden!"
-#: page_register.php:199
+#: page_register.php:146
msgid "Reset!"
msgstr "Zurücksetzen!"
+#: page_register.php:146
+msgid "All fields are required"
+msgstr "Alle Felder müssen ausgefüllt werden"
+
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: page_show_all_feeds\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 14:58+0100\n"
-"PO-Revision-Date: 2007-01-06 15:21+0100\n"
+"POT-Creation-Date: 2007-01-13 17:06+0100\n"
+"PO-Revision-Date: 2007-01-14 23:01+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,51 +16,39 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: page_show_all_feeds.php:122
-msgid "Related Sites:"
+#: page_show_all_feeds.php:81
+msgid "Feed-Collector"
msgstr ""
-#: page_show_all_feeds.php:126
-msgid "Feed-Collector"
-msgstr "Feed-Collector"
-
-#: page_show_all_feeds.php:126
+#: page_show_all_feeds.php:81
msgid "{ stay up to date with all your news feeds! }"
msgstr "{ bleiben Sie mit den News auf dem neuesten Stand! }"
-#: page_show_all_feeds.php:131
-msgid "You are not logged in"
-msgstr "Sie sind nciht angemeldet"
-
-#: page_show_all_feeds.php:138
-msgid "Hello"
-msgstr "Hallo"
-
-#: page_show_all_feeds.php:182 page_show_all_feeds.php:221
+#: page_show_all_feeds.php:127 page_show_all_feeds.php:166
msgid "Submit"
msgstr "Absenden"
-#: page_show_all_feeds.php:182 page_show_all_feeds.php:236
+#: page_show_all_feeds.php:127 page_show_all_feeds.php:181
msgid "Feed List"
msgstr "Feed-Liste"
-#: page_show_all_feeds.php:182 page_show_all_feeds.php:236
+#: page_show_all_feeds.php:127 page_show_all_feeds.php:181
msgid "Site"
msgstr "Seite"
-#: page_show_all_feeds.php:182 page_show_all_feeds.php:236
+#: page_show_all_feeds.php:127 page_show_all_feeds.php:181
msgid "Tags"
msgstr "Tags"
-#: page_show_all_feeds.php:182 page_show_all_feeds.php:236
+#: page_show_all_feeds.php:127 page_show_all_feeds.php:181
msgid "Languages"
msgstr "Sprachen"
-#: page_show_all_feeds.php:236
+#: page_show_all_feeds.php:181
msgid "Feed"
msgstr "Feed"
-#: page_show_all_feeds.php:269
+#: page_show_all_feeds.php:214
msgid "Page: "
msgstr "Seite: "
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: page_show_feed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 14:58+0100\n"
-"PO-Revision-Date: 2007-01-06 15:23+0100\n"
+"POT-Creation-Date: 2007-01-13 17:06+0100\n"
+"PO-Revision-Date: 2007-01-14 23:02+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,43 +16,27 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: page_show_feed.php:117
-msgid "Related Sites:"
+#: page_show_feed.php:76
+msgid "Feed-Collector"
msgstr ""
-#: page_show_feed.php:121
-msgid "Feed-Collector"
-msgstr "Feed-Collector"
-
-#: page_show_feed.php:121
+#: page_show_feed.php:76
msgid "{ stay up to date with all your news feeds! }"
msgstr "{ bleiben Sie mit den News auf dem neuesten Stand! }"
-#: page_show_feed.php:126
-msgid "You are not logged in"
-msgstr "Sie sind nicht angemeldet"
-
-#: page_show_feed.php:133
-msgid "Hello"
-msgstr "Hallo"
-
-#: page_show_feed.php:155
+#: page_show_feed.php:101
msgid "Tags"
msgstr "Tags"
-#: page_show_feed.php:158
+#: page_show_feed.php:104
msgid "No tag submitted yet, you can add one "
-msgstr "Bis jetzt wurden keine Tags hinzugefügt, Sie k&oouml;nnen einen "
+msgstr "Dieser Feed hat noch keinen Tag, Sie können einen "
-#: page_show_feed.php:158
+#: page_show_feed.php:104
msgid "here!"
msgstr "hier hinzufügen!"
-#: page_show_feed.php:169
-msgid "For comments or questions about this website, please"
-msgstr ""
-
-#: page_show_feed.php:206
+#: page_show_feed.php:155
msgid "Page: "
msgstr "Seite: "
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: page_show_feed_tag\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 14:58+0100\n"
-"PO-Revision-Date: 2007-01-06 15:24+0100\n"
+"POT-Creation-Date: 2007-01-13 17:06+0100\n"
+"PO-Revision-Date: 2007-01-14 23:03+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,53 +16,45 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: page_show_feed_tag.php:103
+#: page_show_feed_tag.php:57
msgid ""
"You did not select a tag, please select one on the input-field on the right "
"side of the site... -->"
msgstr "Sie haben keinen Tag ausgewählt, bitte wählen Sie einen mit dem Eingabefeld am rechten Rand der Seite aus... -->"
-#: page_show_feed_tag.php:117
-msgid "Related Sites:"
+#: page_show_feed_tag.php:76
+msgid "Feed-Collector"
msgstr ""
-#: page_show_feed_tag.php:121
-msgid "Feed-Collector"
-msgstr "Feed-Collector"
-
-#: page_show_feed_tag.php:121
+#: page_show_feed_tag.php:76
msgid "{ stay up to date with all your news feeds! }"
msgstr "{ bleiben Sie mit den News auf dem neuesten Stand! }"
-#: page_show_feed_tag.php:126
-msgid "You are not logged in"
-msgstr "Sie sind nicht angemeldet"
+#: page_show_feed_tag.php:113
+msgid "Feed List"
+msgstr "Feed-Liste"
-#: page_show_feed_tag.php:133
-msgid "Hello"
-msgstr "Hallo"
+#: page_show_feed_tag.php:113
+msgid "Site"
+msgstr "Seite"
-#: page_show_feed_tag.php:151
-msgid "For comments or questions about this website, please"
-msgstr ""
-
-#: page_show_feed_tag.php:169
+#: page_show_feed_tag.php:113
msgid "Feed"
msgstr "Feed"
-#: page_show_feed_tag.php:169
-msgid "Language"
-msgstr "Sprache"
-
-#: page_show_feed_tag.php:198
+#: page_show_feed_tag.php:113 page_show_feed_tag.php:148
msgid "Tags"
msgstr "Tags"
-#: page_show_feed_tag.php:211
+#: page_show_feed_tag.php:113
+msgid "Languages"
+msgstr "Sprachen"
+
+#: page_show_feed_tag.php:161
msgid "Select a Tag"
-msgstr "Tag auswählen"
+msgstr "Wählen Sie einen Tag aus"
-#: page_show_feed_tag.php:211
+#: page_show_feed_tag.php:161
msgid "Submit!"
msgstr "Absenden!"
Added: trunk/i18n/de_DE/LC_MESSAGES/update_feeds.mo
===================================================================
(Binary files differ)
Property changes on: trunk/i18n/de_DE/LC_MESSAGES/update_feeds.mo
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/i18n/de_DE/LC_MESSAGES/update_feeds.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/update_feeds.po 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/i18n/de_DE/LC_MESSAGES/update_feeds.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: update_feeds\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 14:59+0100\n"
-"PO-Revision-Date: 2007-01-06 15:25+0100\n"
+"POT-Creation-Date: 2007-01-13 17:10+0100\n"
+"PO-Revision-Date: 2007-01-14 23:12+0100\n"
"Last-Translator: C167 <c1...@us...>\n"
"Language-Team: Deutsch <i1...@li...>\n"
"MIME-Version: 1.0\n"
@@ -16,143 +16,143 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: update_feeds.php:49
+#: update_feeds.php:48
#, php-format
msgid "Script startet at %s"
msgstr "Das Script wurde um %s gestartet"
-#: update_feeds.php:52
+#: update_feeds.php:51
msgid "Updates are enabled!"
msgstr "Updates sind aktiviert!"
-#: update_feeds.php:73 update_feeds.php:90
+#: update_feeds.php:72 update_feeds.php:89
#, php-format
msgid "Script ended with error at %d"
msgstr "Das Script brach um %d mit einem Fehler ab"
-#: update_feeds.php:76
+#: update_feeds.php:75
msgid "Successfully connected to the database"
-msgstr "Verbindung zur Datenbank erfolgreich hergestellt"
+msgstr "Datenbankverbindung erfolgreich hergestellt"
-#: update_feeds.php:93
+#: update_feeds.php:92
msgid "Successfully SELECTed the feeds-list from the database"
-msgstr ""
+msgstr "Feed-Liste erfolgreich aus der Datenbank SELECTed"
-#: update_feeds.php:95
+#: update_feeds.php:94
#, php-format
msgid "We have got %d feeds in the database"
-msgstr ""
+msgstr "Es sind %d feeds in der Datenbank"
-#: update_feeds.php:119
+#: update_feeds.php:118
msgid "The feed is not active!!"
-msgstr ""
+msgstr "Der Feed ist nicht aktiv!!"
-#: update_feeds.php:122
+#: update_feeds.php:121
msgid "The feed is active!"
-msgstr ""
+msgstr "Der Feed ist aktiv!"
-#: update_feeds.php:128
+#: update_feeds.php:127
msgid "WARING!! Difference negative!!"
-msgstr ""
+msgstr "WARNUNG!! Differenz negativ!!"
-#: update_feeds.php:132
+#: update_feeds.php:131
#, php-format
msgid "No Update: diff: %d -> %d"
-msgstr ""
+msgstr "Kein Update: Diff: %d -> %d"
-#: update_feeds.php:133
+#: update_feeds.php:132
#, php-format
msgid "Not to update: %s"
-msgstr ""
+msgstr "Wird nicht upgedated: %s"
-#: update_feeds.php:140
+#: update_feeds.php:139
#, php-format
msgid "Update: %s | diff: %s -> %s"
-msgstr ""
+msgstr "Update: %s | Diff: %s -> %s"
-#: update_feeds.php:149
+#: update_feeds.php:148
msgid "Feed type is ATOM 1.0, using ATOM-Parser"
-msgstr ""
+msgstr "Der Feed-Typ ist ATOM 1.0, benutze ATOM-Parser"
-#: update_feeds.php:153
+#: update_feeds.php:152
msgid "Feed type is RDF 0.9, using RSS-Parser"
-msgstr ""
+msgstr "Der Feed-Typ ist RDF 0.9, benutze RSS-Parser"
-#: update_feeds.php:157
+#: update_feeds.php:156
msgid "Feed type is RSS 1.0, using RSS-Parser"
-msgstr ""
+msgstr "Der Feed-typ ist RSS 1.0, benutze RSS-Parser"
-#: update_feeds.php:161
+#: update_feeds.php:160
msgid "Feed type is RSS 2.0, using RSS-Parser"
-msgstr ""
+msgstr "Der Feed-typ ist RSS 2.0, benutze RSS-Parser"
-#: update_feeds.php:165
+#: update_feeds.php:164
msgid "Feed type unknown, using ATOM-Parser"
-msgstr ""
+msgstr "Der Feed-typ ist unbekannt, benutze ATOM-Parser"
-#: update_feeds.php:171
+#: update_feeds.php:170
#, php-format
msgid "Feed invalid: %s"
-msgstr ""
+msgstr "Feed ungülltig: %s"
-#: update_feeds.php:179
+#: update_feeds.php:178
#, php-format
msgid "We've got %d items in the feed, %d added"
-msgstr ""
+msgstr "Es sind %d Items im Feed, %d hinzugefügt"
-#: update_feeds.php:180
+#: update_feeds.php:179
#, php-format
msgid "Feed \"%s\" is up to date now!"
-msgstr ""
+msgstr "Der Feed \"%s\" ist nun auf dem neusten Stand!"
-#: update_feeds.php:193
+#: update_feeds.php:192
msgid "The script is not allowed to update the feeds.<br />"
-msgstr ""
+msgstr "Dem Script ist es nicht erlaubt, die Feeds auf den neusten Stand zu bringen. <br />"
-#: update_feeds.php:199
+#: update_feeds.php:198
msgid "Disconnected from the Database"
-msgstr ""
+msgstr "Datenbankverbindung geschlossen"
-#: update_feeds.php:200
+#: update_feeds.php:199
#, php-format
msgid "Script finished at %s"
-msgstr ""
+msgstr "Das Script endete um %s"
-#: update_feeds.php:201
+#: update_feeds.php:200
#, php-format
msgid "Script needed %d seconds"
-msgstr ""
+msgstr "Es benötigte %d Sekunden"
-#: update_feeds.php:209
+#: update_feeds.php:208
msgid "checking if the url's are already in the db."
-msgstr ""
+msgstr "Checke ob die URLs schon in der Dateenbank sind."
-#: update_feeds.php:230 update_feeds.php:231
+#: update_feeds.php:229 update_feeds.php:230
#, php-format
msgid "ERROR: %s"
-msgstr ""
+msgstr "FEHLER: %s"
-#: update_feeds.php:234
+#: update_feeds.php:233
#, php-format
msgid "Not inserting: %s | %s"
-msgstr ""
+msgstr "Nicht hinzugefügt: %s | %s"
-#: update_feeds.php:238
+#: update_feeds.php:237
#, php-format
msgid "inserting: %s | %s into the db"
-msgstr ""
+msgstr "Schreibe: %s | %s in die Datenbank"
-#: update_feeds.php:255 update_feeds.php:289
+#: update_feeds.php:254 update_feeds.php:288
msgid "Loading the feed was successfull!"
-msgstr ""
+msgstr "Der Feed wurde erfolgreich heruntergeladen!"
-#: update_feeds.php:262 update_feeds.php:296
+#: update_feeds.php:261 update_feeds.php:295
#, php-format
msgid "The feed has %d items."
-msgstr ""
+msgstr "Der Feed hat %d Items"
-#: update_feeds.php:273 update_feeds.php:312
+#: update_feeds.php:272 update_feeds.php:311
#, php-format
msgid "id: %d | subject: %s | URL: %s"
-msgstr ""
+msgstr "ID: %d | Betreff: %s | URL: %s"
Added: trunk/i18n/de_DE/LC_MESSAGES/upperBar.mo
===================================================================
(Binary files differ)
Property changes on: trunk/i18n/de_DE/LC_MESSAGES/upperBar.mo
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/i18n/de_DE/LC_MESSAGES/upperBar.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/upperBar.po (rev 0)
+++ trunk/i18n/de_DE/LC_MESSAGES/upperBar.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-01-13 17:11+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: upperBar.php:13 upperBar.php:17
+msgid "Related Sites:"
+msgstr ""
Added: trunk/i18n/de_DE/LC_MESSAGES/userstatus_display.mo
===================================================================
(Binary files differ)
Property changes on: trunk/i18n/de_DE/LC_MESSAGES/userstatus_display.mo
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/i18n/de_DE/LC_MESSAGES/userstatus_display.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/userstatus_display.po (rev 0)
+++ trunk/i18n/de_DE/LC_MESSAGES/userstatus_display.po 2007-01-14 22:31:46 UTC (rev 101)
@@ -0,0 +1,26 @@
+# translation of userstatus_display.po to Deutsch
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# C167 <c1...@us...>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: userstatus_display\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-01-13 17:11+0100\n"
+"PO-Revision-Date: 2007-01-14 23:12+0100\n"
+"Last-Translator: C167 <c1...@us...>\n"
+"Language-Team: Deutsch <i1...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: userstatus_display.php:11
+msgid "You are not logged in"
+msgstr "Sie sind nicht angemeldet"
+
+#: userstatus_display.php:18
+msgid "Hello"
+msgstr "Hallo"
+
Modified: trunk/inc/database.php
===================================================================
--- trunk/inc/database.php 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/inc/database.php 2007-01-14 22:31:46 UTC (rev 101)
@@ -1,4 +1,5 @@
<?php
+
/**
* Created on 12.01.2007
* Contains the main database-functions needed by any script
Modified: trunk/inc/footer.php
===================================================================
--- trunk/inc/footer.php 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/inc/footer.php 2007-01-14 22:31:46 UTC (rev 101)
@@ -1,4 +1,6 @@
<?php
+
+
/**
* Created on 12.01.2007
* This file contains the footer
@@ -9,9 +11,10 @@
// footer
$footer = sprintf(" <span class=\"doNotPrint\">\n" .
- " For comments or questions about this website, please\n" .
- " <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n" .
- " </span>\n\n" .
- " <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n" .
- " • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •");
+" For comments or questions about this website, please\n" .
+" <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n" .
+" </span>\n\n" .
+" <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n" .
+//" • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •");
+" • <strong>Updated »</strong> %s •", date("r", time()));
?>
Modified: trunk/inc/language.php
===================================================================
--- trunk/inc/language.php 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/inc/language.php 2007-01-14 22:31:46 UTC (rev 101)
@@ -1,4 +1,5 @@
<?php
+
/**
* Created on 12.01.2007
* Contains the language-setter
@@ -6,7 +7,6 @@
* @author C167 <c1...@us...>
* @package feed-collector
*/
-
if (true === HTTP_Session :: get("logged_in", false)) {
$user->setUserId(HTTP_Session :: get("uid"));
$language = $user->getUserLanguage();
@@ -25,8 +25,10 @@
HTTP_Session :: set("lang", $language);
putenv("LANG=$language");
setlocale(LC_ALL, $language);
-bindtextdomain("page_main", "./i18n");
+bindtextdomain("page_$page", "./i18n");
bindtextdomain("navigation", "./i18n");
bindtextdomain("userstatus_display", "./i18n");
-textdomain("page_main");
+bindtextdomain("footer", "./i18n");
+
+textdomain("page_$page");
?>
Modified: trunk/inc/navigation.php
===================================================================
--- trunk/inc/navigation.php 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/inc/navigation.php 2007-01-14 22:31:46 UTC (rev 101)
@@ -8,7 +8,6 @@
* @author C167 <c1...@us...>
* @package feed-collector
*/
-
$hl = " class=\"highlight\"";
if (!isset ($page)) {
$page = "";
@@ -34,7 +33,7 @@
$show_feed = $hl;
$page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $add_tag = $login = $register = $personal = "";
break;
- case "add_tag":
+ case "add_tag" :
$add_tag = $hl;
$page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $register = $personal = "";
break;
@@ -58,7 +57,7 @@
" <a href=\"./page_show_feed_tag.php\"$show_feed_tag>%s</a> |\n" .
" <a href=\"./page_add_new_feed.php\"$add_new_feed>%s</a> |\n" .
" <a href=\"./page_show_feed.php\"$show_feed>%s</a> |\n" .
-" <a href=\"./page_add_tag.php?%s\"$add_tag>%s</a> |\n", dgettext("navigation", "Home"), dgettext("navigation", "Show all Feeds"), dgettext("navigation", "Feeds by TAG"), dgettext("navigation", "Add a Feed"), dgettext("navigation", "Display a Feed"), !empty($_GET['feed']) ? "feed=" .$_GET['feed'] : "", dgettext("navigation", "Add a Tag"));
+" <a href=\"./page_add_tag.php?%s\"$add_tag>%s</a> |\n", dgettext("navigation", "Home"), dgettext("navigation", "Show all Feeds"), dgettext("navigation", "Feeds by TAG"), dgettext("navigation", "Add a Feed"), dgettext("navigation", "Display a Feed"), !empty ($_GET['feed']) ? "feed=" . $_GET['feed'] : "", dgettext("navigation", "Add a Tag"));
if (false === HTTP_Session :: get("logged_in", false)) {
$navigation .= sprintf(" <a href=\"./page_login.php\"$login>%s</a> |\n" .
" <a href=\"./page_register.php\"$register>%s</a>", dgettext("navigation", "Login"), dgettext("navigation", "Register"));
Modified: trunk/inc/session.php
===================================================================
--- trunk/inc/session.php 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/inc/session.php 2007-01-14 22:31:46 UTC (rev 101)
@@ -1,4 +1,5 @@
<?php
+
/**
* Created on 12.01.2007
* Contains the session-relatet stuff
Modified: trunk/inc/upperBar.php
===================================================================
--- trunk/inc/upperBar.php 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/inc/upperBar.php 2007-01-14 22:31:46 UTC (rev 101)
@@ -1,4 +1,5 @@
<?php
+
/**
* Created on 13.01.2007
* Contains the bar on top of the page
@@ -8,9 +9,11 @@
*/
if (false === HTTP_Session :: get("logged_in", false)) {
$related_sites = sprintf(" <span>%s</span>\n" .
- " <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
- " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>\n", _("Related Sites:"));
+ " <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
+ " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>\n", _("Related Sites:"));
} else {
- $related_sites = sprintf(" <span>%s</span>\n <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
+ $related_sites = sprintf(" <span>%s</span>\n" .
+ " <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
+ " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
}
?>
Modified: trunk/inc/userstatus_display.php
===================================================================
--- trunk/inc/userstatus_display.php 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/inc/userstatus_display.php 2007-01-14 22:31:46 UTC (rev 101)
@@ -1,4 +1,5 @@
<?php
+
/**
* Created on 12.01.2007
* Contains the script to display the user-status
Modified: trunk/page_register.php
===================================================================
--- trunk/page_register.php 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/page_register.php 2007-01-14 22:31:46 UTC (rev 101)
@@ -142,8 +142,8 @@
" </tr>\n" .
" </table>\n" .
" </form>\n" .
- " <p id=\"required\">All fields are required</p>\n" .
- " </div>\n", $_SERVER['PHP_SELF'], _("Registration information"), _("Username"), _("E-MAIL-address"), _("Password"), _("Repeat password"), _("Language"), _("English"), _("German"), _("Submit!"), _("Reset!"));
+ " <p id=\"required\">%s</p>\n" .
+ " </div>\n", $_SERVER['PHP_SELF'], _("Registration information"), _("Username"), _("E-MAIL-address"), _("Password"), _("Repeat password"), _("Language"), _("English"), _("German"), _("Submit!"), _("Reset!"), _("All fields are required"));
}
function checkPassword($pass) {
Modified: trunk/update_feeds.php
===================================================================
--- trunk/update_feeds.php 2007-01-12 23:46:14 UTC (rev 100)
+++ trunk/update_feeds.php 2007-01-14 22:31:46 UTC (rev 101)
@@ -10,15 +10,17 @@
* @author c167 <c1...@us...>
* @package feed-collector
*/
-$console = false;
-if (false === $console) {
- echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"
- \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
- echo "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"de\" xml:lang=\"de\">\n";
- echo "\t<head>\n\t\t<title>update</title>\n\t\t<meta http-equiv=\"content-type\" content=\"application/xhtml+xml; charset=UTF-8\" />\n\t</head>\n\t<body>\n";
+//header('Content-type: text/plain');
+error_reporting(E_ALL);
+if (isset ($_GET['lang'])) {
+ putenv("LANG=" . $_GET['lang']);
+ $language = $_GET['lang'];
+} else {
+ $language = getenv("LANG");
}
-error_reporting(E_ALL);
-
+setlocale(LC_ALL, $language);
+bindtextdomain("update_feeds", "./i18n");
+textdomain("update_feeds");
// We need some PEAR-classes
require_once "MDB2.php";
@@ -28,21 +30,29 @@
###############################
# Configure and start logging #
###############################
-if (true === $console) {
+if (isset ($_SERVER['HTTP_HOST'])) {
+ $title = _("Update-Script");
+ echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">";
+ echo "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en-AU\">\n" .
+ " <head>\n" .
+ " <meta http-equiv=\"content-type\" content=\"application/xhtml+xml; charset=UTF-8\" />\n" .
+ " <title>$title</title>\n" .
+ " </head>\n" .
+ " <body>\n";
$conf = array (
+ 'error_prepend' => "<tt>",
+ 'error_append' => "</tt>",
+ 'linebreak' => "<br />\n"
+ );
+ $log = & Log :: singleton('display', '', '', $conf, $update['loglevel']);
+} else {
+ $conf = array (
'error_prepend' => "",
'error_append' => "",
'linebreak' => "\n"
);
-} else {
- $conf = array (
- 'error_prepend' => "<tt>",
- 'error_append' => "</tt>",
- 'linebreak' => "<br />\n"
- );
+ $log = & Log :: singleton('console', '', '', $conf, $update['loglevel']);
}
-$log = & Log :: singleton('display', '', '', $conf, $update['loglevel']);
-
$time_now = time();
$log->log(sprintf(_("Script startet at %s"), microtime()), PEAR_LOG_NOTICE);
@@ -99,19 +109,19 @@
##########################
while ($row = $res->fetchRow()) {
echo $conf['error_prepend'] . "-----------------------------------------------------" . $conf['error_append'] . $conf['linebreak'];
- $log->log("id => " . $row['id'], PEAR_LOG_NOTICE);
- $log->log("site_name => " . $row['site_name'], PEAR_LOG_NOTICE);
- $log->log("site_url => " . $row['site_url'], PEAR_LOG_INFO);
- $log->log("site_lang => " . $row['site_lang'], PEAR_LOG_DEBUG);
- $log->log("feed_name => " . $row['feed_name'], PEAR_LOG_NOTICE);
- $log->log("feed_url => " . $row['feed_url'], PEAR_LOG_INFO);
- $log->log("feed_type => " . $row['feed_type'], PEAR_LOG_DEBUG);
- $log->log("feed_db_name => " . $row['feed_db_name'], PEAR_LOG_INFO);
- $log->log("feed_lang => " . $row['feed_lang'], PEAR_LOG_DEBUG);
- $log->log("feed_img => " . $row['feed_img'], PEAR_LOG_DEBUG);
- $log->log("is_active => " . $row['is_active'], PEAR_LOG_NOTICE);
- $log->log("last_change => " . $row['last_change'], PEAR_LOG_NOTICE);
- $log->log("items => " . $row['items'], PEAR_LOG_NOTICE);
+ $log->log("id = " . $row['id'], PEAR_LOG_NOTICE);
+ $log->log("site_name = " . $row['site_name'], PEAR_LOG_NOTICE);
+ $log->log("site_url = " . $row['site_url'], PEAR_LOG_INFO);
+ $log->log("site_lang = " . $row['site_lang'], PEAR_LOG_DEBUG);
+ $log->log("feed_name = " . $row['feed_name'], PEAR_LOG_NOTICE);
+ $log->log("feed_url = " . $row['feed_url'], PEAR_LOG_INFO);
+ $log->log("feed_type = " . $row['feed_type'], PEAR_LOG_DEBUG);
+ $log->log("feed_db_name = " . $row['feed_db_name'], PEAR_LOG_INFO);
+ $log->log("feed_lang = " . $row['feed_lang'], PEAR_LOG_DEBUG);
+ $log->log("feed_img = " . $row['feed_img'], PEAR_LOG_DEBUG);
+ $log->log("is_active = " . $row['is_active'], PEAR_LOG_NOTICE);
+ $log->log("last_change = " . $row['last_change'], PEAR_LOG_NOTICE);
+ $log->log("items = " . $row['items'], PEAR_LOG_NOTICE);
// Is the feed active?
if (0 === $row['is_active']) {
@@ -198,10 +208,9 @@
$log->log(_("Disconnected from the Database"), PEAR_LOG_NOTICE);
$log->log(sprintf(_("Script finished at %s"), microtime()), PEAR_LOG_NOTICE);
$log->log(sprintf(_("Script needed %d seconds"), (time() - $time_now)), PEAR_LOG_NOTICE);
-if (false === $console)
+if (isset ($_SERVER['HTTP_HOST'])) {
echo "\t</body>\n</html>";
-else
- echo "";
+}
function insertData($data, $table_name, $log, $mdb2) {
$mdb2->loadModule('Extended');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <c1...@us...> - 2007-01-18 18:21:13
|
Revision: 102
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=102&view=rev
Author: c167
Date: 2007-01-18 10:21:08 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
final changes for version 1.0
Modified Paths:
--------------
trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po
trunk/i18n/de_DE/LC_MESSAGES/page_main.mo
trunk/i18n/de_DE/LC_MESSAGES/page_main.po
trunk/inc/userstatus_display.php
trunk/page_add_tag.php
trunk/page_login.php
trunk/statistics.php
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po 2007-01-14 22:31:46 UTC (rev 101)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po 2007-01-18 18:21:08 UTC (rev 102)
@@ -139,5 +139,5 @@
#: page_add_new_feed.php:224
msgid "Marked fields are required"
-msgstr "Markierte Felder muessen gefüllt werden!"
+msgstr "Markierte Felder müssen gefüllt werden!"
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_main.mo
===================================================================
(Binary files differ)
Modified: trunk/i18n/de_DE/LC_MESSAGES/page_main.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/page_main.po 2007-01-14 22:31:46 UTC (rev 101)
+++ trunk/i18n/de_DE/LC_MESSAGES/page_main.po 2007-01-18 18:21:08 UTC (rev 102)
@@ -107,7 +107,7 @@
#: page_main.php:104
msgid "biggest feeds"
-msgstr "Gröste Feeds"
+msgstr "Grösste Feeds"
#: page_main.php:107 page_main.php:117 page_main.php:127
msgid " Items"
Modified: trunk/inc/userstatus_display.php
===================================================================
--- trunk/inc/userstatus_display.php 2007-01-14 22:31:46 UTC (rev 101)
+++ trunk/inc/userstatus_display.php 2007-01-18 18:21:08 UTC (rev 102)
@@ -16,5 +16,6 @@
$username = HTTP_Session :: get("username");
}
$midHeader_title_right = sprintf(" <p>%s %s</p>", dgettext("userstatus_display", "Hello"), $username);
+ HTTP_Session::updateIdle();
}
?>
Modified: trunk/page_add_tag.php
===================================================================
--- trunk/page_add_tag.php 2007-01-14 22:31:46 UTC (rev 101)
+++ trunk/page_add_tag.php 2007-01-18 18:21:08 UTC (rev 102)
@@ -55,6 +55,10 @@
############
require_once "./inc/language.php";
+if(empty($_GET['feed'])) {
+ HTTP :: redirect("./page_show_all_feeds.php");
+}
+
$main = "";
if (isset ($_POST['tag'])) {
$tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']);
Modified: trunk/page_login.php
===================================================================
--- trunk/page_login.php 2007-01-14 22:31:46 UTC (rev 101)
+++ trunk/page_login.php 2007-01-18 18:21:08 UTC (rev 102)
@@ -33,7 +33,6 @@
##############
require_once "HTTP.php";
-
$page = "login";
############
@@ -59,6 +58,7 @@
HTTP_Session :: set("uid", $login['id']);
HTTP_Session :: set("username", $login['username']);
$user->updateUserAction();
+ HTTP_Session :: regenerateId();
if (isset ($_POST['cameFrom']) and true === in_array(basename($_POST['cameFrom']), $validPages)) {
HTTP :: redirect("./" . $_POST['cameFrom']);
die();
@@ -149,10 +149,10 @@
" </tr>\n" .
" <tr>\n" .
" <td class=\"formElem\">%s</td>\n" .
- " <td class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></td>\n" .
+ " <td class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></td>\n" .
" </tr>\n" .
" <tr>\n" .
- " <td class=\"formElem\">%s</td>\n" .
+ " <td class=\"formElem\">%s</td>\n" .
" <td class=\"formField\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" /></td>\n" .
" </tr>\n" .
" <tr id=\"formButtons\">\n" .
@@ -161,7 +161,7 @@
" </table>\n" .
" <input type=\"hidden\" name=\"cameFrom\" value=\"%s\" />\n" .
" </form>\n" .
- " </div>\n", $_SERVER['PHP_SELF'], _("Login"), _("Username"), _("Password"), _("Submit!"), _("Reset!"), !empty($_GET['cameFrom']) ? $_GET['cameFrom'] : "");
+ " </div>\n", $_SERVER['PHP_SELF'], _("Login"), _("Username"), _("Password"), _("Submit!"), _("Reset!"), !empty ($_GET['cameFrom']) ? $_GET['cameFrom'] : "");
return $form;
}
Modified: trunk/statistics.php
===================================================================
--- trunk/statistics.php 2007-01-14 22:31:46 UTC (rev 101)
+++ trunk/statistics.php 2007-01-18 18:21:08 UTC (rev 102)
@@ -42,50 +42,5 @@
$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
$db->loadModule('Extended', null, false);
-require_once "class/User_manager.php";
-$user = new User_Manager($db);
-require_once "class/Feed_manager.php";
-$feed = new Feed_Manager($db);
-require_once "class/Tag_manager.php";
-$tags = new Tag_Manager($db);
-/*$feedname = "heise_online_news";
-$count = 30;
-$page=1;
-print_r($tags->getTags($feedname, $count, $page));
-print_r($feed->getItemsPerPage($feedname, $page, $count));*/
-//echo dirname($_SERVER['SCRIPT_FILENAME']);
-$array1 = unserialize('a:4:{i:0;s:17:"heise_online_news";i:1;s:16:"heise_mobil_news";i:2;s:19:"heise_security_news";i:3;s:12:"golem_de_all";}');
-$array2 = unserialize('a:4:{i:0;s:22:"technology_review_blog";i:1;s:17:"technology_review";i:2;s:14:"telepolis_news";i:3;s:8:"slashdot";}');
-$array3 = unserialize('a:4:{i:0;s:12:"debian_times";i:1;s:11:"heise_netze";i:2;s:23:"heise_netze_produktnews";i:3;s:19:"heise_netze_artikel";}');
-foreach ($array1 as $array) {
- $new[] = $array;
-}
-foreach ($array2 as $array) {
- $new[] = $array;
-}
-foreach ($array3 as $array) {
- $new[] = $array;
-}
-$string = "";
-for ($i = 0; $i < count($new); $i++) {
- echo $new[$i];
- $string .= $new[$i];
- if ($i < count($new)) {
- echo "|";
- $string .= "|";
- }
-}
-echo "<br />";
-print_r(explode("|", $string));
-echo "<br />";
-$return = "";
-for ($i = 0; $i < count($new); $i++) {
- $return .= $new[$i];
- if ($i !== count($new) - 1) {
- $return .= "|";
- }
-}
-echo $return;
-echo "<br />";
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <C1...@us...> - 2007-02-25 17:01:17
|
Revision: 105
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=105&view=rev
Author: C167
Date: 2007-02-25 09:01:16 -0800 (Sun, 25 Feb 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/inc/database.php
trunk/page_personal.php
trunk/styles/default/page_personal.tpl
Added Paths:
-----------
trunk/ajax/
trunk/ajax/page_personal.js
Added: trunk/ajax/page_personal.js
===================================================================
--- trunk/ajax/page_personal.js (rev 0)
+++ trunk/ajax/page_personal.js 2007-02-25 17:01:16 UTC (rev 105)
@@ -0,0 +1,56 @@
+
+var news_feeds = new Array();
+
+function detectFeeds() {
+ var feed_class_name = "news_feed";
+ var name = document.getElementsByClassName(feed_class_name);
+ //alert(name);
+ for(var i = 0; i < name.length; i++) {
+ var reg = Ajax.Request();
+ }
+}
+
+
+/*
+var hover=false;
+var c=1;
+var delta=1;
+var s2='m3d14.73rr0r15m';
+var interval = window.setInterval("rndStr()",100);
+
+function setHover(x) {
+ hover=x;
+}
+
+function rndStr() {
+ var s="";
+ var s1="";
+ var n=0;
+ var d=0;
+
+ for(n=0; n<=15; n++) {
+ if(n==5)
+ s1=s1+".";
+ else
+ s1 = s1 + String.fromCharCode(Math.floor(48+Math.random()*74));
+ }
+
+ if(hover) {
+ c=c+1;
+ d=Math.abs(Math.floor(c/4));
+ if(c==60) c=c-1;
+ // c=c % 60;
+ document.getElementById('caption').style.color="rgb(" + Math.floor(Math.random()*255) + "," + Math.floor(Math.random()*255) + "," + Math.floor(Math.random()*255) + ")";
+ } else {
+ c=(c-1);
+ d=Math.abs(Math.floor(c/4));
+ if(c==0) c=c+1;
+ document.getElementById('caption').style.color="rgb(255,255,255)";
+ }
+
+ s=s2.substr(0,d)+s1.substr(d,15-d);
+
+ document.getElementById('caption').firstChild.data =s;
+ document.getElementById('caption').attributes['href'].nodeValue= (s==s2) ? "blog/" : "/";
+}
+*/
\ No newline at end of file
Modified: trunk/inc/database.php
===================================================================
--- trunk/inc/database.php 2007-01-18 18:23:45 UTC (rev 104)
+++ trunk/inc/database.php 2007-02-25 17:01:16 UTC (rev 105)
@@ -28,4 +28,17 @@
} else {
}
$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
+
+/*
+ * Now we get the configuration from the database
+ */
+$database_config = $db->query("SELECT * FROM config;");
+if(PEAR :: isError($database_config)) {
+
+} else {
+ $data = $database_config->fetchRow();
+ if(!empty($data[''])) {
+
+ }
+}
?>
Modified: trunk/page_personal.php
===================================================================
--- trunk/page_personal.php 2007-01-18 18:23:45 UTC (rev 104)
+++ trunk/page_personal.php 2007-02-25 17:01:16 UTC (rev 105)
@@ -125,7 +125,7 @@
function createColumn($column, $number, $feed) {
$return = " <div class=\"column$number\">\n";
foreach ($column as $col) {
- $return .= " <div id=\"$col\">\n";
+ $return .= " <div class=\"news_feed\" id=\"$col\" >\n";
$feed_info = $feed->getFeedInfo($col);
$return .= sprintf(" <div class=\"feed_headline\">\n <a href=\"%s\">%s</a>\n </div>\n <ul>\n", $feed_info['site_url'], $feed_info['feed_name']);
$items = $feed->getNewestItems($col, 10);
Modified: trunk/styles/default/page_personal.tpl
===================================================================
--- trunk/styles/default/page_personal.tpl 2007-01-18 18:23:45 UTC (rev 104)
+++ trunk/styles/default/page_personal.tpl 2007-02-25 17:01:16 UTC (rev 105)
@@ -13,10 +13,15 @@
<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" />
+ <script language="JavaScript" type="text/javascript" src="./ajax/init.js" />
+ <script language="JavaScript" type="text/javascript" src="./ajax/page_personal.js" />
+
+ <script language="JavaScript" type="text/javascript" src="./ajax/prototype.js" />
+
<title><!-- title --></title>
</head>
- <body>
+ <body onload="init()">
<!-- For non-visual user agents: -->
<div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <C1...@us...> - 2007-05-06 14:22:50
|
Revision: 106
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=106&view=rev
Author: C167
Date: 2007-05-06 07:22:41 -0700 (Sun, 06 May 2007)
Log Message:
-----------
some changes
Modified Paths:
--------------
trunk/class/Feed_manager.php
trunk/inc/upperBar.php
trunk/styles/default/common-screen.css
trunk/styles/default/footer-screen.css
trunk/styles/default/header-screen.css
trunk/styles/default/main_copy-screen.css
trunk/styles/default/page_main.tpl
Added Paths:
-----------
trunk/styles/default/images/
Modified: trunk/class/Feed_manager.php
===================================================================
--- trunk/class/Feed_manager.php 2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/class/Feed_manager.php 2007-05-06 14:22:41 UTC (rev 106)
@@ -159,7 +159,7 @@
/**
* Get some feeds, pageable
- * @param int $count number of feeds to get (should alsways be the same!)
+ * @param int $count number of feeds to get (should always be the same!)
* @param int $page the number of the page to get.
* @return mixed
*/
@@ -276,18 +276,13 @@
* @return Array An assoc array
*/
public function getRandomFeeds($count = 5) {
- $count_feeds = $this->stat_countFeeds();
- $rand = array ();
- $rand = $this->generateRandomNumbers($count_feeds, 0, $count);
- for ($i = 0; $i < $count; $i++) {
-
- $feeds = $this->mdb->query(sprintf("SELECT feed_db_name, feed_name, items FROM feeds WHERE ID = %d;", $rand[$i]));
- while ($row = $feeds->fetchRow()) {
- $return[$i]['feed_name'] = $row['feed_name'];
- $return[$i]['feed_db_name'] = $row['feed_db_name'];
- $return[$i]['items'] = $row['items'];
- }
-
+ $feeds = $this->mdb->query(sprintf("SELECT feed_db_name, feed_name, items FROM feeds ORDER BY RAND() LIMIT %d", $count));
+ $i = 0;
+ while ($row = $feeds->fetchRow()) {
+ $return[$i]['feed_name'] = $row['feed_name'];
+ $return[$i]['feed_db_name'] = $row['feed_db_name'];
+ $return[$i]['items'] = $row['items'];
+ $i++;
}
return $return;
}
Modified: trunk/inc/upperBar.php
===================================================================
--- trunk/inc/upperBar.php 2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/inc/upperBar.php 2007-05-06 14:22:41 UTC (rev 106)
@@ -9,8 +9,9 @@
*/
if (false === HTTP_Session :: get("logged_in", false)) {
$related_sites = sprintf(" <span>%s</span>\n" .
- " <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
- " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>\n", _("Related Sites:"));
+ " <a href=\"http://validator.w3.org/check?uri=referer\" title=\"Validate XHTML\">Validate XHTML</a> |\n" .
+ " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a> |\n" .
+ " <a href=\"http://validator.w3.org/check?uri=referer\" title=\"Validate\">Validate</a>\n", _("Related Sites:"));
} else {
$related_sites = sprintf(" <span>%s</span>\n" .
" <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
Modified: trunk/styles/default/common-screen.css
===================================================================
--- trunk/styles/default/common-screen.css 2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/styles/default/common-screen.css 2007-05-06 14:22:41 UTC (rev 106)
@@ -3,7 +3,7 @@
* URI: styles/default/common-screen.css *
* MODIF: 2007-Jan-09 18:06 +0100 *
*****************************************/
- @CHARSET "UTF-8";
+/*@CHARSET "UTF-8";*/
/* ##### Common Styles ##### */
.headerLogin {
@@ -156,4 +156,4 @@
.smallCaps {
font-size: 117%;
font-variant: small-caps;
-}
\ No newline at end of file
+}
Modified: trunk/styles/default/footer-screen.css
===================================================================
--- trunk/styles/default/footer-screen.css 2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/styles/default/footer-screen.css 2007-05-06 14:22:41 UTC (rev 106)
@@ -3,7 +3,7 @@
* URI: styles/default/footer-screen.css *
* MODIF: 2007-Jan-09 18:06 +0100 *
*****************************************/
- @CHARSET "UTF-8";
+/*@CHARSET "UTF-8";*/
/* ##### Footer ##### */
@@ -27,4 +27,4 @@
#footer a:hover {
text-decoration: none;
-}
\ No newline at end of file
+}
Modified: trunk/styles/default/header-screen.css
===================================================================
--- trunk/styles/default/header-screen.css 2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/styles/default/header-screen.css 2007-05-06 14:22:41 UTC (rev 106)
@@ -3,7 +3,7 @@
* URI: styles/default/header-screen.css *
* MODIF: 2007-Jan-09 18:06 +0100 *
*****************************************/
- @CHARSET "UTF-8";
+/*@CHARSET "UTF-8";*/
/* ##### Header ##### */
.superHeader {
@@ -87,4 +87,4 @@
color: rgb(255, 204, 0);
background-color: transparent;
text-decoration: none;
-}
\ No newline at end of file
+}
Modified: trunk/styles/default/main_copy-screen.css
===================================================================
--- trunk/styles/default/main_copy-screen.css 2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/styles/default/main_copy-screen.css 2007-05-06 14:22:41 UTC (rev 106)
@@ -3,7 +3,7 @@
* URI: styles/default/main_copy-screen.css *
* MODIF: 2007-Jan-09 18:06 +0100 *
********************************************/
- @CHARSET "UTF-8";
+/*@CHARSET "UTF-8";*/
/* ##### Main Copy ##### */
@@ -49,4 +49,4 @@
* .rowOfBoxes + .rowOfBoxes {
* border-top: 1px solid rgb(204,204,204);
* }
- */
\ No newline at end of file
+ */
Modified: trunk/styles/default/page_main.tpl
===================================================================
--- trunk/styles/default/page_main.tpl 2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/styles/default/page_main.tpl 2007-05-06 14:22:41 UTC (rev 106)
@@ -1,7 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<?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" >
+<!--<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU">
+-->
<head>
<meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="author" content="haran" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <C1...@us...> - 2007-05-20 10:42:15
|
Revision: 111
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=111&view=rev
Author: C167
Date: 2007-05-20 03:42:07 -0700 (Sun, 20 May 2007)
Log Message:
-----------
implemented style-chooser, first test
Modified Paths:
--------------
trunk/inc/styles.php
trunk/page_main.php
Modified: trunk/inc/styles.php
===================================================================
--- trunk/inc/styles.php 2007-05-15 21:34:20 UTC (rev 110)
+++ trunk/inc/styles.php 2007-05-20 10:42:07 UTC (rev 111)
@@ -9,9 +9,9 @@
$style_prop = "default";
}
if(true === is_valid_design($style_prop])) {
- $design = $style_prop;
+ $style= $style_prop;
} else {
- $design = "default";
+ $style = "default";
}
/*
@@ -19,7 +19,7 @@
* @param String $design
* @return boolean
*/
-function is_valid_design($design) {
+function is_valid_design($style) {
return true;
}
?>
Modified: trunk/page_main.php
===================================================================
--- trunk/page_main.php 2007-05-15 21:34:20 UTC (rev 110)
+++ trunk/page_main.php 2007-05-20 10:42:07 UTC (rev 111)
@@ -11,38 +11,29 @@
require_once "inc/config.php";
error_reporting(E_ALL);
-############
-# DATABASE #
-############
+/* DATABASE */
require_once "./inc/database.php";
-###########
-# SESSION #
-###########
+/* SESSION */
require_once "./inc/session.php";
-#########
-# FEEDS #
-#########
+/* FEEDS */
require_once "class/Feed_manager.php";
$feed = new Feed_manager($db);
-##############
-# HTTP-BASIS #
-##############
+/* HTTP-BASIS */
require_once "HTTP.php";
-################
-# User-Manager #
-################
+/* User-Manager */
require_once "class/User_manager.php";
$user = new User_manager($db);
+/* Style-Chooser */
+require_once "inc/styles.php";
+
$page = "main";
-############
-# LANGUAGE #
-############
+/* LANGUAGE */
require_once "./inc/language.php";
//
@@ -50,7 +41,7 @@
//
// get the design
-$design = file_get_contents("styles/default/page_main.tpl", 'r');
+$design = file_get_contents("styles/$style/page_$page.tpl", 'r');
# header
// title
@@ -134,4 +125,4 @@
$design = str_replace("<!-- footer -->", $footer, $design);
echo $design;
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <C1...@us...> - 2007-05-20 11:42:49
|
Revision: 112
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=112&view=rev
Author: C167
Date: 2007-05-20 04:42:45 -0700 (Sun, 20 May 2007)
Log Message:
-----------
added default-entrys to login-fields and changed the style-detection
Modified Paths:
--------------
trunk/inc/styles.php
trunk/page_login.php
Modified: trunk/inc/styles.php
===================================================================
--- trunk/inc/styles.php 2007-05-20 10:42:07 UTC (rev 111)
+++ trunk/inc/styles.php 2007-05-20 11:42:45 UTC (rev 112)
@@ -1,14 +1,14 @@
<?php
if(!empty($_GET['style'])) {
$style_prop = $_GET['style'];
-} elseif(!empty(HTTP_Session :: get('style'))) {
+} elseif(!is_null(HTTP_Session :: get('style', null))) {
$style_prop = HTTP_Session :: get('style');
} elseif(!empty($_POST['style'])) {
$style_prop = $_POST['style'];
} else {
$style_prop = "default";
}
-if(true === is_valid_design($style_prop])) {
+if(true === is_valid_design($style_prop)) {
$style= $style_prop;
} else {
$style = "default";
Modified: trunk/page_login.php
===================================================================
--- trunk/page_login.php 2007-05-20 10:42:07 UTC (rev 111)
+++ trunk/page_login.php 2007-05-20 11:42:45 UTC (rev 112)
@@ -149,11 +149,11 @@
" </tr>\n" .
" <tr>\n" .
" <td class=\"formElem\">%s</td>\n" .
- " <td class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></td>\n" .
+ " <td class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" onfocus=\"if (this.value=='Login') this.value=''\" /></td>\n" .
" </tr>\n" .
" <tr>\n" .
" <td class=\"formElem\">%s</td>\n" .
- " <td class=\"formField\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" /></td>\n" .
+ " <td class=\"formField\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" onfocus=\"if (this.value=='Passwordezz') this.value=''\" /></td>\n" .
" </tr>\n" .
" <tr id=\"formButtons\">\n" .
" <td colspan=\"2\"><input type=\"submit\" value=\"%s\" name=\"submit\" /><input type=\"reset\" value=\"%s\" /></td>\n" .
@@ -179,4 +179,4 @@
return $inhalt;
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <C1...@us...> - 2007-06-04 11:56:09
|
Revision: 114
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=114&view=rev
Author: C167
Date: 2007-06-04 04:56:11 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
removed smarty-dir, smarty stuff resides under /usr/share/php/smarty...
Modified Paths:
--------------
trunk/inc/config.php
Removed Paths:
-------------
trunk/smarty/
Modified: trunk/inc/config.php
===================================================================
--- trunk/inc/config.php 2007-06-04 09:41:54 UTC (rev 113)
+++ trunk/inc/config.php 2007-06-04 11:56:11 UTC (rev 114)
@@ -1,5 +1,5 @@
<?php
-
+// vim: set expandtab tabstop=4 shiftwidth=4 fdm=marker softtabstop=4:
/*
* This is the main configuration-file
* It will store the basic information
@@ -31,6 +31,9 @@
$update['difference'] = 1800;
$update['loglevel'] = PEAR_LOG_NOTICE;
+// Smarty settings
+$smarty['folder'] = "smarty/libs";
+
// Valid pages
$validPages = array (
"page_add_new_feed.php",
@@ -68,4 +71,4 @@
'table' => $session['container']['tablename'],
'autooptimize' => $session['container']['autooptimize']
);
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <C1...@us...> - 2007-06-04 14:25:34
|
Revision: 116
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=116&view=rev
Author: C167
Date: 2007-06-04 07:25:36 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
some changes
Modified Paths:
--------------
trunk/inc/config.php
trunk/inc/navigation.php
trunk/page_main.php
trunk/styles/default/footer.tpl
trunk/styles/default/page_main.tpl
Added Paths:
-----------
trunk/smarty/
trunk/smarty/cache/
trunk/smarty/templates_c/
Removed Paths:
-------------
trunk/inc/footer.php
Modified: trunk/inc/config.php
===================================================================
--- trunk/inc/config.php 2007-06-04 12:11:09 UTC (rev 115)
+++ trunk/inc/config.php 2007-06-04 14:25:36 UTC (rev 116)
@@ -32,7 +32,12 @@
$update['loglevel'] = PEAR_LOG_NOTICE;
// Smarty settings
-$smarty['folder'] = "smarty/libs";
+define('SMARTY_DIR', '/usr/share/php/smarty/libs/');
+ // these folders should be outside the document root
+$sm['template_dir'] = "./styles/$style/";
+$sm['compile_dir'] = "./templates_c/";
+$sm['config_dir'] = "./inc/";
+$sm['cache_dir'] = "./cache/";
// Valid pages
$validPages = array (
Deleted: trunk/inc/footer.php
===================================================================
--- trunk/inc/footer.php 2007-06-04 12:11:09 UTC (rev 115)
+++ trunk/inc/footer.php 2007-06-04 14:25:36 UTC (rev 116)
@@ -1,25 +0,0 @@
-<?php
-
-
-/**
- * Created on 12.01.2007
- * This file contains the footer
- * @since 100 - 12.01.2007
- * @author C167 <c1...@us...>
- * @package feed-collector
- */
-
-// footer
-$footer = sprintf(" <span class=\"doNotPrint\">\n" .
-" For comments or questions about this website, please\n" .
-" <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n" .
-" </span>\n\n" .
-" <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n" .
-" • <strong>Updated »</strong> %s •", date("r", time()), file_exists("styles/default/images/valid-css") ? "<img src=\"styles/default/images/valid-css\" alt=\"valid-css\" />":"");
-if(file_exists("styles/default/images/valid-css") or file_exists("styles/default/images/valid-markup")) {
- $footer .= " <div class=\"right\">\n";
- $footer .= file_exists("styles/default/images/valid-markup") ? " <img src=\"styles/default/images/valid-markup\" alt=\"Valid Markup\" />\n" : "";
- $footer .= file_exists("styles/default/images/valid-css") ? " <img src=\"styles/default/images/valid-css\" alt=\"Valid CSS\" />\n" : "";
- $footer .= " </div>\n";
-}
-?>
Modified: trunk/inc/navigation.php
===================================================================
--- trunk/inc/navigation.php 2007-06-04 12:11:09 UTC (rev 115)
+++ trunk/inc/navigation.php 2007-06-04 14:25:36 UTC (rev 116)
@@ -57,7 +57,14 @@
" <a href=\"./page_show_feed_tag.php\"$show_feed_tag>%s</a> |\n" .
" <a href=\"./page_add_new_feed.php\"$add_new_feed>%s</a> |\n" .
" <a href=\"./page_show_feed.php\"$show_feed>%s</a> |\n" .
-" <a href=\"./page_add_tag.php?%s\"$add_tag>%s</a> |\n", dgettext("navigation", "Home"), dgettext("navigation", "Show all Feeds"), dgettext("navigation", "Feeds by TAG"), dgettext("navigation", "Add a Feed"), dgettext("navigation", "Display a Feed"), !empty ($_GET['feed']) ? "feed=" . $_GET['feed'] : "", dgettext("navigation", "Add a Tag"));
+" <a href=\"./page_add_tag.php?%s\"$add_tag>%s</a> |\n",
+ dgettext("navigation", "Home"),
+ dgettext("navigation", "Show all Feeds"),
+ dgettext("navigation", "Feeds by TAG"),
+ dgettext("navigation", "Add a Feed"),
+ dgettext("navigation", "Display a Feed"),
+ !empty ($_GET['feed']) ? "feed=" . $_GET['feed'] : "",
+ dgettext("navigation", "Add a Tag"));
if (false === HTTP_Session :: get("logged_in", false)) {
$navigation .= sprintf(" <a href=\"./page_login.php\"$login>%s</a> |\n" .
" <a href=\"./page_register.php\"$register>%s</a>", dgettext("navigation", "Login"), dgettext("navigation", "Register"));
Modified: trunk/page_main.php
===================================================================
--- trunk/page_main.php 2007-06-04 12:11:09 UTC (rev 115)
+++ trunk/page_main.php 2007-06-04 14:25:36 UTC (rev 116)
@@ -36,17 +36,22 @@
/* LANGUAGE */
require_once "./inc/language.php";
+// SMARTY
+define('SMARTY_DIR', '/usr/share/php/smarty/libs/');
+require_once "smarty/libs/Smarty.class.php";
+$smarty = new Smarty();
+
//
// Now we're going to replace the placeholders in the template with the important content
//
// get the design
-$design = file_get_contents("styles/$style/page_$page.tpl", 'r');
+$design = "styles/$style/page_$page.tpl";
# header
// title
-$title = "Feed-Collector";
-$design = str_replace("<!-- title -->", $title, $design);
+$smarty->assign('title', "Feed-Collector");
+//$design = str_replace("<!-- title -->", $title, $design);
# body
// related sites
Modified: trunk/styles/default/footer.tpl
===================================================================
--- trunk/styles/default/footer.tpl 2007-06-04 12:11:09 UTC (rev 115)
+++ trunk/styles/default/footer.tpl 2007-06-04 14:25:36 UTC (rev 116)
@@ -1,7 +1,15 @@
<!-- ##### Footer ##### -->
<div id="footer">
-{$footer}
+ <span class="doNotPrint">
+ For comments or questions about this website, please
+ {mailto address=$admin_email encode="javascript" title=$admin_email_title text="email the webmaster"}
+ </span>
+ • <strong>{$updated} »</strong> {$smarty.now|date_format:"%Y-%m-%d"}
+ <span class="doNotPrint">
+ <a href="http://validator.w3.org/check?uri=referer"><img src="styles/default/images/valid-xhtml11-blue.png" alt="Valid XHTML 1.1" /></a>
+ <a href="http://jigsaw.w3.org/css-validator/"><img src="styles/default/images/valid-css2-blue.png" alt="Valid CSS 2" /></a>
+ </span>
</div>
</body>
</html>
Modified: trunk/styles/default/page_main.tpl
===================================================================
--- trunk/styles/default/page_main.tpl 2007-06-04 12:11:09 UTC (rev 115)
+++ trunk/styles/default/page_main.tpl 2007-06-04 14:25:36 UTC (rev 116)
@@ -6,21 +6,31 @@
<div id="header">
<div class="superHeader">
-<!-- related sites -->
+ <span>{$related_sites_str}</span>
+{foreach from=$related_sites_list key=title item=i name="related_sites"}
+ <a href="{$i.href|escape:"url"}" title="{$title}">{$i.text}</a>
+ {if $smarty.foreach.related_sites.last == 1 }
+ |
+ {/if}
+{/foreach}
</div>
<div class="midHeader">
-<!-- midHeader title left -->
+ <h1 class=\"headerTitle\">{$page_title}</h1>
+ <div class=\"headerSubTitle\" title=\"Message'\">
+ {$sub_title}
+ </div>
<br class="doNotDisplay doNotPrint" />
<div class="headerLogin">
-<!-- midHeader title right -->
+ <p>{$userstatus}</p>
</div>
</div>
<div class="subHeader">
<span class="doNotDisplay">Navigation:</span>
+
<!-- navigation -->
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <C1...@us...> - 2007-06-04 18:06:42
|
Revision: 121
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=121&view=rev
Author: C167
Date: 2007-06-04 11:04:39 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
some changes
Modified Paths:
--------------
trunk/inc/upperBar.php
trunk/page_main.php
trunk/styles/default/page_header.tpl
trunk/styles/default/page_main.tpl
Modified: trunk/inc/upperBar.php
===================================================================
--- trunk/inc/upperBar.php 2007-06-04 16:08:57 UTC (rev 120)
+++ trunk/inc/upperBar.php 2007-06-04 18:04:39 UTC (rev 121)
@@ -7,14 +7,24 @@
* @author C167 <c1...@us...>
* @package feed-collector
*/
-if (false === HTTP_Session :: get("logged_in", false)) {
- $related_sites = sprintf(" <span>%s</span>\n" .
- " <a href=\"http://validator.w3.org/check?uri=referer\" title=\"Validate XHTML\">Validate XHTML</a> |\n" .
- " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a> |\n" .
- " <a href=\"http://validator.w3.org/check?uri=referer\" title=\"Validate\">Validate</a>\n", _("Related Sites:"));
-} else {
- $related_sites = sprintf(" <span>%s</span>\n" .
- " <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
- " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a>", _("Related Sites:"));
-}
+
+$smarty->assign('related_sites_str', _("Related Sites:"));
+$related_sites_list = array (
+ array (
+ "text" => "Validate XHTML",
+ "title" => "Validate XHTML",
+ "href" => "http://validator.w3.org/check?uri=referer"
+ ),
+ array (
+ "text" => "haran's Designs",
+ "title" => "Other designs by haran",
+ "href" => "http://www.oswd.org/designs/search/designer/id/3013/"
+ ),
+ array (
+ "text" =>"Validate CSS",
+ "title" => "Validate CSS",
+ "href" => "http://validator.w3.org/check?uri=referer"
+ )
+);
+$smarty->assign('related_sites_list', $related_sites_list);
?>
Modified: trunk/page_main.php
===================================================================
--- trunk/page_main.php 2007-06-04 16:08:57 UTC (rev 120)
+++ trunk/page_main.php 2007-06-04 18:04:39 UTC (rev 121)
@@ -28,7 +28,7 @@
require_once "class/User_manager.php";
$user = new User_manager($db);
-/* Style-Chooser */
+/* STYLE */
require_once "inc/styles.php";
$page = "main";
@@ -37,9 +37,7 @@
require_once "./inc/language.php";
// SMARTY
-define('SMARTY_DIR', '/usr/share/php/smarty/libs/');
-require_once "smarty/libs/Smarty.class.php";
-$smarty = new Smarty();
+require_once "inc/smarty.php";
//
// Now we're going to replace the placeholders in the template with the important content
@@ -56,24 +54,22 @@
# body
// 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);
+// midHeader title
+$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
-$main = sprintf(" <h1>%s</h1>\n %s", _("Welcome!"), _("<p>This is the home of Feed-Collector, an database-driven news-reader.\n It is written to automaticaly collect news from other websites \n <acronym title=\"Resource Description Framework\">RDF</acronym>-, \n <acronym title=\"Really Simple Syndication\">RSS</acronym>- and \n <acronym title=\"Atom Syndication Formats\">ATOM</acronym>-newsfeeds \n and to display them to a user. There is no need to delete \"older news\", \n so you can come here anytime and search in the database</p>\n <p>Users can register to this site. If they do so, they get a personal page \n displaying the news they are interested in. Once a user is logged in, he can \n modify his page by adding and removing news feeds. To do so, just go to the \n <a href=\"./page_select_feeds.php\">feed-overview-page</a> and select/deselect \n news feeds.</p>"));
-$design = str_replace("<!-- main -->", $main, $design);
+// main wordwrap 85
+$smarty->assign('greeting', _("Welcome!"));
+$smarty->assign('block1', _("This is the home of Feed-Collector, an database-driven news-reader. It is written to automaticaly collect news from other websites <acronym title=\"Resource Description Framework\">RDF</acronym>-, <acronym title=\"Really Simple Syndication\">RSS</acronym>- and <acronym title=\"Atom Syndication Formats\">ATOM</acronym>-newsfeeds and to display them to a user. There is no need to delete \"older news\", so you can come here anytime and search in the database"));
+$smarty->assign('block2', _("Users can register to this site. If they do so, they get a personal page displaying the news they are interested in. Once a user is logged in, he can modify his page by adding and removing news feeds. To do so, just go to the <a href=\"./page_select_feeds.php\">feed-overview-page</a> and select/deselect news feeds."));
// latest news
$latestnews = & $db->query("SELECT *, MAX( published ) AS published FROM news GROUP BY published DESC LIMIT 0 , 2;");
@@ -126,8 +122,7 @@
$design = str_replace("<!-- box 4 -->", $box_4, $design);
# footer
-require_once "./inc/footer.php";
-$design = str_replace("<!-- footer -->", $footer, $design);
-echo $design;
+//echo $design;
+$smarty->display("page_main.tpl");
?>
Modified: trunk/styles/default/page_header.tpl
===================================================================
--- trunk/styles/default/page_header.tpl 2007-06-04 16:08:57 UTC (rev 120)
+++ trunk/styles/default/page_header.tpl 2007-06-04 18:04:39 UTC (rev 121)
@@ -7,17 +7,18 @@
<div id="header">
<div class="superHeader">
<span>{$related_sites_str}</span>
-{foreach from=$related_sites_list key=title item=i name="related_sites"}
- <a href="{$i.href|escape:"url"}" title="{$title}">{$i.text}</a>
- {if $smarty.foreach.related_sites.last == 1 }
- |
+{foreach from=$related_sites_list item=i name="related_sites"}
+ {if $smarty.foreach.related_sites.last == 0 }
+ <a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a> |
+ {else}
+ <a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a>
{/if}
{/foreach}
</div>
<div class="midHeader">
- <h1 class=\"headerTitle\">{$page_title}</h1>
- <div class=\"headerSubTitle\" title=\"Message'\">
+ <h1 class="headerTitle">{$page_title}</h1>
+ <div class="headerSubTitle" title=\"Message'\">
{$sub_title}
</div>
@@ -30,14 +31,14 @@
<div class="subHeader">
<span class="doNotDisplay">Navigation:</span>
- <a href="./page_main.php" {$hl_page_main}>{$navi_home}</a> |
+ <a href="./page_main.php" {$hl_main}>{$navi_home}</a> |
<a href="./page_show_all_feeds.php" {$hl_show_all_feeds|default:""}>{$navi_show_all_feeds}</a> |
<a href="./page_show_feed_tag.php" {$hl_show_feed_tag|default:""}>{$navi_feeds_by_tag}</a> |
<a href="./page_add_new_feed.php" {$hl_add_new_feed|default:""}>{$navi_add_new_feed}</a> |
<a href="./page_show_feed.php" {$hl_show_feed|default:""}>{$navi_show_feed}</a> |
<a href="./page_add_tag.php?{$smarty.get.feed}" {$hl_add_tag|default:""}>{$navi_add_tag}</a> |
{if false == $smarty.session.logged_in|default:"false"}
- <a href="./page_login.php" {hl_$login}>{$navi_login}</a> |
+ <a href="./page_login.php" {$hl_login}>{$navi_login}</a> |
<a href="./page_register.php" {$hl_register}>{$navi_register}</a>
{else}
<a href="./page_personal.php" {$hl_personal}>{$navi_personal}</a> |
Modified: trunk/styles/default/page_main.tpl
===================================================================
--- trunk/styles/default/page_main.tpl 2007-06-04 16:08:57 UTC (rev 120)
+++ trunk/styles/default/page_main.tpl 2007-06-04 18:04:39 UTC (rev 121)
@@ -1,49 +1,21 @@
- <body>
- <!-- For non-visual user agents: -->
- <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div>
+{include file="html_header.tpl"}
+{include file="page_header.tpl"}
- <!-- ##### Header ##### -->
-
- <div id="header">
- <div class="superHeader">
- <span>{$related_sites_str}</span>
-{foreach from=$related_sites_list key=title item=i name="related_sites"}
- <a href="{$i.href|escape:"url"}" title="{$title}">{$i.text}</a>
- {if $smarty.foreach.related_sites.last == 1 }
- |
- {/if}
-{/foreach}
- </div>
-
- <div class="midHeader">
- <h1 class=\"headerTitle\">{$page_title}</h1>
- <div class=\"headerSubTitle\" title=\"Message'\">
- {$sub_title}
- </div>
-
- <br class="doNotDisplay doNotPrint" />
-
- <div class="headerLogin">
- <p>{$userstatus}</p>
- </div>
- </div>
-
- <div class="subHeader">
- <span class="doNotDisplay">Navigation:</span>
-
-<!-- navigation -->
- </div>
- </div>
-
<!-- ##### Main Copy ##### -->
<div id="main-copy">
<div class="rowOfBoxes">
<div class="twoThirds noBorderOnLeft">
-<!-- main -->
+ <h1>{$greeting}</h1>
+ <p>{$block1}</p>
+ <p>{$block2}</p>
</div>
<div class="oneThird">
+{foreach from=$related_sites_list item=i name="related_sites"}
+
+{/foreach}
+
<!-- latest news -->
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <C1...@us...> - 2007-06-04 22:54:49
|
Revision: 122
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=122&view=rev
Author: C167
Date: 2007-06-04 15:54:40 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
page_main.php working again, smarty working...
Modified Paths:
--------------
trunk/inc/config.php
trunk/page_main.php
trunk/styles/default/page_header.tpl
trunk/styles/default/page_main.tpl
Added Paths:
-----------
trunk/styles/default/page_footer.tpl
Removed Paths:
-------------
trunk/styles/default/footer.tpl
trunk/styles/default/header.tpl
Modified: trunk/inc/config.php
===================================================================
--- trunk/inc/config.php 2007-06-04 18:04:39 UTC (rev 121)
+++ trunk/inc/config.php 2007-06-04 22:54:40 UTC (rev 122)
@@ -20,6 +20,8 @@
$db['passwd'] = "feed-collector"; // The password of this user
$db['database'] = "feed-collector"; // The name of the database
+// admin-values
+$admin['email'] = "ex...@do...d";
// Session-configuration
$session['time']['expire'] = 60 * 60 * 24;
$session['time']['idle'] = 60 * 60;
Modified: trunk/page_main.php
===================================================================
--- trunk/page_main.php 2007-06-04 18:04:39 UTC (rev 121)
+++ trunk/page_main.php 2007-06-04 22:54:40 UTC (rev 122)
@@ -76,53 +76,57 @@
if (PEAR :: isError($latestnews)) {
echo $latestnews->getMessage();
}
-$latest_news = sprintf(" <h1>%s</h1>\n", _("Latest News"));
+$smarty->assign('latest_news_str', _("Latest News"));
+$i = 0;
while ($news = $latestnews->fetchRow()) {
- $latest_news .= sprintf(" <a href=\"./page_news.php?newsid=%d\" class=\"newsHeading\">%s</a>\n" .
- " <p class=\"newsDate\">%s</p>\n" .
- " <p class=\"newsSummary\">%s</p>\n\n", $news['id'], $news['headline'], date("D, d.m.Y - H:i", $news['published']), $news['summary']);
+ $latest_news_list[$i]['id'] = $news['id'];
+ $latest_news_list[$i]['headline'] = $news['headline'];
+ $latest_news_list[$i]['published'] = $news['published'];
+ $latest_news_list[$i]['summary'] = $news['summary'];
+ $i++;
}
-$latest_news .= sprintf(//" <div class=\"more\"><a href=\"./page_news.php\">%s</a></div>\n\n" .
-" <p class=\"filler\"><!-- Filler para to extend left vertical line --></p>", _("More News »"));
+$smarty->assign('latest_news_list', $latest_news_list);
+$smarty->assign('more_news', _("More News"));
-$design = str_replace("<!-- latest news -->", $latest_news, $design);
+// area 1
+$smarty->assign('statistic', _("Statistic"));
+$smarty->assign('feeds_in_db', _("Feeds in the Database"));
+$smarty->assign('val_feeds_in_db', $feed->stat_countFeeds());
+$smarty->assign('items_over_all', _("Items over all"));
+$smarty->assign('val_items_over_all', $feed->stat_countAllItems());
+$smarty->assign('avg_items_per_feed', _("Average items per feed"));
+$smarty->assign('val_avg_items_per_feed', $feed->stat_avgItemsPerFeed());
+$smarty->assign('atom10', _("[ATOM 1.0] feeds"));
+$smarty->assign('val_atom10', $feed->stat_countFeedTypes("ATOM 1.0"));
+$smarty->assign('rdf09', _("[RDF 0.9] feeds"));
+$smarty->assign('val_rdf09', $feed->stat_countFeedTypes("RDF 0.9"));
+$smarty->assign('rss20', _("[RSS 2.0] feeds"));
+$smarty->assign('val_rss20', $feed->stat_countFeedTypes("RSS 2.0"));
+$smarty->assign('rss10', _("[RSS 1.0] feeds"));
+$smarty->assign('val_rss10', $feed->stat_countFeedTypes("RSS 1.0"));
-// box 1
-$box_1 = sprintf(" <h1>%s</h1>\n <p>%s %d<br />\n %s %d<br />\n %s %d<br />\n </p>\n <p>\n %s %d<br />\n %s %d<br />\n %s %d<br />\n %s %d</p>", _("Statistic"), _("Fedds in the Database: "), $feed->stat_countFeeds(), _("Items over all:"), $feed->stat_countAllItems(), _("Average items per feed:"), $feed->stat_avgItemsPerFeed(), _("[ATOM 1.0] feeds:"), $feed->stat_countFeedTypes("ATOM 1.0"), _("[RDF 0.9] feeds:"), $feed->stat_countFeedTypes("RDF 0.9"), _("[RSS 2.0] feeds:"), $feed->stat_countFeedTypes("RSS 2.0"), _("[RSS 1.0] feeds"), $feed->stat_countFeedTypes("RSS 1.0"));
-$design = str_replace("<!-- box 1 -->", $box_1, $design);
+// area 2
+$biggest_feeds = 10;
+$smarty->assign('val_biggest_feeds', $biggest_feeds);
+$smarty->assign('biggest_feeds', _("biggest feeds"));
+$smarty->assign('biggest_feeds_list', $feed->getBiggestFeeds($biggest_feeds));
+$smarty->assign('items_str', _("Items"));
-// box 2
-$biggestfeeds = 10;
-$box_2 = sprintf(" <h1>%d %s</h1>\n <ul>\n", $biggestfeeds, _("biggest feeds"));
-$biggest_feeds = $feed->getBiggestFeeds($biggestfeeds);
-foreach ($biggest_feeds as $biggest) {
- $box_2 .= sprintf(" <li><a href=\"./page_show_feed.php?feed=%s\">%s (%d%s)</a> </li>\n", $biggest['feed_db_name'], $biggest['feed_name'], $biggest['items'], _(" Items"));
-}
-$box_2 .= " </ul>\n";
-$design = str_replace("<!-- box 2 -->", $box_2, $design);
+// area 3
+$random_feeds = 10;
+$smarty->assign('val_rand_feeds', $random_feeds);
+$smarty->assign('rand_feeds', _("random feeds"));
+$smarty->assign('random_feeds_list', $feed->getRandomFeeds($random_feeds));
-// box 3
-$newestfeeds = 10;
-$box_3 = sprintf(" <h1>%d %s</h1>\n <ul>\n", $newestfeeds, _("random feeds"));
-$random_feeds = $feed->getRandomFeeds($newestfeeds);
-foreach ($random_feeds as $randfeed) {
- $box_3 .= sprintf(" <li><a href=\"./page_show_feed.php?feed=%s\">%s (%d%s)</a> </li>\n", $randfeed['feed_db_name'], $randfeed['feed_name'], $randfeed['items'], _(" Items"));
-}
-$box_3 .= " </ul>\n";
+// area 4
+$newest_feeds = 6;
+$smarty->assign('val_newest_feeds', $newest_feeds);
+$smarty->assign('newest_feeds', _("Newest feeds"));
+$smarty->assign('newest_feeds_list', $feed->getNewestFeeds($newest_feeds));
-$design = str_replace("<!-- box 3 -->", $box_3, $design);
-
-// box 4
-$box_4 = sprintf(" <h1>%s</h1>\n <ul>\n", _("Newest feeds"));
-$newest_feeds = $feed->getNewestFeeds(6);
-foreach ($newest_feeds as $newest) {
- $box_4 .= sprintf(" <li><a href=\"./page_show_feed.php?feed=%s\"><!--•-->%s</a> %s (%d%s)</li>\n", $newest['feed_db_name'], $newest['feed_name'], date(("d.m.y H:m:s"), $newest['added']), $newest['items'], _(" Items"));
-}
-$box_4 .= " </ul>";
-$design = str_replace("<!-- box 4 -->", $box_4, $design);
-
# footer
+$smarty->assign('admin_email', $admin['email']);
+$smarty->assign('updated', _("Updated"));
-//echo $design;
$smarty->display("page_main.tpl");
?>
Deleted: trunk/styles/default/footer.tpl
===================================================================
--- trunk/styles/default/footer.tpl 2007-06-04 18:04:39 UTC (rev 121)
+++ trunk/styles/default/footer.tpl 2007-06-04 22:54:40 UTC (rev 122)
@@ -1,15 +0,0 @@
- <!-- ##### Footer ##### -->
-
- <div id="footer">
- <span class="doNotPrint">
- For comments or questions about this website, please
- {mailto address=$admin_email encode="javascript" title=$admin_email_title text="email the webmaster"}
- </span>
- • <strong>{$updated} »</strong> {$smarty.now|date_format:"%Y-%m-%d"}
- <span class="doNotPrint">
- <a href="http://validator.w3.org/check?uri=referer"><img src="styles/default/images/valid-xhtml11-blue.png" alt="Valid XHTML 1.1" /></a>
- <a href="http://jigsaw.w3.org/css-validator/"><img src="styles/default/images/valid-css2-blue.png" alt="Valid CSS 2" /></a>
- </span>
- </div>
- </body>
-</html>
Deleted: trunk/styles/default/header.tpl
===================================================================
--- trunk/styles/default/header.tpl 2007-06-04 18:04:39 UTC (rev 121)
+++ trunk/styles/default/header.tpl 2007-06-04 22:54:40 UTC (rev 122)
@@ -1,17 +0,0 @@
-<?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" />
-
- <link rel="stylesheet" type="text/css" href="./styles/default/css/page_main-screen.css" media="screen, tv, projection" title="Default" />
- <link rel="stylesheet" type="text/css" href="./styles/default/css/common-screen.css" media="screen, tv, projection" title="Default" />
- <link rel="stylesheet" type="text/css" href="./styles/default/css/header-screen.css" media="screen, tv, projection" title="Default" />
- <link rel="stylesheet" type="text/css" href="./styles/default/css/main_copy-screen.css" media="screen, tv, projection" title="Default" />
- <link rel="stylesheet" type="text/css" href="./styles/default/css/footer-screen.css" media="screen, tv, projection" title="Default" />
-
- <title>{$title}</title>
- </head>
Copied: trunk/styles/default/page_footer.tpl (from rev 119, trunk/styles/default/footer.tpl)
===================================================================
--- trunk/styles/default/page_footer.tpl (rev 0)
+++ trunk/styles/default/page_footer.tpl 2007-06-04 22:54:40 UTC (rev 122)
@@ -0,0 +1,15 @@
+ <!-- ##### Footer ##### -->
+
+ <div id="footer">
+ <span class="doNotPrint">
+ For comments or questions about this website, please
+ {mailto address=$admin_email encode="javascript" title=$admin_email_title text="email the webmaster"}<br />
+ </span>
+ • <strong>{$updated} »</strong> {$smarty.now|date_format:"%Y-%m-%d"}<br />
+ <span class="doNotPrint">
+ <a href="http://validator.w3.org/check?uri=referer"><img src="styles/default/images/valid-xhtml11-blue.png" alt="Valid XHTML 1.1" /></a>
+ <a href="http://jigsaw.w3.org/css-validator/"><img src="styles/default/images/valid-css2-blue.png" alt="Valid CSS 2" /></a>
+ </span>
+ </div>
+ </body>
+</html>
Modified: trunk/styles/default/page_header.tpl
===================================================================
--- trunk/styles/default/page_header.tpl 2007-06-04 18:04:39 UTC (rev 121)
+++ trunk/styles/default/page_header.tpl 2007-06-04 22:54:40 UTC (rev 122)
@@ -9,16 +9,16 @@
<span>{$related_sites_str}</span>
{foreach from=$related_sites_list item=i name="related_sites"}
{if $smarty.foreach.related_sites.last == 0 }
- <a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a> |
+ <a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a> |
{else}
- <a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a>
+<a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a>
{/if}
{/foreach}
</div>
<div class="midHeader">
<h1 class="headerTitle">{$page_title}</h1>
- <div class="headerSubTitle" title=\"Message'\">
+ <div class="headerSubTitle" title="Message">
{$sub_title}
</div>
Modified: trunk/styles/default/page_main.tpl
===================================================================
--- trunk/styles/default/page_main.tpl 2007-06-04 18:04:39 UTC (rev 121)
+++ trunk/styles/default/page_main.tpl 2007-06-04 22:54:40 UTC (rev 122)
@@ -12,29 +12,59 @@
</div>
<div class="oneThird">
-{foreach from=$related_sites_list item=i name="related_sites"}
-
+ <h1>{$latest_news_str}</h1>
+{foreach from=$latest_news_list item=i name="latest_news"}
+ <a href="./page_news.php?newsid={$i.id}" class="newsHeading">{$i.headline}</a>
+ <p class="newsDate">{$i.published|date_format:"%a, %d.%m.%Y - %H:%M"}</p>
+ <p class="newsSummary">{$i.summary}</p>
{/foreach}
-
- <!-- latest news -->
+ <div class="more"><a href="./page_news.php">{$more_news} »</a></div>
+ <p class="filler"><!-- Filler para to extend left vertical line --></p>
</div>
</div>
<div class="rowOfBoxes dividingBorderAbove">
<div class="quarter noBorderOnLeft">
-<!-- box 1 -->
+ <h1>{$statistic}</h1>
+ <p>
+ {$feeds_in_db}: {$val_feeds_in_db}<br />
+ {$items_over_all}: {$val_items_over_all}<br />
+ {$avg_items_per_feed}: {$val_avg_items_per_feed}<br />
+ </p>
+ <p>
+ {$atom10}: {$val_atom10}<br />
+ {$rdf09}: {$val_rdf09}<br />
+ {$rss20}: {$val_rss20}<br />
+ {$rss10}: {$val_rss10}
+ </p>
</div>
<div class="quarter">
-<!-- box 2 -->
+ <h1>{$val_biggest_feeds} {$biggest_feeds}</h1>
+ <ul>
+{foreach from=$biggest_feeds_list item=i name="biggest_feeds"}
+ <li><a href="./page_show_feed.php?feed={$i.feed_db_name}">{$i.feed_name} ({$i.items} {$items_str})</a></li>
+{/foreach}
+ </ul>
</div>
<div class="quarter">
-<!-- box 3 -->
- </div>
+ <h1>{$val_rand_feeds} {$rand_feeds}</h1>
+ <ul>
+{foreach from=$random_feeds_list item=i name="random_feeds"}
+ <li><a href="./page_show_feed.php?feed={$i.feed_db_name}">{$i.feed_name} ({$i.items} {$items_str})</a></li>
+{/foreach}
+ </ul>
+ </div>
<div class="quarter">
-<!-- box 4 -->
+ <h1>{$val_newest_feeds} {$newest_feeds}</h1>
+ <ul>
+{foreach from=$newest_feeds_list item=i name="newest_feeds"}
+ <li><a href="./page_show_feed.php?feed={$i.feed_db_name}">{$i.feed_name}</a> {$i.added|date_format:"%d.%m.%y %H:%M:%S"} ({$i.items} {$items_str})</li>
+{/foreach}
+ </ul>
</div>
</div>
</div>
+{include file="page_footer.tpl"}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <C1...@us...> - 2007-06-05 18:05:19
|
Revision: 123
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=123&view=rev
Author: C167
Date: 2007-06-05 11:05:20 -0700 (Tue, 05 Jun 2007)
Log Message:
-----------
some changes, still page_show_all_feeds.php not working
Modified Paths:
--------------
trunk/page_main.php
trunk/page_show_all_feeds.php
trunk/styles/default/page_footer.tpl
trunk/styles/default/page_header.tpl
trunk/styles/default/page_show_all_feeds.tpl
Modified: trunk/page_main.php
===================================================================
--- trunk/page_main.php 2007-06-04 22:54:40 UTC (rev 122)
+++ trunk/page_main.php 2007-06-05 18:05:20 UTC (rev 123)
@@ -11,6 +11,7 @@
require_once "inc/config.php";
error_reporting(E_ALL);
+
/* DATABASE */
require_once "./inc/database.php";
@@ -43,13 +44,9 @@
// Now we're going to replace the placeholders in the template with the important content
//
-// get the design
-$design = "styles/$style/page_$page.tpl";
-
# header
// title
$smarty->assign('title', "Feed-Collector");
-//$design = str_replace("<!-- title -->", $title, $design);
# body
// related sites
Modified: trunk/page_show_all_feeds.php
===================================================================
--- trunk/page_show_all_feeds.php 2007-06-04 22:54:40 UTC (rev 122)
+++ trunk/page_show_all_feeds.php 2007-06-05 18:05:20 UTC (rev 123)
@@ -11,135 +11,118 @@
require_once "inc/config.php";
error_reporting(E_ALL);
-############
-# DATABASE #
-############
+
+/* DATABASE */
require_once "./inc/database.php";
-###########
-# SESSION #
-###########
+/* SESSION */
require_once "./inc/session.php";
-#########
-# FEEDS #
-#########
+/* FEEDS */
require_once "class/Feed_manager.php";
$feed = new Feed_manager($db);
-############
-# LANGUAGE #
-############
+/* HTTP-Basis */
require_once "HTTP.php";
-$language = HTTP :: negotiateLanguage($langs, "en_EN");
+//$language = HTTP :: negotiateLanguage($langs, "en_EN");
-################
-# User-Manager #
-################
+/* User-Manager */
require_once "class/User_manager.php";
-$user = new User_manager($db);
+$user_manager = new User_manager($db);
-###############
-# Tag-Manager #
-###############
+/* Tag-Manager */
require_once "class/Tag_manager.php";
$tag_manager = new Tag_Manager($db);
-####################################
-# Working with the users feed-list #
-####################################
+/* Working with the users feed-list */
if(isset($_POST) and isset($_POST['feed'])) {
$_POST['feed'] = $user->createColumnString($_POST['feed']);
$user->updateUserCols(HTTP_Session :: get("uid"), $_POST['feed']);
}
+/* STYLE */
+require_once "inc/styles.php";
+
$page = "show_all_feeds";
-############
-# LANGUAGE #
-############
+/* LANGUAGE */
require_once "./inc/language.php";
+/* SMARTY */
+require_once "inc/smarty.php";
+
//
// Now we're going to replace the placeholders in the template with the important content
//
-// get the design
-$design = file_get_contents("styles/default/page_show_all_feeds.tpl", 'r');
-
# header
// title
-$title = "Feed-Collector";
-$design = str_replace("<!-- title -->", $title, $design);
+$smarty->assign('title', "Feed-Collector");
# body
// 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
-if (true === HTTP_Session :: get("logged_in", false)) {
- $main = createSelectionForm($feed, $tag_manager, $user);
+$feeds = $feed->getFeeds();
+if(false !== $feeds) {
+ $n_cols = 4;
+ if (true === HTTP_Session :: get("logged_in", false)) {
+ $n_cols = 5;
+ $user_cols = $user_manager->getUserCols(HTTP_Session :: get("uid"));
+ }
+ $smarty->assign('cb_name', "feed[]");
+ $smarty->assign('feed_list_str', _("Feed list"));
+ $smarty->assign('site_str', _("Site"));
+ $smarty->assign('tags_str', _("Tags"));
+ $smarty->assign('language', _("Language"));
+ $smarty->assign('n_cols', $n_cols);
+ $feed_list = array();
+ $i = 0;
+ foreach($feeds as $list) {
+ $feed_list[$i] = $list;
+ if(true === HTTP_Session :: get("logged_in", false) and in_array($list['feed_url'], $user_cols)) {
+ $feed_list[$i]['checked'] = true;
+ }
+ if(false === $tag_manager->hasTags($list['feed_url'])) {
+ $feed_list['has_tags'] = false;
+ } else {
+ $feed_list[$i]['tag_list'] = $tag_manager->getTags($list['feed_url']);
+ }
+ }
+ $smarty->assign('feed_list', $feed_list);
} else {
- $main = createSelectionTable($feed, $tag_manager);
+ $smarty->assign('error', true);
}
-$design = str_replace("<!-- main -->", $main, $design);
// page-navigation
//$page_navigation = displayPageNavi($maxpages, detectActualPage($maxpages));
//$design = str_replace("<!-- page-navigation -->", $page_navigation, $design);
# footer
-require_once "./inc/footer.php";
-$design = str_replace("<!-- footer -->", $footer, $design);
+$smarty->assign('admin_email', $admin['email']);
+$smarty->assign('updated', _("Updated"));
-echo $design;
+$smarty->display("page_show_all_feeds.tpl");
-function createSelectionForm($feed, $tag_manager, $user_manager) {
- $feeds = $feed->getFeeds();
- if (false === $feeds) {
- return "error!!!";
- }
- $return = sprintf(" <form action=\"%s\" method=\"post\">\n", $_SERVER['PHP_SELF']);
- $return .= sprintf(" <table summary=\"\" >\n" .
- " <tr>\n" .
- " <th colspan=\"5\" class=\"submit\"><input type=\"submit\" name=\"Submit\" value=\"%s\" /></th>\n" .
- " </tr>\n" .
- " <tr>\n" .
- " <th> </th>\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", _("Submit"), _("Feed List"), _("Site"), _("Tags"), _("Languages"));
+
+//----------------------------
foreach ($feeds as $list) {
+ $return = "";
$user_cols = $user_manager->getUserCols(HTTP_Session :: get("uid"));
-
- $return .= " <tr>\n";
- if(in_array($list['feed_url'], $user_cols)) {
- $return .= sprintf(" <td class=\"checked\"><input type=\"checkbox\" name=\"feed[]\" value=\"%s\" checked=\"checked\" /></td>\n", $list['feed_url']);
- } else {
- $return .= sprintf(" <td><input type=\"checkbox\" name=\"feed[]\" value=\"%s\" /></td>\n", $list['feed_url']);
- }
-
- $return .= sprintf(
- " <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(in_array($list['feed_url'], $user_cols)) {}
if (false === $tag_manager->hasTags($list['feed_url'])) {
- $return .= " <td> </td>\n";
} else {
$tags = $tag_manager->getTags($list['feed_url']);
if (count($tags) == 1) {
@@ -164,9 +147,8 @@
" <th colspan=\"5\" class=\"submit\"><input type=\"submit\" name=\"Submit\" value=\"%s\" /></th>\n" .
" </tr>\n" .
" </table>\n </form>", _("Submit"));
- return $return;
-}
+
function createSelectionTable($feed, $tag_manager) {
$items = $feed->getFeeds();
if (false === $items) {
@@ -241,4 +223,4 @@
settype($page, 'int');
return $page;
}
-?>
\ No newline at end of file
+?>
Modified: trunk/styles/default/page_footer.tpl
===================================================================
--- trunk/styles/default/page_footer.tpl 2007-06-04 22:54:40 UTC (rev 122)
+++ trunk/styles/default/page_footer.tpl 2007-06-05 18:05:20 UTC (rev 123)
@@ -7,8 +7,8 @@
</span>
• <strong>{$updated} »</strong> {$smarty.now|date_format:"%Y-%m-%d"}<br />
<span class="doNotPrint">
- <a href="http://validator.w3.org/check?uri=referer"><img src="styles/default/images/valid-xhtml11-blue.png" alt="Valid XHTML 1.1" /></a>
- <a href="http://jigsaw.w3.org/css-validator/"><img src="styles/default/images/valid-css2-blue.png" alt="Valid CSS 2" /></a>
+ {html_image file="styles/default/images/valid-xhtml11-blue.png" alt="Valid XHTML 1.1" href="http://validator.w3.org/check?uri=referer"}
+ {html_image file="styles/default/images/valid-css2-blue.png" alt="Valid CSS 2" href="http://jigsaw.w3.org/css-validator/"}
</span>
</div>
</body>
Modified: trunk/styles/default/page_header.tpl
===================================================================
--- trunk/styles/default/page_header.tpl 2007-06-04 22:54:40 UTC (rev 122)
+++ trunk/styles/default/page_header.tpl 2007-06-05 18:05:20 UTC (rev 123)
@@ -1,3 +1,4 @@
+
<body>
<!-- For non-visual user agents: -->
<div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div>
Modified: trunk/styles/default/page_show_all_feeds.tpl
===================================================================
--- trunk/styles/default/page_show_all_feeds.tpl 2007-06-04 22:54:40 UTC (rev 122)
+++ trunk/styles/default/page_show_all_feeds.tpl 2007-06-05 18:05:20 UTC (rev 123)
@@ -1,66 +1,77 @@
-<?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"}
+
+ <!-- ##### Main Copy ##### -->
- <link rel="stylesheet" type="text/css" href="./styles/default/page_show_all_feeds-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">
- <span class="doNotDisplay">Navigation:</span>
-<!-- navigation -->
- </div>
- </div>
-
- <!-- ##### Main Copy ##### -->
-
<div id="main-copy">
<div class="rowOfBoxes">
+{if !$error}
<div id="feed_form">
-<!-- main -->
- </div>
+ {assign var="n_cols" value=3}
+ {if true === $smarty.session.logged_in}
+ {assign var="n_cols" value=4}
+ {/if}
+ <form action="{$smarty.server.PHP_SELF}" method="post">
+ <table summary="{$feeds_table_summary|default:"feed form"}" >
+ <thead>
+ {if $smarty.session.logged_in}
+ <tr>
+ <th colspan="{$n_cols}" class="submit"><input type="submit" name="Submit" value="{$submit}" /></th>
+ </tr>
+ {/if}
+ <tr>
+ {if $smarty.session.logged_in === true}
+ <th> </th>
+ {/if}
+ <th>{$feed_list_str}</th>
+ <th>{$site_str}</th>
+ <th>{$tags_str}</th>
+ <th class="language_flag">{html_image file="pic/lang/International.gif" alt=$languages}</th>
+ </tr>
+ </thead>
+ {if $smarty.session.logged_in}
+ <tfoot>
+ <tr>
+ <th colspan="{$n_cols}" class="submit"><input type="submit" name="Submit" value="{$submit}" /></th>
+ </tr>
+ </tfoot>
+ {/if}
+ <tbody>
+{foreach from=$feed_list item=i name="feed_list"}
+ <tr>
+ {if $smarty.session.logged_in == false}
+ {if $i.checked === true}
+ <td class="checked"><input type="checkbox" name="{$cb_name}" value="{$i.feed_url}" checked="checked" /></td>
+ {else}
+ <td><input type="checkbox" name="{$cb_name}" value="{$i.feed_url}" /></td>
+ {/if}
+ {/if}
+ <td><a href="./page_show_feed?feed={$i.feed_url}">{$i.feed_name}</a></td>
+ <td><a href="{$i.site_url}">{$i.site_name}</a></td>
+ {if $i.has_tags === true}
+ <td>
+ {foreach from=$i.tag_list item=j name="tag_list"}
+ <a href="./page_show_feed_tag.php?tag={$j|escape:"url"}">{$j}</a></td>
+ {/foreach}
+ </td>
+ {else}
+ <td> </td>
+ {/if}
+ </tr>
+{/foreach}
+ </tbody>
+ </table>
+ </form>
+ </div>
</div>
<div id="page-navigation">
-<!-- page-navigation -->
+{foreach from=$navigation_list item=i name="navi_list"}
+
+{/foreach}
</div>
- </div>
+{else}
- <!-- ##### Footer ##### -->
-
- <div id="footer">
-<!-- footer -->
+{/if}
</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.
|
|
From: <C1...@us...> - 2007-06-06 09:27:41
|
Revision: 124
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=124&view=rev
Author: C167
Date: 2007-06-06 02:27:22 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
Login works, simple change in html_header: now the page-style changes automaticaly
Modified Paths:
--------------
trunk/inc/smarty.php
trunk/page_login.php
trunk/styles/default/html_header.tpl
trunk/styles/default/page_login.tpl
Modified: trunk/inc/smarty.php
===================================================================
--- trunk/inc/smarty.php 2007-06-05 18:05:20 UTC (rev 123)
+++ trunk/inc/smarty.php 2007-06-06 09:27:22 UTC (rev 124)
@@ -15,3 +15,6 @@
$smarty->compile_dir = $sm['compile_dir'];
$smarty->config_dir = $sm['config_dir'];
$smarty->cache_dir = $sm['cache_dir'];
+
+$smarty->assign('page', $page);
+?>
Modified: trunk/page_login.php
===================================================================
--- trunk/page_login.php 2007-06-05 18:05:20 UTC (rev 123)
+++ trunk/page_login.php 2007-06-06 09:27:22 UTC (rev 124)
@@ -12,44 +12,40 @@
require_once "inc/config.php";
error_reporting(E_ALL);
-###############
-# DEFINITIONS #
-###############
+/* DEFINITIONS */
define('FC_PASS_OK', 0);
define('FC_PASS_TOO_SHORT', 1);
-############
-# DATABASE #
-############
+/* DATABASE */
require_once "./inc/database.php";
-###########
-# SESSION #
-###########
+/* SESSION */
require_once "./inc/session.php";
-##############
-# HTTP-Class #
-##############
+/* HTTP-Class */
require_once "HTTP.php";
+/* STYLE */
+require_once "inc/styles.php";
+
$page = "login";
-############
-# LANGUAGE #
-############
+/* LANGUAGE */
require_once "./inc/language.php";
-################
-# User-Manager #
-################
+/* SMARTY */
+require_once "inc/smarty.php";
+
+/* User-Manager */
require_once "class/User_manager.php";
$user = new User_manager($db);
+$error = LOGIN_SUCCESSFULL;
+
if (false === HTTP_Session :: get("logged_in", false)) {
if (isset ($_POST['submit'])) {
if (empty ($_POST['username']) or empty ($_POST['passwd'])) {
- $main = displayLoginForm(LOGIN_WRONG_VALUES);
+ $error = LOGIN_WRONG_VALUES;
} else {
$login = $user->loginUser($_POST['username'], md5($_POST['passwd']));
switch ($login['state']) {
@@ -68,115 +64,61 @@
}
break;
case LOGIN_WRONG_VALUES :
- $main = displayLoginForm(LOGIN_WRONG_VALUES);
+ $error = LOGIN_WRONG_VALUES;
HTTP_Session :: set("logged_in", false);
break;
case LOGIN_INACTIVE :
- $main = displayLoginForm(LOGIN_INACTIVE);
+ $error = LOGIN_INACTIVE;
HTTP_Session :: set("logged_in", false);
break;
default :
- $main = displayLoginForm(LOGIN_WRONG_VALUES);
+ $error = LOGIN_WRONG_VALUES;
}
}
- } else {
- $main = displayLoginForm();
}
} else {
HTTP :: redirect("./page_main.php");
}
-#####################
-# BUILD THE CONTENT #
-#####################
-// get the design
-$design = file_get_contents("styles/default/page_login.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);
+switch ($error) {
+ case LOGIN_WRONG_VALUES :
+ $smarty->assign('message', _("Unknown username. If you don't have a username then please <a href=\"./page_register.php\">register</a> a new one"));
+ break;
+ case LOGIN_INACTIVE :
+ $smarty->assign('message', _("This useraccount is not active. You should have received a mail with an access-key. If not, please look at your spam-folder or send a mail to the site-admin."));
+ break;
+ default :
+ $smarty->assign('message', _("Please enter your username and your password to login. Cookies have to be enabled from this point."));
+}
+$smarty->assign('login', _("Login"));
+$smarty->assign('username', _("Username"));
+$smarty->assign('password', _("Password"));
+$smarty->assign('submit', _("Submit!"));
+$smarty->assign('reset', _("Reset!"));
# footer
-require_once "./inc/footer.php";
-$design = str_replace("<!-- footer -->", $footer, $design);
+$smarty->assign('admin_email', $admin['email']);
+$smarty->assign('updated', _("Updated"));
-echo $design;
-
-function displayLoginForm($error = null) {
- if (!is_null($error)) {
- switch ($error) {
- case LOGIN_WRONG_VALUES :
- $message = sprintf(" <p>%s</p>\n", _("Unknown username. If you don't have a username then please <a href=\"./page_register.php\">register</a> a new one"));
- break;
- case LOGIN_INACTIVE :
- $message = sprintf(" <p>%s</p>\n", _("This useraccount is not active. You should have received a mail with an access-key. If not, please look at your spam-folder or send a mail to the site-admin."));
- break;
- default :
- $message = sprintf(" <p>%s</p>\n", _("Please enter your username and your password to login. Cookies have to be enabled from this point."));
- }
- } else {
- $message = sprintf(" <p>%s</p>\n", _("Please enter your username and your password to login. Cookies have to be enabled from this point."));
-
- }
- $form = sprintf(" <div id=\"registration_form\">\n" .
- " <form action=\"%s\" method=\"post\" accept-charset=\"UTF-8\">\n" .
- "$message" .
- " <table summary=\"\">\n" .
- " <tr id=\"formtitle\">\n" .
- " <th colspan=\"2\">%s</th>\n" .
- " </tr>\n" .
- " <tr>\n" .
- " <td class=\"formElem\">%s</td>\n" .
- " <td class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" onfocus=\"if (this.value=='Login') this.value=''\" /></td>\n" .
- " </tr>\n" .
- " <tr>\n" .
- " <td class=\"formElem\">%s</td>\n" .
- " <td class=\"formField\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" onfocus=\"if (this.value=='Passwordezz') this.value=''\" /></td>\n" .
- " </tr>\n" .
- " <tr id=\"formButtons\">\n" .
- " <td colspan=\"2\"><input type=\"submit\" value=\"%s\" name=\"submit\" /><input type=\"reset\" value=\"%s\" /></td>\n" .
- " </tr>\n" .
- " </table>\n" .
- " <input type=\"hidden\" name=\"cameFrom\" value=\"%s\" />\n" .
- " </form>\n" .
- " </div>\n", $_SERVER['PHP_SELF'], _("Login"), _("Username"), _("Password"), _("Submit!"), _("Reset!"), !empty ($_GET['cameFrom']) ? $_GET['cameFrom'] : "");
- return $form;
-}
-
-function filterInput($input, $type) {
- $inhalt = trim($inhalt);
- $inhalt = htmlspecialchars($inhalt);
- switch ($type) {
- case "username" :
-
- break;
- case "mail" :
-
- break;
- }
-
- return $inhalt;
-}
+$smarty->display('page_login.tpl');
?>
Modified: trunk/styles/default/html_header.tpl
===================================================================
--- trunk/styles/default/html_header.tpl 2007-06-05 18:05:20 UTC (rev 123)
+++ trunk/styles/default/html_header.tpl 2007-06-06 09:27:22 UTC (rev 124)
@@ -7,7 +7,7 @@
<meta name="author" content="haran" />
<meta name="generator" content="haran" />
- <link rel="stylesheet" type="text/css" href="./styles/default/css/page_main-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/css/page_{$page}-screen.css" media="screen, tv, projection" title="Default" />
<link rel="stylesheet" type="text/css" href="./styles/default/css/common-screen.css" media="screen, tv, projection" title="Default" />
<link rel="stylesheet" type="text/css" href="./styles/default/css/header-screen.css" media="screen, tv, projection" title="Default" />
<link rel="stylesheet" type="text/css" href="./styles/default/css/main_copy-screen.css" media="screen, tv, projection" title="Default" />
Modified: trunk/styles/default/page_login.tpl
===================================================================
--- trunk/styles/default/page_login.tpl 2007-06-05 18:05:20 UTC (rev 123)
+++ trunk/styles/default/page_login.tpl 2007-06-06 09:27:22 UTC (rev 124)
@@ -1,31 +1,31 @@
- <body>
- <!-- For non-visual user agents: -->
- <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div>
+{include file="html_header.tpl"}
+{include file="page_header.tpl"}
- <!-- ##### Header ##### -->
+ <!-- ##### Main Copy ##### -->
- <div id="header">
- <div class="superHeader">
-<!-- related sites -->
+ <div id="main-copy">
+ <div id="registration_form">
+ <form action="{$smarty.server.PHP_SELF}" method="post" accept-charset="UTF-8">
+ <p>{$message}</p>
+ <table summary="{$table_summary|default:""}">
+ <tr id="formtitle">
+ <th colspan="2">{$login}</th>
+ </tr>
+ <tr>
+ <td class="formElem">{$username}</td>
+ <td class="formField"><input type="text" name="username" size="30" maxlength="30" onfocus="if (this.value=='Login') this.value=''" /></td>
+ </tr>
+ <tr>
+ <td class="formElem">{$password}</td>
+ <td class="formField"><input type="password" name="passwd" size="30" maxlength="30" onfocus="if (this.value=='Passwordezz') this.value=''" /></td>
+ </tr>
+ <tr id="formButtons">
+ <td colspan="2"><input type="submit" value="{$submit}" name="submit" /><input type="reset" value="{$reset}" /></td>
+ </tr>
+ </table>
+ <input type="hidden" name="cameFrom" value="{$smarty.get.cameFrom|default:""}" />
+ </form>
</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 id="main-copy">
-<!-- main -->
- </div>
+{include file="page_footer.tpl}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <C1...@us...> - 2007-06-06 17:02:58
|
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> </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.
|
|
From: <C1...@us...> - 2007-06-06 17:30:24
|
Revision: 127
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=127&view=rev
Author: C167
Date: 2007-06-06 10:27:50 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
show_feed_tag now working
Modified Paths:
--------------
trunk/page_show_feed_tag.php
trunk/styles/default/page_show_feed_tag.tpl
Modified: trunk/page_show_feed_tag.php
===================================================================
--- trunk/page_show_feed_tag.php 2007-06-06 16:54:31 UTC (rev 126)
+++ trunk/page_show_feed_tag.php 2007-06-06 17:27:50 UTC (rev 127)
@@ -78,13 +78,16 @@
$feed_list = array ();
foreach ($feed_manager->getSpecFeeds($feeds) as $list) {
$feed_list[$i] = $list;
+ $feed_list[$i]['site_lang'] = "pic/lang/".$list['site_lang'].".gif";
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 {
$feed_list[$i]['hast_tags'] = false;
}
+ $i++;
}
+ $smarty->assign('feed_list', $feed_list);
}
}
Modified: trunk/styles/default/page_show_feed_tag.tpl
===================================================================
--- trunk/styles/default/page_show_feed_tag.tpl 2007-06-06 16:54:31 UTC (rev 126)
+++ trunk/styles/default/page_show_feed_tag.tpl 2007-06-06 17:27:50 UTC (rev 127)
@@ -42,7 +42,7 @@
{/foreach}
</td>
{/if}
- <td class="right_side">{html_image file="pic/lang/{$i.site_lang}.gif alt=$i.site_lang}</td>
+ <td class="right_side">{html_image file=$i.site_lang alt=$i.site_lang}</td>
</tr>
{/foreach}
</tbody>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X