feed-collector-svn Mailing List for news collector and viewer (Page 2)
Status: Beta
Brought to you by:
c167
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(5) |
Nov
(9) |
Dec
(23) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(22) |
Feb
(1) |
Mar
|
Apr
|
May
(7) |
Jun
(15) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
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-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-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-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-09 21:45:27
|
Revision: 98 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=98&view=rev Author: c167 Date: 2007-01-09 13:45:26 -0800 (Tue, 09 Jan 2007) Log Message: ----------- Modified Paths: -------------- trunk/class/Feed_manager.php trunk/inc/config.php trunk/inc/navigation.php trunk/page_add_tag.php trunk/page_login.php trunk/page_show_all_feeds.php trunk/page_show_feed.php trunk/page_show_feed_tag.php trunk/styles/default/page_add_new_feed-screen.css trunk/styles/default/page_add_new_feed.tpl trunk/styles/default/page_add_tag-screen.css trunk/styles/default/page_add_tag.tpl trunk/styles/default/page_login-screen.css trunk/styles/default/page_login.tpl trunk/styles/default/page_main-screen.css trunk/styles/default/page_main.tpl trunk/styles/default/page_personal-screen.css trunk/styles/default/page_personal.tpl trunk/styles/default/page_register-screen.css trunk/styles/default/page_register.tpl trunk/styles/default/page_show_all_feeds-screen.css trunk/styles/default/page_show_all_feeds.tpl trunk/styles/default/page_show_feed-screen.css trunk/styles/default/page_show_feed.tpl trunk/styles/default/page_show_feed_tag-screen.css trunk/styles/default/page_show_feed_tag.tpl Added Paths: ----------- trunk/i18n/de_DE/LC_MESSAGES/navigation.mo trunk/i18n/de_DE/LC_MESSAGES/navigation.po 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 Modified: trunk/class/Feed_manager.php =================================================================== --- trunk/class/Feed_manager.php 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/class/Feed_manager.php 2007-01-09 21:45:26 UTC (rev 98) @@ -217,12 +217,15 @@ public function getSpecFeeds($feed) { $i = 0; foreach ($feed as $oneFeed) { - $query = $this->mdb->query("SELECT id, feed_name, feed_db_name, feed_lang FROM feeds WHERE feed_db_name = '$oneFeed';"); + $query = $this->mdb->query("SELECT id, site_name, site_url, site_lang, feed_name, feed_db_name, feed_lang FROM feeds WHERE feed_db_name = '$oneFeed';"); if (PEAR :: isError($query)) { continue; } $row = $query->fetchRow(); $return[$i]['id'] = $row['id']; + $return[$i]['site_name'] = $row['site_name']; + $return[$i]['site_url'] = $row['site_url']; + $return[$i]['site_lang'] = $row['site_lang']; $return[$i]['feed_name'] = $row['feed_name']; $return[$i]['feed_url'] = $row['feed_db_name']; $return[$i]['feed_lang'] = $row['feed_lang']; Added: trunk/i18n/de_DE/LC_MESSAGES/navigation.mo =================================================================== (Binary files differ) Property changes on: trunk/i18n/de_DE/LC_MESSAGES/navigation.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/i18n/de_DE/LC_MESSAGES/navigation.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/navigation.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/navigation.po 2007-01-09 21:45:26 UTC (rev 98) @@ -0,0 +1,58 @@ +# translation of navigation.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: 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" +"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" + +#: navigation.php:60 +msgid "Home" +msgstr "Home" + +#: navigation.php:60 +msgid "Show all Feeds" +msgstr "Alle Feeds" + +#: navigation.php:60 +msgid "Feeds by TAG" +msgstr "Feeds nach TAG" + +#: navigation.php:60 +msgid "Add a Feed" +msgstr "Feed hinzufügen" + +#: navigation.php:60 +msgid "Display a Feed" +msgstr "Feed anzeigen" + +#: navigation.php:60 +msgid "Add a Tag" +msgstr "Tag hinzufügen" + +#: navigation.php:63 +msgid "Login" +msgstr "Anmelden" + +#: navigation.php:63 +msgid "Register" +msgstr "Registrieren" + +#: navigation.php:66 +msgid "Personal Page" +msgstr "Persönliche Seite" + +#: navigation.php:66 +msgid "LogOut" +msgstr "Abmelden" + Modified: trunk/inc/config.php =================================================================== --- trunk/inc/config.php 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/inc/config.php 2007-01-09 21:45:26 UTC (rev 98) @@ -1,4 +1,5 @@ <?php + /* * This is the main configuration-file * It will store the basic information @@ -10,33 +11,39 @@ * CONFIGURATION * You may change the values in this section to your needs */ - + // 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['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; -$session['time']['idle'] = 60*60; +$session['time']['expire'] = 60 * 60 * 24; +$session['time']['idle'] = 60 * 60; $session['container']['tablename'] = "sessiondata"; $session['container']['autooptimisation_allowed'] = true; // Update-configuration -$update['enabled'] = true; +$update['enabled'] = true; $update['difference'] = 1800; -$update['loglevel'] = PEAR_LOG_NOTICE; +$update['loglevel'] = PEAR_LOG_NOTICE; // Valid pages -$validPages[] = "page_main.php"; -$validPages[] = "page_register"; -$validPages[] = "page_login.php"; -$validPages[] = "page_show_feeds.php"; -$validPages[] = "page_faq.php"; +$validPages = array ( + "page_add_new_feed.php", + "page_add_tag.php", + "page_login.php", + "page_logout", + "page_main.php", + "page_personal.php", + "page_register", + "page_show_all_feeds.php", + "page_show_feed_tag.php", + "page_show_feedphp" +); // Languages $langs[] = "de_DE"; @@ -48,16 +55,17 @@ */ // Database-configuration -$db['dsn'] = $db['type'] ."://" .$db['user'] .":" .$db['passwd'] ."@" .$db['host'] ."/" .$db['database']; +$db['dsn'] = $db['type'] . "://" . $db['user'] . ":" . $db['passwd'] . "@" . $db['host'] . "/" . $db['database']; // Session-configuration -if(($db['type'] == "mysql" or $db['type'] == "postgresql") and $session['container']['autooptimisation_allowed']) { +if (($db['type'] == "mysql" or $db['type'] == "postgresql") and $session['container']['autooptimisation_allowed']) { $session['container']['autooptimize'] = true; } else { $session['container']['autooptimize'] = false; } -$session['container']['options'] = array('dsn' => $db['dsn'], - 'table' => $session['container']['tablename'], - 'autooptimize' => $session['container']['autooptimize'] - ); +$session['container']['options'] = array ( + 'dsn' => $db['dsn'], + 'table' => $session['container']['tablename'], + 'autooptimize' => $session['container']['autooptimize'] +); ?> \ No newline at end of file Modified: trunk/inc/navigation.php =================================================================== --- trunk/inc/navigation.php 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/inc/navigation.php 2007-01-09 21:45:26 UTC (rev 98) @@ -57,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\"$add_tag>%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Display a Feed"), _("Add a Tag")); +" <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")); 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")); Modified: trunk/page_add_tag.php =================================================================== --- trunk/page_add_tag.php 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/page_add_tag.php 2007-01-09 21:45:26 UTC (rev 98) @@ -11,7 +11,7 @@ */ require_once "inc/config.php"; -//error_reporting(E_ALL); +error_reporting(E_ALL); ############ # DATABASE # ############ @@ -76,7 +76,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_tag"; @@ -102,10 +102,11 @@ textdomain("page_$page"); $main = ""; - +if (isset ($_POST['tag'])) { + $tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']); +} if (!$tag_manager->hasTags($_GET['feed'])) { - $main .= sprintf(""); - // there are no tags yet, please add one... + $main .= sprintf(" <p>%s</p\n", _("There are no tags yet!")); } else { $main .= sprintf(" <div id=\"tags\">\n" . " <div id=\"tags_title\">%s</div>\n", _("Tags")); @@ -123,9 +124,6 @@ } $main .= " </div>\n"; } -if (isset ($_POST['tag'])) { - $tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']); -} $main .= displayAddForm(); ##################### Modified: trunk/page_login.php =================================================================== --- trunk/page_login.php 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/page_login.php 2007-01-09 21:45:26 UTC (rev 98) @@ -210,22 +210,24 @@ $form = sprintf(" <div id=\"registration_form\">\n" . " <form action=\"%s\" method=\"post\" accept-charset=\"UTF-8\">\n" . "$message" . - " <div id=\"formtitle\">%s</div>\n" . - " <div class=\"left\">\n" . - " <div class=\"formElem_$id_username\" >%s</div>\n" . - " <div class=\"formElem_$id_password\" >%s</div>\n" . - " </div>\n" . - " <div class=\"right\">\n" . - " <div class=\"formField_$id_username\" ><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></div>\n" . - " <div class=\"formField_$id_password\" ><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" /></div>\n" . - " </div>\n" . - " <div id=\"formButtons\">\n" . - " <input type=\"submit\" value=\"%s\" name=\"submit\" />\n" . - " <input type=\"reset\" value=\"%s\" />\n" . - " </div>\n" . + " <table summary=\"\">\n" . + " <tr id=\"formtitle\">\n" . + " <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" . + " </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" . + " </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" . " </form>\n" . - " <p id=\"required\">%s</p>\n" . - " </div>\n", $_SERVER['PHP_SELF'], _("Login"), _("Username"), _("Password"), _("Submit!"), _("Reset!"), _("All fields are required")); + " </div>\n", $_SERVER['PHP_SELF'], _("Login"), _("Username"), _("Password"), _("Submit!"), _("Reset!")); return $form; } Modified: trunk/page_show_all_feeds.php =================================================================== --- trunk/page_show_all_feeds.php 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/page_show_all_feeds.php 2007-01-09 21:45:26 UTC (rev 98) @@ -200,15 +200,15 @@ if (count($tags) == 1) { $return .= sprintf(" <td><a href=\"./page_show_feed_tag.php?tag=%s\">%s</a></td>\n", $tags[0], $tags[0]); } else { - $return .= " <td>"; + $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>"; + $return .= " <a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>\n"; if ($id !== (count($tags) - 1)) { $return .= ", "; } } - $return .= "</td>\n"; + $return .= " </td>\n"; } } $return .= sprintf(" <td><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . @@ -243,17 +243,17 @@ } 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]); + $return .= sprintf(" <td><a href=\"./page_show_feed_tag.php?tag=%s\">%s</a></td>\n", $tags[0], $tags[0]); } else { - $return .= " <td>\n"; + $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>"; + $return .= " <a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>"; if ($id !== (count($tags) - 1)) { - $return .= ", "; + $return .= ", \n"; } } - $return .= " </td>\n"; + $return .= "\n </td>\n"; } } $return .= sprintf(" <td><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . Modified: trunk/page_show_feed.php =================================================================== --- trunk/page_show_feed.php 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/page_show_feed.php 2007-01-09 21:45:26 UTC (rev 98) @@ -11,7 +11,7 @@ */ require_once "inc/config.php"; -//error_reporting(E_ALL); +error_reporting(E_ALL); ############ # DATABASE # ############ @@ -157,9 +157,13 @@ if (false == $tags) { $rightSideBar .= sprintf("%s <a href=\"./page_add_tag.php?feed=%s\">%s</a>", _("No tag submitted yet, you can add one "), $_GET['feed'], _("here!")); } else { - foreach ($tags as $tag) { - $rightSideBar .= sprintf(" <a href=\"./page_show_feed_tag.php?tag=%s\">%s</a>, \n", $tag, $tag); - } + foreach ($tags as $id => $tag) { + $rightSideBar .= " <a href=\"./page_show_feed_tag.php?tag=$tag\">$tag</a>"; + if ($id !== (count($tags) - 1)) { + $rightSideBar .= ", "; + } + $rightSideBar .= "\n"; + } } $rightSideBar .= "\n </div>"; $design = str_replace("<!-- rightSideBar -->", $rightSideBar, $design); Modified: trunk/page_show_feed_tag.php =================================================================== --- trunk/page_show_feed_tag.php 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/page_show_feed_tag.php 2007-01-09 21:45:26 UTC (rev 98) @@ -3,9 +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 - * @since 46 - 19.10.2006 + * * @author c167 <c1...@us...> * @package feed-collector */ @@ -31,7 +29,9 @@ $db = & MDB2 :: factory($dsn, $options); if (PEAR :: isError($db)) { echo $db->getMessage(); - echo "<br />"; + 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); @@ -103,7 +103,8 @@ $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 = createFeedsTable($_GET['tag'], $tag_manager, $feed); + $main = createSelectionTable($_GET['tag'], $tag_manager, $feed); } $design = file_get_contents("styles/default/page_show_feed_tag.tpl", "r"); @@ -153,45 +154,50 @@ echo $design; -function createFeedsTable($tag, $tag_manager, $feed_manager) { +function createSelectionTable($tag, $tag_manager, $feed_manager) { $feeds = $tag_manager->getFeedsByTag($tag); if (false === $feeds) { return "error!!!"; } - //$return = sprintf(" <p class=\"tagname\">%s</p>\n", $_GET['tag']); - $return = sprintf(" <table summary=\"%s\">\n" . - " <tr>\n" . - " <th class=\"tagname\">%s</th>\n" . - " </tr>\n" . - " <tr>\n" . - " <th>%s</th>\n" . - " <th><img src=\"./pic/lang/International.gif\" alt=\"%s\" /></th>\n" . - " </tr>\n", $_GET['tag'], $tag, _("Feed"), _("Language")); - $feeds = $feed_manager->getSpecFeeds($feeds); - for ($i = 0; $i < count($feeds); $i++) { - $return .= sprintf(" <tr>\n" . - " <td><a id=\"n%d\" href=\"./page_show_feed.php?feed=%s\">%s</a></td>\n" . - " <td><img src=\"./pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . - " </tr>\n", $feeds[$i]['id'], $feeds[$i]['feed_url'], $feeds[$i]['feed_name'], $feeds[$i]['feed_lang'], $feeds[$i]['feed_lang']); + $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]); + } 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"; + } + } + $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 .= " </table>"; return $return; } -function findBiggestArray($a1, $a2, $a3) { - $a1 = count($a1); - $a2 = count($a2); - $a3 = count($a3); - $number = 0; - if ($a1 > $number) - $number = $a1; - if ($a2 > $number) - $number = $a2; - if ($a3 > $number) - $number = $a3; - return $number; -} function displaySearchForm() { Added: trunk/styles/default/common-screen.css =================================================================== --- trunk/styles/default/common-screen.css (rev 0) +++ trunk/styles/default/common-screen.css 2007-01-09 21:45:26 UTC (rev 98) @@ -0,0 +1,159 @@ +/***************************************** + * TITLE: Common Screen Stylesheet * + * URI: styles/default/common-screen.css * + * MODIF: 2007-Jan-09 18:06 +0100 * + *****************************************/ + @CHARSET "UTF-8"; + +/* ##### Common Styles ##### */ +.headerLogin { + border: 1px solid rgb(255, 255, 255); + text-align: right; + padding: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; +} + +.headerLogin { + border: 1px solid rgb(255, 255, 255); + text-align: right; + margin: 0; + /* padding: 0 0 2ex 0;*/ + padding-bottom: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; + /* margin-left: 1em; + margin-right: 1em;*/ +} + +.headerLogin a { + color: white; + background-color: transparent; + text-decoration: none; + margin: 0; + padding: 0 0 0.5ex 0; + display: block; +} + +.headerLogin span { + +} + +#userinfo p { + color: white; + background-color: transparent; + margin: 0; + display: block; +} + +.headerLogin input:hover { /* color: rgb(195,196,210);*/ + color: black; + /* background-color: transparent;*/ + background-color: rgb(117, 144, 174); + text-decoration: underline; +} + +.subHeader { + color: white; + background-color: rgb(117, 144, 174); + margin: 0; + padding: 0.5ex 10px; +} + +.subHeader a,.subHeader .highlight { + color: white; + background-color: transparent; + font-size: 110%; + font-weight: bold; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.subHeader a:hover,.subHeader .highlight { + color: rgb(255, 204, 0); + background-color: transparent; + text-decoration: none; +} + +body { + font-family: verdana, helvetica, arial, sans-serif; + font-size: 73%; /* Enables font size scaling in MSIE */ + margin: 0; + padding: 0; +} + +html>body { + font-size: 9pt; +} + +acronym,.titleTip { + border-bottom: 1px dotted rgb(61, 92, 122); + cursor: help; + margin: 0; + padding: 0 0 0.4px 0; +} + +a { + color: rgb(61, 92, 122); + background-color: transparent; + text-decoration: underline; + margin: 0; + padding: 0 1px 2px 1px; +} + +a:hover { + color: rgb(117, 144, 174); + text-decoration: none; +} + +ol { + margin: 1em 0 1.5em 0; + padding: 0; +} + +ul { + list-style-type: square; + margin: 1em 0 1.5em 0; + padding: 0; +} + +dl { + margin: 1em 0 0.5em 0; + padding: 0; +} + +ul li { + line-height: 1.5em; + margin: 1.25ex 0 0 1.5em; + padding: 0; +} + +ol li { + line-height: 1.5em; + margin: 1.25ex 0 0 2em; + padding: 0; +} + +dt { + font-weight: bold; + margin: 0; + padding: 0 0 1ex 0; +} + +dd { + line-height: 1.75em; + margin: 0 0 1.5em 1.5em; + padding: 0; +} + +.doNotDisplay { + display: none !important; +} + +.smallCaps { + font-size: 117%; + font-variant: small-caps; +} \ No newline at end of file Added: trunk/styles/default/footer-screen.css =================================================================== --- trunk/styles/default/footer-screen.css (rev 0) +++ trunk/styles/default/footer-screen.css 2007-01-09 21:45:26 UTC (rev 98) @@ -0,0 +1,30 @@ +/***************************************** + * TITLE: Footer Screen Stylesheet * + * URI: styles/default/footer-screen.css * + * MODIF: 2007-Jan-09 18:06 +0100 * + *****************************************/ + @CHARSET "UTF-8"; + + +/* ##### Footer ##### */ + +#footer { + color: rgb(51,51,102); + background-color: rgb(239,239,239); + font-size: 87%; + text-align: center; + line-height: 1.25em; + margin: 2em 0 0 0; + padding: 1ex 10px; + clear: left; +} + +#footer a { + color: rgb(0,68,204); + background-color: transparent; + text-decoration: underline; +} + +#footer a:hover { + text-decoration: none; +} \ No newline at end of file Added: trunk/styles/default/header-screen.css =================================================================== --- trunk/styles/default/header-screen.css (rev 0) +++ trunk/styles/default/header-screen.css 2007-01-09 21:45:26 UTC (rev 98) @@ -0,0 +1,89 @@ +/***************************************** + * TITLE: Header Screen Stylesheet * + * URI: styles/default/header-screen.css * + * MODIF: 2007-Jan-09 18:06 +0100 * + *****************************************/ + @CHARSET "UTF-8"; + +/* ##### Header ##### */ +.superHeader { + color: rgb(130, 128, 154); + background-color: rgb(33, 50, 66); + text-align: right; + margin: 0; + padding: 0.5ex 10px; +} + +.superHeader span { + color: rgb(195, 196, 210); + background-color: transparent; + font-weight: bold; + text-transform: uppercase; +} + +.superHeader a { + color: rgb(195, 196, 210); + background-color: transparent; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.superHeader a:hover { + color: rgb(193, 102, 90); + background-color: transparent; + text-decoration: none; +} + +.midHeader { + color: white; + background-color: rgb(61, 92, 122); + margin: 0; + padding: 0.26ex 10px; +} + +.headerTitle { + font-size: 300%; + margin: 0; + padding: 0; +} + +.headerSubTitle { + font-size: 151%; + font-weight: normal; + font-style: italic; + margin: 0 0 1ex 0; + padding: 0; +} + +.headerLogin { + border: 1px solid rgb(255, 255, 255); + text-align: right; + padding: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; +} + +.subHeader { + color: white; + background-color: rgb(117, 144, 174); + margin: 0; + padding: 0.5ex 10px; +} + +.subHeader a,.subHeader .highlight { + color: white; + background-color: transparent; + font-size: 110%; + font-weight: bold; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.subHeader a:hover,.subHeader .highlight { + color: rgb(255, 204, 0); + background-color: transparent; + text-decoration: none; +} \ No newline at end of file Added: trunk/styles/default/main_copy-screen.css =================================================================== --- trunk/styles/default/main_copy-screen.css (rev 0) +++ trunk/styles/default/main_copy-screen.css 2007-01-09 21:45:26 UTC (rev 98) @@ -0,0 +1,52 @@ +/******************************************** + * TITLE: Main Copy Screen Stylesheet * + * URI: styles/default/main_copy-screen.css * + * MODIF: 2007-Jan-09 18:06 +0100 * + ********************************************/ + @CHARSET "UTF-8"; + +/* ##### Main Copy ##### */ + +#main-copy { + margin: 0; + padding: 0.5em 10px; + clear: left; +} + +#main-copy h1 { + color: rgb(117,144,174); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 200%; + margin: 0; + padding: 0; +} + +#main-copy h2 { + color: rgb(61,92,122); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-weight: normal; + font-size: 151%; + margin: 0; + padding: 1ex 0 0 0; +} + +#main-copy p { + line-height: 1.75em; + margin: 1em 0 1.5em 0; + padding: 0; +} + +/* 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 Modified: trunk/styles/default/page_add_new_feed-screen.css =================================================================== --- trunk/styles/default/page_add_new_feed-screen.css 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/styles/default/page_add_new_feed-screen.css 2007-01-09 21:45:26 UTC (rev 98) @@ -1,221 +1,10 @@ /****************************************************** - * TITLE: Show Feeds Screen Stylesheet * + * TITLE: Add New Feed Screen Stylesheet * * URI: styles/default/page_add_new_feed-screen.css * * MODIF: 2006-Nov-16 18:06 +0100 * ******************************************************/ - /* ##### Common Styles ##### */ -body { - font-family: verdana, helvetica, arial, sans-serif; - font-size: 73%; /* Enables font size scaling in MSIE */ - margin: 0; - padding: 0; -} - -html>body { - font-size: 9pt; -} - -acronym,.titleTip {echo 4; - border-bottom: 1px dotted rgb(61, 92, 122); - cursor: help; - margin: 0; - padding: 0 0 0.4px 0; -} - -a { - color: rgb(61, 92, 122); - background-color: transparent; - text-decoration: underline; - margin: 0; - padding: 0 1px 2px 1px; -} - -a:hover { - color: rgb(117, 144, 174); - text-decoration: none; -} - -ol { - margin: 1em 0 1.5em 0; - padding: 0; -} - -ul { - list-style-type: square; - margin: 1em 0 1.5em 0; - padding: 0; -} - -dl { - margin: 1em 0 0.5em 0; - padding: 0; -} - -ul li { - line-height: 1.5em; - margin: 1.25ex 0 0 1.5em; - padding: 0; -} - -ol li { - line-height: 1.5em; - margin: 1.25ex 0 0 2em; - padding: 0; -} - -dt { - font-weight: bold; - margin: 0; - padding: 0 0 1ex 0; -} - -dd { - line-height: 1.75em; - margin: 0 0 1.5em 1.5em; - padding: 0; -} - -.doNotDisplay { - display: none !important; -} - -.smallCaps { - font-size: 117%; - font-variant: small-caps; -} - -/* ##### Header ##### */ -.superHeader { - color: rgb(130, 128, 154); - background-color: rgb(33, 50, 66); - text-align: right; - margin: 0; - padding: 0.5ex 10px; -} - -.superHeader span { - color: rgb(195, 196, 210); - background-color: transparent; - font-weight: bold; - text-transform: uppercase; -} - -.superHeader a { - color: rgb(195, 196, 210); - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.superHeader a:hover { - color: rgb(193, 102, 90); - background-color: transparent; - text-decoration: none; -} - -.midHeader { - color: white; - background-color: rgb(61, 92, 122); - margin: 0; - padding: 0.26ex 10px; -} - -.headerTitle { - font-size: 300%; - margin: 0; - padding: 0; -} - -.headerSubTitle { - font-size: 151%; - font-weight: normal; - font-style: italic; - margin: 0 0 1ex 0; - padding: 0; -} - -.headerLogin { - border: 1px solid rgb(255,255,255); - text-align: right; - padding: 1ex; - position: absolute; - right: 1.5em; - top: 3.5em; -} - -.headerLinks a { - color: white; - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0 0.5ex 0; - display: block; -} - -.headerLinks a:hover { - color: rgb(195, 196, 210); - background-color: transparent; - text-decoration: underline; -} - -.subHeader { - color: white; - background-color: rgb(117, 144, 174); - margin: 0; - padding: 0.5ex 10px; -} - -.subHeader a,.subHeader .highlight { - color: white; - background-color: transparent; - font-size: 110%; - font-weight: bold; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.subHeader a:hover,.subHeader .highlight { - color: rgb(255, 204, 0); - background-color: transparent; - text-decoration: none; -} - -/* ##### Main Copy ##### */ -#main-copy { - margin: 0; - padding: 0.5em 10px; - clear: left; -} - -#main-copy h1 { - color: rgb(117, 144, 174); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - margin: 0; - padding: 0; -} - -#main-copy h2 { - color: rgb(61, 92, 122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-weight: normal; - font-size: 151%; - margin: 0; - padding: 1ex 0 0 0; -} - -#main-copy p { - line-height: 1.75em; - margin: 1em 0 1.5em 0; - padding: 0; -} - -#add_form { - /*margin: 1em 0;*/ + /* ##### Main Copy ##### */ +#add_form { /*margin: 1em 0;*/ margin-top: 1em; margin-left: 10%; margin-right: 10%; @@ -239,16 +28,10 @@ } .required .formElem { -/* border-top: 1px dashed red; - border-left: 1px dashed red; - border-bottom: 1px dashed red;*/ background-color: rgb(204, 204, 204); } .required .formField { - /*border-top: 1px dashed red; - border-right: 1px dashed red; - border-bottom: 1px dashed red;*/ background-color: rgb(204, 204, 204); } @@ -276,85 +59,4 @@ margin-top: 16em; padding: 1ex 10px; border-top: 1px solid rgb(204, 204, 204); -} - -.quarter,.oneThird,.half,.twoThirds,.fullWidth { - /*margin: 1em 0;*/ - float: left; - border-left: 1px solid rgb(204, 204, 204); -} - -.quarter { - width: 21%; - padding: 0 1.9%; -} - -.oneThird { - width: 28%; - padding: 0 1.9%; -} - -.half { - text-align: justify; - width: 46%; - padding: 0 1.9%; -} - -.twoThirds { - text-align: justify; - width: 63%; - padding: 0 1.9%; -} - -.fullWidth { - text-align: justify; - width: 96%; - padding: 0 1.2em; - border-left: none; -} - -.filler { - /* use with an empty <p> element to add padding to the end of a text box */ - border: 1px solid white; -} - -.noBorderOnLeft { - border-left: none; -} - -.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); - * } - */ /* ##### Footer ##### */ -#footer { - color: rgb(51, 51, 102); - background-color: rgb(239, 239, 239); - font-size: 87%; - text-align: center; - line-height: 1.25em; - margin: 2em 0 0 0; - padding: 1ex 10px; - clear: left; -} - -#footer a { - color: rgb(0, 68, 204); - background-color: transparent; - text-decoration: underline; -} - -#footer a:hover { - text-decoration: none; } \ No newline at end of file Modified: trunk/styles/default/page_add_new_feed.tpl =================================================================== --- trunk/styles/default/page_add_new_feed.tpl 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/styles/default/page_add_new_feed.tpl 2007-01-09 21:45:26 UTC (rev 98) @@ -8,6 +8,10 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_add_new_feed-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> Modified: trunk/styles/default/page_add_tag-screen.css =================================================================== --- trunk/styles/default/page_add_tag-screen.css 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/styles/default/page_add_tag-screen.css 2007-01-09 21:45:26 UTC (rev 98) @@ -1,228 +1,12 @@ /************************************************** - * TITLE: Show Feeds Screen Stylesheet * + * TITLE: Add Tag Screen Stylesheet * * URI: styles/default/page_login-screen.css * * MODIF: 2006-Nov-16 18:06 +0100 * **************************************************/ - /* ##### Common Styles ##### */ -body { - font-family: verdana, helvetica, arial, sans-serif; - font-size: 73%; /* Enables font size scaling in MSIE */ - margin: 0; - padding: 0; -} -html>body { - font-size: 9pt; -} -acronym,.titleTip { - border-bottom: 1px dotted rgb(61, 92, 122); - cursor: help; - margin: 0; - padding: 0 0 0.4px 0; -} - -a { - color: rgb(61, 92, 122); - background-color: transparent; - text-decoration: underline; - margin: 0; - padding: 0 1px 2px 1px; -} - -a:hover { - color: rgb(117, 144, 174); - text-decoration: none; -} - -ol { - margin: 1em 0 1.5em 0; - padding: 0; -} - -ul { - list-style-type: square; - margin: 1em 0 1.5em 0; - padding: 0; -} - -dl { - margin: 1em 0 0.5em 0; - padding: 0; -} - -ul li { - line-height: 1.5em; - margin: 1.25ex 0 0 1.5em; - padding: 0; -} - -ol li { - line-height: 1.5em; - margin: 1.25ex 0 0 2em; - padding: 0; -} - -dt { - font-weight: bold; - margin: 0; - padding: 0 0 1ex 0; -} - -dd { - line-height: 1.75em; - margin: 0 0 1.5em 1.5em; - padding: 0; -} - -.doNotDisplay { - display: none !important; -} - -.smallCaps { - font-size: 117%; - font-variant: small-caps; -} - -/* ##### Header ##### */ -.superHeader { - color: rgb(130, 128, 154); - background-color: rgb(33, 50, 66); - text-align: right; - margin: 0; - padding: 0.5ex 10px; -} - -.superHeader span { - color: rgb(195, 196, 210); - background-color: transparent; - font-weight: bold; - text-transform: uppercase; -} - -.superHeader a { - color: rgb(195, 196, 210); - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.superHeader a:hover { - color: rgb(193, 102, 90); - background-color: transparent; - text-decoration: none; -} - -.midHeader { - color: white; - background-color: rgb(61, 92, 122); - margin: 0; - padding: 0.26ex 10px; -} - -.headerTitle { - font-size: 300%; - margin: 0; - padding: 0; -} - -.headerSubTitle { - font-size: 151%; - font-weight: normal; - font-style: italic; - margin: 0 0 1ex 0; - padding: 0; -} - -.headerLogin { - border: 1px solid rgb(255,255,255); - text-align: right; - padding: 1ex; - position: absolute; - right: 1.5em; - top: 3.5em; -} - -.headerLinks { - text-align: right; - margin: 0; - padding: 0 0 2ex 0; - position: absolute; - right: 1.5em; - top: 3.5em; -} - -.headerLinks a { - color: white; - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0 0.5ex 0; - display: block; -} - -.headerLinks a:hover { - color: rgb(195, 196, 210); - background-color: transparent; - text-decoration: underline; -} - -.subHeader { - color: white; - background-color: rgb(117, 144, 174); - margin: 0; - padding: 0.5ex 10px; -} - -.subHeader a,.subHeader .highlight { - color: white; - background-color: transparent; - font-size: 110%; - font-weight: bold; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.subHeader a:hover,.subHeader .highlight { - color: rgb(255, 204, 0); - background-color: transparent; - text-decoration: none; -} - /* ##### Main Copy ##### */ -#main-copy { - margin: 0; - padding: 0.5em 10px; - clear: left; -} -#main-copy h1 { - color: rgb(117, 144, 174); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - margin: 0; - padding: 0; -} - -#main-copy h2 { - color: rgb(61, 92, 122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-weight: normal; - font-size: 151%; - margin: 0; - padding: 1ex 0 0 0; -} - -#main-copy p { - line-height: 1.75em; - margin: 1em 0 1.5em 0; - padding: 0; -} - #formtitle { text-align: center; color: white; @@ -261,45 +45,4 @@ .filler { /* use with an empty <p> element to add padding to the end of a text box */ border: 1px solid white; -} - -.noBorderOnLeft { - border-left: none; -} - -.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); - * } - */ /* ##### Footer ##### */ -#footer { - color: rgb(51, 51, 102); - background-color: rgb(239, 239, 239); - font-size: 87%; - text-align: center; - line-height: 1.25em; - margin: 2em 0 0 0; - padding: 1ex 10px; - clear: left; -} - -#footer a { - color: rgb(0, 68, 204); - background-color: transparent; - text-decoration: underline; -} - -#footer a:hover { - text-decoration: none; } \ No newline at end of file Modified: trunk/styles/default/page_add_tag.tpl =================================================================== --- trunk/styles/default/page_add_tag.tpl 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/styles/default/page_add_tag.tpl 2007-01-09 21:45:26 UTC (rev 98) @@ -8,6 +8,10 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_add_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> Modified: trunk/styles/default/page_login-screen.css =================================================================== --- trunk/styles/default/page_login-screen.css 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/styles/default/page_login-screen.css 2007-01-09 21:45:26 UTC (rev 98) @@ -1,219 +1,12 @@ /************************************************** - * TITLE: Show Feeds Screen Stylesheet * + * TITLE: Login Screen Stylesheet * * URI: styles/default/page_login-screen.css * * MODIF: 2006-Nov-16 18:06 +0100 * **************************************************/ - /* ##### Common Styles ##### */ -body { - font-family: verdana, helvetica, arial, sans-serif; - font-size: 73%; /* Enables font size scaling in MSIE */ - margin: 0; - padding: 0; -} -html>body { - font-size: 9pt; -} -acronym,.titleTip { - border-bottom: 1px dotted rgb(61, 92, 122); - cursor: help; - margin: 0; - padding: 0 0 0.4px 0; -} - -a { - color: rgb(61, 92, 122); - background-color: transparent; - text-decoration: underline; - margin: 0; - padding: 0 1px 2px 1px; -} - -a:hover { - color: rgb(117, 144, 174); - text-decoration: none; -} - -ol { - margin: 1em 0 1.5em 0; - padding: 0; -} - -ul { - list-style-type: square; - margin: 1em 0 1.5em 0; - padding: 0; -} - -dl { - margin: 1em 0 0.5em 0; - padding: 0; -} - -ul li { - line-height: 1.5em; - margin: 1.25ex 0 0 1.5em; - padding: 0; -} - -ol li { - line-height: 1.5em; - margin: 1.25ex 0 0 2em; - padding: 0; -} - -dt { - font-weight: bold; - margin: 0; - padding: 0 0 1ex 0; -} - -dd { - line-height: 1.75em; - margin: 0 0 1.5em 1.5em; - padding: 0; -} - -.doNotDisplay { - display: none !important; -} - -.smallCaps { - font-size: 117%; - font-variant: small-caps; -} - -/* ##### Header ##### */ -.superHeader { - color: rgb(130, 128, 154); - background-color: rgb(33, 50, 66); - text-align: right; - margin: 0; - padding: 0.5ex 10px; -} - -.superHeader span { - color: rgb(195, 196, 210); - background-color: transparent; - font-weight: bold; - text-transform: uppercase; -} - -.superHeader a { - color: rgb(195, 196, 210); - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.superHeader a:hover { - color: rgb(193, 102, 90); - background-color: transparent; - text-decoration: none; -} - -.midHeader { - color: white; - background-color: rgb(61, 92, 122); - margin: 0; - padding: 0.26ex 10px; -} - -.headerTitle { - font-size: 300%; - margin: 0; - padding: 0; -} - -.headerSubTitle { - font-size: 151%; - font-weight: normal; - font-style: italic; - margin: 0 0 1ex 0; - padding: 0; -} - -.headerLogin { - border: 1px solid rgb(255,255,255); - text-align: right; - padding: 1ex; - position: absolute; - right: 1.5em; - top: 3.5em; -} - -.headerLinks a { - color: white; - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0 0.5ex 0; - display: block; -} - -.headerLinks a:hover { - color: rgb(195, 196, 210); - background-color: transparent; - text-decoration: underline; -} - -.subHeader { - color: white; - background-color: rgb(117, 144, 174); - margin: 0; - padding: 0.5ex 10px; -} - -.subHeader a,.subHeader .highlight { - color: white; - background-color: transparent; - font-size: 110%; - font-weight: bold; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.subHeader a:hover,.subHeader .highlight { - color: rgb(255, 204, 0); - background-color: transparent; - text-decoration: none; -} - /* ##### Main Copy ##### */ -#main-copy { - margin: 0; - padding: 0.5em 10px; - clear: left; -} -#main-copy h1 { - color: rgb(117, 144, 174); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - margin: 0; - padding: 0; -} - -#main-copy h2 { - color: rgb(61, 92, 122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-weight: normal; - font-size: 151%; - margin: 0; - padding: 1ex 0 0 0; -} - -#main-copy p { - line-height: 1.75em; - margin: 1em 0 1.5em 0; - padding: 0; -} - #registration_form table { float: left; border: 1px solid rgb(204, 204, 204); @@ -283,79 +76,4 @@ margin: 1em 0; float: left; border-left: 1px solid rgb(204, 204, 204); -} - -.quarter { - width: 21%; - padding: 0 1.9%; -} - -.oneThird { - width: 28%; - padding: 0 1.9%; -} - -.half { - text-align: justify; - width: 46%; - padding: 0 1.9%; -} - -.twoThirds { - text-align: justify; - width: 63%; - padding: 0 1.9%; -} - -.fullWidth { - text-align: justify; - width: 96%; - padding: 0 1.2em; - border-left: none; -} - -.filler { - /* use with an empty <p> element to add padding to the end of a text box */ - border: 1px solid white; -} - -.noBorderOnLeft { - border-left: none; -} - -.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); - * } - */ /* ##### Footer ##### */ -#footer { - color: rgb(51, 51, 102); - background-color: rgb(239, 239, 239); - font-size: 87%; - text-align: center; - line-height: 1.25em; - margin: 2em 0 0 0; - padding: 1ex 10px; - clear: left; -} - -#footer a { - color: rgb(0, 68, 204); - background-color: transparent; - text-decoration: underline; -} - -#footer a:hover { - text-decoration: none; } \ No newline at end of file Modified: trunk/styles/default/page_login.tpl =================================================================== --- trunk/styles/default/page_login.tpl 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/styles/default/page_login.tpl 2007-01-09 21:45:26 UTC (rev 98) @@ -8,6 +8,10 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_login-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> Modified: trunk/styles/default/page_main-screen.css =================================================================== --- trunk/styles/default/page_main-screen.css 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/styles/default/page_main-screen.css 2007-01-09 21:45:26 UTC (rev 98) @@ -3,217 +3,10 @@ * URI : styles/default/page_main-screen.css * * MODIF: 2006-Nov-11 23:09 +0100 * **********************************************/ - /* ##### Common Styles ##### */ -body { - font-family: verdana, helvetica, arial, sans-serif; - font-size: 73%; /* Enables font size scaling in MSIE */ - margin: 0; - padding: 0; -} -html>body { - font-size: 9pt; -} -acronym,.titleTip { - border-bottom: 1px dotted rgb(61, 92, 122); - cursor: help; - margin: 0; - padding: 0 0 0.4px 0; -} - -a { - color: rgb(61, 92, 122); - background-color: transparent; - text-decoration: underline; - margin: 0; - padding: 0 1px 2px 1px; -} - -a:hover { - color: rgb(117, 144, 174); - text-decoration: none; -} - -ol { - margin: 1em 0 1.5em 0; - padding: 0; -} - -ul { - list-style-type: square; - margin: 1em 0 1.5em 0; - padding: 0; -} - -dl { - margin: 1em 0 0.5em 0; - padding: 0; -} - -ul li { - line-height: 1.5em; - margin: 1.25ex 0 0 1.5em; - padding: 0; -} - -ol li { - line-height: 1.5em; - margin: 1.25ex 0 0 2em; - padding: 0; -} - -dt { - font-weight: bold; - margin: 0; - padding: 0 0 1ex 0; -} - -dd { - line-height: 1.75em; - margin: 0 0 1.5em 1.5em; - padding: 0; -} - -.doNotDisplay { - display: none !important; -} - -.smallCaps { - font-size: 117%; - font-variant: small-caps; -} - -/* ##### Header ##### */ -.superHeader { - color: rgb(130, 128, 154); - background-color: rgb(33, 50, 66); - text-align: right; - margin: 0; - padding: 0.5ex 10px; -} - -.superHeader span { - color: rgb(195, 196, 210); - background-color: transparent; - font-weight: bold; - text-transform: uppercase; -} - -.superHeader a { - color: rgb(195, 196, 210); - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.superHeader a:hover { - color: rgb(193, 102, 90); - background-color: transparent; - text-decoration: none; -} - -/* -.subHeader .highlight { - color: rgb(253,160,91); - background-color: transparent; -} -*/ -.midHeader { - color: white; - background-color: rgb(61, 92, 122); - margin: 0; - padding: 0.26ex 10px; -} - -.headerTitle { - font-size: 300%; - margin: 0; - padding: 0; -} - -.headerSubTitle { - font-size: 151%; - font-weight: normal; - font-style: italic; - margin: 0 0 1ex 0; - padding: 0; -} - -.headerLogin { - border: 1px solid rgb(255,255,255); - text-align: right; - padding: 1ex; - position: absolute; - right: 1.5em; - top: 3.5em; -} -/* -.headerLogin a { - color: white; - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0 0.5ex 0; - display: block; -} -*/ -.subHeader { - color: white; - background-color: rgb(117, 144, 174); - margin: 0; - padding: 0.5ex 10px; -} - -.subHeader a,.subHeader .highlight { - color: white; - background-color: transparent; - font-size: 110%; - font-weight: bold; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.subHeader a:hover,.subHeader .highlight { - color: rgb(255, 204, 0); - background-color: transparent; - text-decoration: none; -} - /* ##### Main Copy ##### */ -#main-copy { - margin: 0; - padding: 0.5em 10px; - clear: left; -} -#main-copy h1 { - color: rgb(117, 144, 174); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - margin: 0; - padding: 0; -} - -#main-copy h2 { - color: rgb(61, 92, 122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-weight: normal; - font-size: 151%; - margin: 0; - padding: 1ex 0 0 0; -} - -#main-copy p { - line-height: 1.75em; - margin: 1em 0 1.5em 0; - padding: 0; -} - .newsHeading { color: rgb(61, 92, 122); background-color: transparent; @@ -325,24 +118,4 @@ * .rowOfBoxes + .rowOfBoxes { * border-top: 1px solid rgb(204,204,204); * } - */ /* ##### Footer ##### */ -#footer { - color: rgb(51, 51, 102); - background-color: rgb(239, 239, 239); - font-size: 87%; - text-align: center; - line-height: 1.25em; - margin: 2em 0 0 0; - padding: 1ex 10px; - clear: left; -} - -#footer a { - color: rgb(0, 68, 204); - background-color: transparent; - text-decoration: underline; -} - -#footer a:hover { - text-decoration: none; -} \ No newline at end of file + */ \ No newline at end of file Modified: trunk/styles/default/page_main.tpl =================================================================== --- trunk/styles/default/page_main.tpl 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/styles/default/page_main.tpl 2007-01-09 21:45:26 UTC (rev 98) @@ -8,6 +8,10 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_main-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> Modified: trunk/styles/default/page_personal-screen.css =================================================================== --- trunk/styles/default/page_personal-screen.css 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/styles/default/page_personal-screen.css 2007-01-09 21:45:26 UTC (rev 98) @@ -1,228 +1,12 @@ /************************************************** - * TITLE: Show Feeds Screen Stylesheet * + * TITLE: Personal Screen Stylesheet * * URI: styles/default/page_show_feeds-screen.css * * MODIF: 2006-Nov-16 18:06 +0100 * **************************************************/ - /* ##### Common Styles ##### */ -body { - font-family: verdana, helvetica, arial, sans-serif; - font-size: 73%; /* Enables font size scaling in MSIE */ - margin: 0; - padding: 0; -} -html>body { - font-size: 9pt; -} -acronym,.titleTip { - border-bottom: 1px dotted rgb(61, 92, 122); - cursor: help; - margin: 0; - padding: 0 0 0.4px 0; -} - -a { - color: rgb(61, 92, 122); - background-color: transparent; - text-decoration: underline; - margin: 0; - padding: 0 1px 2px 1px; -} - -a:hover { - color: rgb(117, 144, 174); - text-decoration: none; -} - -ol { - margin: 1em 0 1.5em 0; - padding: 0; -} - -ul { - list-style-type: square; - margin: 1em 0 1.5em 0; - padding: 0; -} - -dl { - margin: 1em 0 0.5em 0; - padding: 0; -} - -ul li { - line-height: 1.5em; - margin: 1.25ex 0 0 1.5em; - padding: 0; -} - -ol li { - line-height: 1.5em; - margin: 1.25ex 0 0 2em; - padding: 0; -} - -dt { - font-weight: bold; - margin: 0; - padding: 0 0 1ex 0; -} - -dd { - line-height: 1.75em; - margin: 0 0 1.5em 1.5em; - padding: 0; -} - -.doNotDisplay { - display: none !important; -} - -.smallCaps { - font-size: 117%; - font-variant: small-caps; -} - -/* ##### Header ##### */ -.superHeader { - color: rgb(130, 128, 154); - background-color: rgb(33, 50, 66); - text-align: right; - margin: 0; - padding: 0.5ex 10px; -} - -.superHeader span { - color: rgb(195, 196, 210); - background-color: transparent; - font-weight: bold; - text-transform: uppercase; -} - -.superHeader a { - color: rgb(195, 196, 210); - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.superHeader a:hover { - color: rgb(193, 102, 90); - background-color: transparent; - text-decoration: none; -} - -.midHeader { - color: white; - background-color: rgb(61, 92, 122); - margin: 0; - padding: 0.26ex 10px; -} - -.headerTitle { - font-size: 300%; - margin: 0; - padding: 0; -} - -.headerSubTitle { - font-size: 151%; - font-weight: normal; - font-style: italic; - margin: 0 0 1ex 0; - padding: 0; -} - -.headerLogin { - border: 1px solid rgb(255,255,255); - text-align: right; - padding: 1ex; - position: absolute; - right: 1.5em; - top: 3.5em; -} - -.headerLinks { - text-align: right; - margin: 0; - padding: 0 0 2ex 0; - position: absolute; - right: 1.5em; - top: 3.5em; -} - -.headerLinks a { - color: white; - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0 0.5ex 0; - display: block; -} - -.headerLinks a:hover { - color: rgb(195, 196, 210); - background-color: transparent; - text-decoration: underline; -} - -.subHeader { - color: white; - background-color: rgb(117, 144, 174); - margin: 0; - padding: 0.5ex 10px; -} - -.subHeader a,.subHeader .highlight { - color: white; - background-color: transparent; - font-size: 110%; - font-weight: bold; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.subHeader a:hover,.subHeader .highlight { - color: rgb(255, 204, 0); - background-color: transparent; - text-decoration: none; -} - /* ##### Main Copy ##### */ -#main-copy { - margin: 0; - padding: 0.5em 10px; - clear: left; -} -#main-copy h1 { - color: rgb(117, 144, 174); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - margin: 0; - padding: 0; -} - -#main-copy h2 { - color: rgb(61, 92, 122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-weight: normal; - font-size: 151%; - margin: 0; - padding: 1ex 0 0 0; -} - -#main-copy p { - line-height: 1.75em; - margin: 1em 0 1.5em 0; - padding: 0; -} - .column1,.column2,.column3 { margin: 1em 0; padding: 0 2.5%; @@ -243,35 +27,34 @@ border-left: 1px solid; border-right: 1px solid; border-top: 1px solid; + border-color: rgb(61, 92, 122); + background-color: rgb(61, 92, 122); } .column1 .feed_headline { - border-color: yellow; - background-color: yellow; + } .column1 ul { margin-top: 0em; - border: 1px solid yellow; + border: 1px solid rgb(61, 92, 122); } .column2 .feed_headline { - border-color: red; - background-color: red; + } .column2 ul { - border: 1px solid red; + border: 1px solid rgb(61, 92, 122); margin-top: 0; } .column3 .feed_headline { - border-color: green; - background-color: green; + } .column3 ul { - border: 1px solid green; + border: 1px solid rgb(61, 92, 122); margin-top: 0; } @@ -325,37 +108,4 @@ .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); - * } - */ /* ##### Footer ##### */ -#footer { - color: rgb(51, 51, 102); - background-color: rgb(239, 239, 239); - font-size: 87%; - text-align: center; - line-height: 1.25em; - margin: 2em 0 0 0; - padding: 1ex 10px; - clear: left; -} - -#footer a { - color: rgb(0, 68, 204); - background-color: transparent; - text-decoration: underline; -} - -#footer a:hover { - text-decoration: none; } \ No newline at end of file Modified: trunk/styles/default/page_personal.tpl =================================================================== --- trunk/styles/default/page_personal.tpl 2007-01-08 18:56:41 UTC (rev 97) +++ trunk/styles/default/page_personal.tpl 2007-01-09 21:45:26 UTC (rev 98) @@ -8,8 +8,11 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_personal-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... [truncated message content] |
From: <c1...@us...> - 2007-01-08 18:56:48
|
Revision: 97 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=97&view=rev Author: c167 Date: 2007-01-08 10:56:41 -0800 (Mon, 08 Jan 2007) Log Message: ----------- added translations, translations working now :) Modified Paths: -------------- trunk/page_add_new_feed.php trunk/page_main.php trunk/styles/default/page_add_new_feed-screen.css trunk/styles/default/page_login-screen.css Added Paths: ----------- 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/i18n/en_EN/LC_MESSAGES/page_add_new_feed.po trunk/i18n/en_EN/LC_MESSAGES/page_add_tag.po trunk/i18n/en_EN/LC_MESSAGES/page_login.po trunk/i18n/en_EN/LC_MESSAGES/page_main.po trunk/i18n/en_EN/LC_MESSAGES/page_personal.po trunk/i18n/en_EN/LC_MESSAGES/page_register.po trunk/i18n/en_EN/LC_MESSAGES/page_show_all_feeds.po trunk/i18n/en_EN/LC_MESSAGES/page_show_feed.po trunk/i18n/en_EN/LC_MESSAGES/page_show_feed_tag.po trunk/i18n/en_EN/LC_MESSAGES/update_feeds.po Added: trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.mo =================================================================== (Binary files differ) Property changes on: trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/page_add_new_feed.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,152 @@ +# translation of page_add_new_feed.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: 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" +"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" + +#: page_add_new_feed.php:120 +msgid "Related Sites:" +msgstr "" + +#: page_add_new_feed.php:124 +msgid "Feed-Collector" +msgstr "Feed-Collector" + +#: page_add_new_feed.php:124 +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:136 +msgid "Hello" +msgstr "Hallo" + +#: page_add_new_feed.php:158 +msgid "Marked fields have to be filled!" +msgstr "Markierte Felder muessen gefüllt werden!" + +#: page_add_new_feed.php:174 +msgid "Add a feed" +msgstr "Füge einen Feed hinzu" + +#: page_add_new_feed.php:174 +#, fuzzy +msgid "" +"<b>How do I do that?</b><br />\n" +" The Scripts need some information about the site that creates " +"the script (e.g. name and url) and about the feed (e.g. url, name, type)" +msgstr "" +"<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 +msgid "ADD IT!" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Site Name" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Site URL" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Site Language" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "English" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "German" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Site Image" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Name" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Description" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed URL" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Type" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "ATOM 1.0" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "RSS 2.0" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "RSS 1.0" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "RDF 0.9" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Database Name" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Language" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Image" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Active?" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Yes!" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "No!" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Submit!" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Reset" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Marked fields are required" +msgstr "" + Added: trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.mo =================================================================== (Binary files differ) Property changes on: trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/page_add_tag.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,54 @@ +# translation of page_add_tag.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: 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" +"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" + +#: page_add_tag.php:111 +msgid "Tags" +msgstr "Tags" + +#: page_add_tag.php:143 +msgid "Related Sites:" +msgstr "" + +#: page_add_tag.php:147 +msgid "Feed-Collector" +msgstr "Feed-Collector" + +#: page_add_tag.php:147 +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 +msgid "Add Tag" +msgstr "Füge Tag hinzu" + +#: page_add_tag.php:193 +msgid "tag name" +msgstr "Tag Name" + +#: page_add_tag.php:193 +msgid "Submit!" +msgstr "Abschicken!" + Added: trunk/i18n/de_DE/LC_MESSAGES/page_login.mo =================================================================== (Binary files differ) Property changes on: trunk/i18n/de_DE/LC_MESSAGES/page_login.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/i18n/de_DE/LC_MESSAGES/page_login.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/page_login.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/page_login.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,81 @@ +# translation of page_login.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: 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" +"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" + +#: page_login.php:151 +msgid "Related Sites:" +msgstr "" + +#: page_login.php:155 +msgid "Feed-Collector" +msgstr "Feed-Collector" + +#: page_login.php:155 +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 +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 +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 +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 +msgid "Login" +msgstr "Anmelden" + +#: page_login.php:227 +msgid "Username" +msgstr "Benutzername" + +#: page_login.php:227 +msgid "Password" +msgstr "Passwort" + +#: page_login.php:227 +msgid "Submit!" +msgstr "Absenden!" + +#: page_login.php:227 +msgid "Reset!" +msgstr "Zurücksetzen!" + +#: page_login.php:227 +msgid "All fields are required" +msgstr "Alle Felder müssen ausgefüllt werden" + Added: trunk/i18n/de_DE/LC_MESSAGES/page_main.mo =================================================================== (Binary files differ) Property changes on: trunk/i18n/de_DE/LC_MESSAGES/page_main.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/i18n/de_DE/LC_MESSAGES/page_main.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/page_main.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/page_main.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,136 @@ +# translation of page_main.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: 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" +"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" + +#: ../../../page_main.php:107 +msgid "Related Sites:" +msgstr "" + +#: ../../../page_main.php:111 +msgid "Feed-Collector" +msgstr "Feed-Collector" + +#: ../../../page_main.php:111 +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 +msgid "Welcome!" +msgstr "Willkommen!" + +#: ../../../page_main.php:133 +msgid "" +"<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>" +msgstr "" +"<p>Dieses Projekt heisst Feed-Collector, und ist ein Datenbankgestützter News-Reader.\n" +" Es wurde geschrieben damit es automatisch die Neuigkeiten von Internetseiten einhohlt.\n" +" Es versteht die Formate <acronym title=\"Resource Description Framework\">RDF</acronym>-, \n" +" <acronym title=\"Really Simple Syndication\">RSS</acronym>- and \n" +" <acronym title=\"Atom Syndication Formats\">ATOM</acronym>-News-Feeds \n" +" und zeigt Sie dem Benutzer an. Es ist nicht notwendig, \"alte News\" zu löschen, \n" +" 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" +" <a href=\"./page_select_feeds.php\">Feed-Übersicht</a> anschauen und Feeds aus-/ oder abwählen \n</p>" + +#: ../../../page_main.php:141 +msgid "Latest News" +msgstr "News" + +#: ../../../page_main.php:148 +msgid "More News »" +msgstr "" + +#: ../../../page_main.php:153 +msgid "Statistic" +msgstr "Statistik" + +#: ../../../page_main.php:153 +msgid "Fedds in the Database: " +msgstr "Feeds in der DB: " + +#: ../../../page_main.php:153 +msgid "Items over all:" +msgstr "Items insg.:" + +#: ../../../page_main.php:153 +msgid "Average items per feed:" +msgstr "Items/Feed:" + +#: ../../../page_main.php:153 +msgid "[ATOM 1.0] feeds:" +msgstr "[ATOM 1.0] Feeds:" + +#: ../../../page_main.php:153 +msgid "[RDF 0.9] feeds:" +msgstr "[RDF 0.9] Feeds:" + +#: ../../../page_main.php:153 +msgid "[RSS 2.0] feeds:" +msgstr "[RSS 2.0] Feeds:" + +#: ../../../page_main.php:153 +msgid "[RSS 1.0] feeds" +msgstr "[RSS 1.0] Feeds" + +#: ../../../page_main.php:158 +msgid "biggest feeds" +msgstr "Grösste Feeds" + +#: ../../../page_main.php:161 ../../../page_main.php:171 +#: ../../../page_main.php:181 +msgid " Items" +msgstr " Items" + +#: ../../../page_main.php:168 +msgid "random feeds" +msgstr "Zuf. Feeds" + +#: ../../../page_main.php:178 +msgid "Newest feeds" +msgstr "Neuste Feeds" + Added: trunk/i18n/de_DE/LC_MESSAGES/page_personal.mo =================================================================== (Binary files differ) Property changes on: trunk/i18n/de_DE/LC_MESSAGES/page_personal.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/i18n/de_DE/LC_MESSAGES/page_personal.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/page_personal.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/page_personal.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,42 @@ +# translation of page_personal.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: 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" +"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" + +#: page_personal.php:111 +msgid "Related Sites:" +msgstr "" + +#: page_personal.php:115 +msgid "Feed-Collector" +msgstr "Feed-Collector" + +#: page_personal.php:115 +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 "" + Added: trunk/i18n/de_DE/LC_MESSAGES/page_register.mo =================================================================== (Binary files differ) Property changes on: trunk/i18n/de_DE/LC_MESSAGES/page_register.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/i18n/de_DE/LC_MESSAGES/page_register.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/page_register.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/page_register.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,88 @@ +# translation of page_register.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: 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" +"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" + +#: page_register.php:118 +msgid "Related Sites:" +msgstr "" + +#: page_register.php:122 +msgid "Feed-Collector" +msgstr "Feed-Collector" + +#: page_register.php:122 +msgid "{ stay up to date with all your news feeds! }" +msgstr "{ bleiben Sie mit den News auf dem neuesten Stand! }" + +#: page_register.php:141 +msgid "An error occured" +msgstr "Ein Fehler ist aufgetreten" + +#: page_register.php:157 +msgid "Registration" +msgstr "Registrierung" + +#: page_register.php:157 +msgid "" +"<b>Why register?</b><br />\n" +" If you register, you'll have a personal page with lots of free " +"space to place your favourite newsfeeds (only limited by your screen)" +msgstr "" +"<b>Warum registrieren?</b><br />\n" +" 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 +msgid "Registration information" +msgstr "Registrierungsinformationen" + +#: page_register.php:199 +msgid "Username" +msgstr "Benutzername" + +#: page_register.php:199 +msgid "E-MAIL-address" +msgstr "E-MAIL-Adresse" + +#: page_register.php:199 +msgid "Password" +msgstr "Passwort" + +#: page_register.php:199 +msgid "Repeat password" +msgstr "Passwort wiederholen" + +#: page_register.php:199 +msgid "Language" +msgstr "Sprache" + +#: page_register.php:199 +msgid "English" +msgstr "Englisch" + +#: page_register.php:199 +msgid "German" +msgstr "Deutsch" + +#: page_register.php:199 +msgid "Submit!" +msgstr "Absenden!" + +#: page_register.php:199 +msgid "Reset!" +msgstr "Zurücksetzen!" + Added: trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.mo =================================================================== (Binary files differ) Property changes on: trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/page_show_all_feeds.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,66 @@ +# translation of page_show_all_feeds.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: 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" +"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" + +#: page_show_all_feeds.php:122 +msgid "Related Sites:" +msgstr "" + +#: page_show_all_feeds.php:126 +msgid "Feed-Collector" +msgstr "Feed-Collector" + +#: page_show_all_feeds.php:126 +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 +msgid "Submit" +msgstr "Absenden" + +#: page_show_all_feeds.php:182 page_show_all_feeds.php:236 +msgid "Feed List" +msgstr "Feed-Liste" + +#: page_show_all_feeds.php:182 page_show_all_feeds.php:236 +msgid "Site" +msgstr "Seite" + +#: page_show_all_feeds.php:182 page_show_all_feeds.php:236 +msgid "Tags" +msgstr "Tags" + +#: page_show_all_feeds.php:182 page_show_all_feeds.php:236 +msgid "Languages" +msgstr "Sprachen" + +#: page_show_all_feeds.php:236 +msgid "Feed" +msgstr "Feed" + +#: page_show_all_feeds.php:269 +msgid "Page: " +msgstr "Seite: " + Added: trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.mo =================================================================== (Binary files differ) Property changes on: trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/page_show_feed.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,58 @@ +# translation of page_show_feed.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: 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" +"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" + +#: page_show_feed.php:117 +msgid "Related Sites:" +msgstr "" + +#: page_show_feed.php:121 +msgid "Feed-Collector" +msgstr "Feed-Collector" + +#: page_show_feed.php:121 +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 +msgid "Tags" +msgstr "Tags" + +#: page_show_feed.php:158 +msgid "No tag submitted yet, you can add one " +msgstr "Bis jetzt wurden keine Tags hinzugefügt, Sie k&oouml;nnen einen " + +#: page_show_feed.php:158 +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 +msgid "Page: " +msgstr "Seite: " + Added: trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.mo =================================================================== (Binary files differ) Property changes on: trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/page_show_feed_tag.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,68 @@ +# translation of page_show_feed_tag.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: 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" +"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" + +#: page_show_feed_tag.php:103 +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:" +msgstr "" + +#: page_show_feed_tag.php:121 +msgid "Feed-Collector" +msgstr "Feed-Collector" + +#: page_show_feed_tag.php:121 +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:133 +msgid "Hello" +msgstr "Hallo" + +#: page_show_feed_tag.php:151 +msgid "For comments or questions about this website, please" +msgstr "" + +#: page_show_feed_tag.php:169 +msgid "Feed" +msgstr "Feed" + +#: page_show_feed_tag.php:169 +msgid "Language" +msgstr "Sprache" + +#: page_show_feed_tag.php:198 +msgid "Tags" +msgstr "Tags" + +#: page_show_feed_tag.php:211 +msgid "Select a Tag" +msgstr "Tag auswählen" + +#: page_show_feed_tag.php:211 +msgid "Submit!" +msgstr "Absenden!" + Added: trunk/i18n/de_DE/LC_MESSAGES/update_feeds.po =================================================================== --- trunk/i18n/de_DE/LC_MESSAGES/update_feeds.po (rev 0) +++ trunk/i18n/de_DE/LC_MESSAGES/update_feeds.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,158 @@ +# translation of update_feeds.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: 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" +"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" + +#: update_feeds.php:49 +#, php-format +msgid "Script startet at %s" +msgstr "Das Script wurde um %s gestartet" + +#: update_feeds.php:52 +msgid "Updates are enabled!" +msgstr "Updates sind aktiviert!" + +#: update_feeds.php:73 update_feeds.php:90 +#, php-format +msgid "Script ended with error at %d" +msgstr "Das Script brach um %d mit einem Fehler ab" + +#: update_feeds.php:76 +msgid "Successfully connected to the database" +msgstr "Verbindung zur Datenbank erfolgreich hergestellt" + +#: update_feeds.php:93 +msgid "Successfully SELECTed the feeds-list from the database" +msgstr "" + +#: update_feeds.php:95 +#, php-format +msgid "We have got %d feeds in the database" +msgstr "" + +#: update_feeds.php:119 +msgid "The feed is not active!!" +msgstr "" + +#: update_feeds.php:122 +msgid "The feed is active!" +msgstr "" + +#: update_feeds.php:128 +msgid "WARING!! Difference negative!!" +msgstr "" + +#: update_feeds.php:132 +#, php-format +msgid "No Update: diff: %d -> %d" +msgstr "" + +#: update_feeds.php:133 +#, php-format +msgid "Not to update: %s" +msgstr "" + +#: update_feeds.php:140 +#, php-format +msgid "Update: %s | diff: %s -> %s" +msgstr "" + +#: update_feeds.php:149 +msgid "Feed type is ATOM 1.0, using ATOM-Parser" +msgstr "" + +#: update_feeds.php:153 +msgid "Feed type is RDF 0.9, using RSS-Parser" +msgstr "" + +#: update_feeds.php:157 +msgid "Feed type is RSS 1.0, using RSS-Parser" +msgstr "" + +#: update_feeds.php:161 +msgid "Feed type is RSS 2.0, using RSS-Parser" +msgstr "" + +#: update_feeds.php:165 +msgid "Feed type unknown, using ATOM-Parser" +msgstr "" + +#: update_feeds.php:171 +#, php-format +msgid "Feed invalid: %s" +msgstr "" + +#: update_feeds.php:179 +#, php-format +msgid "We've got %d items in the feed, %d added" +msgstr "" + +#: update_feeds.php:180 +#, php-format +msgid "Feed \"%s\" is up to date now!" +msgstr "" + +#: update_feeds.php:193 +msgid "The script is not allowed to update the feeds.<br />" +msgstr "" + +#: update_feeds.php:199 +msgid "Disconnected from the Database" +msgstr "" + +#: update_feeds.php:200 +#, php-format +msgid "Script finished at %s" +msgstr "" + +#: update_feeds.php:201 +#, php-format +msgid "Script needed %d seconds" +msgstr "" + +#: update_feeds.php:209 +msgid "checking if the url's are already in the db." +msgstr "" + +#: update_feeds.php:230 update_feeds.php:231 +#, php-format +msgid "ERROR: %s" +msgstr "" + +#: update_feeds.php:234 +#, php-format +msgid "Not inserting: %s | %s" +msgstr "" + +#: update_feeds.php:238 +#, php-format +msgid "inserting: %s | %s into the db" +msgstr "" + +#: update_feeds.php:255 update_feeds.php:289 +msgid "Loading the feed was successfull!" +msgstr "" + +#: update_feeds.php:262 update_feeds.php:296 +#, php-format +msgid "The feed has %d items." +msgstr "" + +#: update_feeds.php:273 update_feeds.php:312 +#, php-format +msgid "id: %d | subject: %s | URL: %s" +msgstr "" + Added: trunk/i18n/en_EN/LC_MESSAGES/page_add_new_feed.po =================================================================== --- trunk/i18n/en_EN/LC_MESSAGES/page_add_new_feed.po (rev 0) +++ trunk/i18n/en_EN/LC_MESSAGES/page_add_new_feed.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,148 @@ +# 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-06 14:57+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" + +#: page_add_new_feed.php:120 +msgid "Related Sites:" +msgstr "" + +#: page_add_new_feed.php:124 +msgid "Feed-Collector" +msgstr "" + +#: page_add_new_feed.php:124 +msgid "{ stay up to date with all your news feeds! }" +msgstr "" + +#: page_add_new_feed.php:129 +msgid "You are not logged in" +msgstr "" + +#: page_add_new_feed.php:136 +msgid "Hello" +msgstr "" + +#: page_add_new_feed.php:158 +msgid "Marked fields have to be filled!" +msgstr "" + +#: page_add_new_feed.php:174 +msgid "Add a feed" +msgstr "" + +#: page_add_new_feed.php:174 +msgid "" +"<b>How do I do that?</b><br />\n" +" The Scripts need some information about the site that creates " +"the script (e.g. name and url) and about the feed (e.g. url, name, type)" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "ADD IT!" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Site Name" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Site URL" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Site Language" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "English" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "German" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Site Image" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Name" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Description" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed URL" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Type" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "ATOM 1.0" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "RSS 2.0" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "RSS 1.0" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "RDF 0.9" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Database Name" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Language" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Feed Image" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Active?" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Yes!" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "No!" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Submit!" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Reset" +msgstr "" + +#: page_add_new_feed.php:259 +msgid "Marked fields are required" +msgstr "" Added: trunk/i18n/en_EN/LC_MESSAGES/page_add_tag.po =================================================================== --- trunk/i18n/en_EN/LC_MESSAGES/page_add_tag.po (rev 0) +++ trunk/i18n/en_EN/LC_MESSAGES/page_add_tag.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,53 @@ +# 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-06 14:57+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" + +#: page_add_tag.php:111 +msgid "Tags" +msgstr "" + +#: page_add_tag.php:143 +msgid "Related Sites:" +msgstr "" + +#: page_add_tag.php:147 +msgid "Feed-Collector" +msgstr "" + +#: page_add_tag.php:147 +msgid "{ stay up to date with all your news feeds! }" +msgstr "" + +#: page_add_tag.php:152 +msgid "You are not logged in" +msgstr "" + +#: page_add_tag.php:159 +msgid "Hello" +msgstr "" + +#: page_add_tag.php:193 +msgid "Add Tag" +msgstr "" + +#: page_add_tag.php:193 +msgid "tag name" +msgstr "" + +#: page_add_tag.php:193 +msgid "Submit!" +msgstr "" Added: trunk/i18n/en_EN/LC_MESSAGES/page_login.po =================================================================== --- trunk/i18n/en_EN/LC_MESSAGES/page_login.po (rev 0) +++ trunk/i18n/en_EN/LC_MESSAGES/page_login.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,80 @@ +# 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-06 14:57+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" + +#: page_login.php:151 +msgid "Related Sites:" +msgstr "" + +#: page_login.php:155 +msgid "Feed-Collector" +msgstr "" + +#: page_login.php:155 +msgid "{ stay up to date with all your news feeds! }" +msgstr "" + +#: page_login.php:160 +msgid "You are not logged in" +msgstr "" + +#: page_login.php:167 +msgid "Hello" +msgstr "" + +#: page_login.php:191 +msgid "" +"Unknown username. If you don't have a username then please <a href=\"./" +"page_register.pgp\">register</a> a new one" +msgstr "" + +#: page_login.php:196 +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 "" + +#: page_login.php:201 page_login.php:206 +msgid "" +"Please enter you username and your password to login. Cookies have to be " +"enabled from this point." +msgstr "" + +#: page_login.php:227 +msgid "Login" +msgstr "" + +#: page_login.php:227 +msgid "Username" +msgstr "" + +#: page_login.php:227 +msgid "Password" +msgstr "" + +#: page_login.php:227 +msgid "Submit!" +msgstr "" + +#: page_login.php:227 +msgid "Reset!" +msgstr "" + +#: page_login.php:227 +msgid "All fields are required" +msgstr "" Added: trunk/i18n/en_EN/LC_MESSAGES/page_main.po =================================================================== --- trunk/i18n/en_EN/LC_MESSAGES/page_main.po (rev 0) +++ trunk/i18n/en_EN/LC_MESSAGES/page_main.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,102 @@ +# 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-06 14:56+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" + +#: page_main.php:107 +msgid "Related Sites:" +msgstr "" + +#: page_main.php:111 +msgid "Feed-Collector" +msgstr "" + +#: page_main.php:111 +msgid "{ stay up to date with all your news feeds! }" +msgstr "" + +#: page_main.php:116 +msgid "You are not logged in" +msgstr "" + +#: page_main.php:123 +msgid "Hello" +msgstr "" + +#: page_main.php:133 +msgid "Welcome!" +msgstr "" + +#: page_main.php:133 +msgid "" +"<p>This is the home of Feed-Collector, an database-driven news-reader.\n" +msgstr "" + +#: page_main.php:152 +msgid "Latest News" +msgstr "" + +#: page_main.php:159 +msgid "More News »" +msgstr "" + +#: page_main.php:164 +msgid "Statistic" +msgstr "" + +#: page_main.php:164 +msgid "Fedds in the Database: " +msgstr "" + +#: page_main.php:164 +msgid "Items over all:" +msgstr "" + +#: page_main.php:164 +msgid "Average items per feed:" +msgstr "" + +#: page_main.php:164 +msgid "[ATOM 1.0] feeds:" +msgstr "" + +#: page_main.php:164 +msgid "[RDF 0.9] feeds:" +msgstr "" + +#: page_main.php:164 +msgid "[RSS 2.0] feeds:" +msgstr "" + +#: page_main.php:164 +msgid "[RSS 1.0] feeds" +msgstr "" + +#: page_main.php:169 +msgid "biggest feeds" +msgstr "" + +#: page_main.php:172 page_main.php:182 page_main.php:192 +msgid " Items" +msgstr "" + +#: page_main.php:179 +msgid "random feeds" +msgstr "" + +#: page_main.php:189 +msgid "Newest feeds" +msgstr "" Added: trunk/i18n/en_EN/LC_MESSAGES/page_personal.po =================================================================== --- trunk/i18n/en_EN/LC_MESSAGES/page_personal.po (rev 0) +++ trunk/i18n/en_EN/LC_MESSAGES/page_personal.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,41 @@ +# 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-06 14:58+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" + +#: page_personal.php:111 +msgid "Related Sites:" +msgstr "" + +#: page_personal.php:115 +msgid "Feed-Collector" +msgstr "" + +#: page_personal.php:115 +msgid "{ stay up to date with all your news feeds! }" +msgstr "" + +#: page_personal.php:120 +msgid "You are not logged in" +msgstr "" + +#: page_personal.php:127 +msgid "Hello" +msgstr "" + +#: page_personal.php:178 +msgid "For comments or questions about this website, please" +msgstr "" Added: trunk/i18n/en_EN/LC_MESSAGES/page_register.po =================================================================== --- trunk/i18n/en_EN/LC_MESSAGES/page_register.po (rev 0) +++ trunk/i18n/en_EN/LC_MESSAGES/page_register.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,84 @@ +# 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-06 14:58+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" + +#: page_register.php:118 +msgid "Related Sites:" +msgstr "" + +#: page_register.php:122 +msgid "Feed-Collector" +msgstr "" + +#: page_register.php:122 +msgid "{ stay up to date with all your news feeds! }" +msgstr "" + +#: page_register.php:141 +msgid "An error occured" +msgstr "" + +#: page_register.php:157 +msgid "Registration" +msgstr "" + +#: page_register.php:157 +msgid "" +"<b>Why register?</b><br />\n" +" If you register, you'll have a personal page with lots of free " +"space to place your favourite newsfeeds (only limited by your screen)" +msgstr "" + +#: page_register.php:199 +msgid "Registration information" +msgstr "" + +#: page_register.php:199 +msgid "Username" +msgstr "" + +#: page_register.php:199 +msgid "E-MAIL-address" +msgstr "" + +#: page_register.php:199 +msgid "Password" +msgstr "" + +#: page_register.php:199 +msgid "Repeat password" +msgstr "" + +#: page_register.php:199 +msgid "Language" +msgstr "" + +#: page_register.php:199 +msgid "English" +msgstr "" + +#: page_register.php:199 +msgid "German" +msgstr "" + +#: page_register.php:199 +msgid "Submit!" +msgstr "" + +#: page_register.php:199 +msgid "Reset!" +msgstr "" Added: trunk/i18n/en_EN/LC_MESSAGES/page_show_all_feeds.po =================================================================== --- trunk/i18n/en_EN/LC_MESSAGES/page_show_all_feeds.po (rev 0) +++ trunk/i18n/en_EN/LC_MESSAGES/page_show_all_feeds.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,65 @@ +# 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-06 14:58+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" + +#: page_show_all_feeds.php:122 +msgid "Related Sites:" +msgstr "" + +#: page_show_all_feeds.php:126 +msgid "Feed-Collector" +msgstr "" + +#: page_show_all_feeds.php:126 +msgid "{ stay up to date with all your news feeds! }" +msgstr "" + +#: page_show_all_feeds.php:131 +msgid "You are not logged in" +msgstr "" + +#: page_show_all_feeds.php:138 +msgid "Hello" +msgstr "" + +#: page_show_all_feeds.php:182 page_show_all_feeds.php:221 +msgid "Submit" +msgstr "" + +#: page_show_all_feeds.php:182 page_show_all_feeds.php:236 +msgid "Feed List" +msgstr "" + +#: page_show_all_feeds.php:182 page_show_all_feeds.php:236 +msgid "Site" +msgstr "" + +#: page_show_all_feeds.php:182 page_show_all_feeds.php:236 +msgid "Tags" +msgstr "" + +#: page_show_all_feeds.php:182 page_show_all_feeds.php:236 +msgid "Languages" +msgstr "" + +#: page_show_all_feeds.php:236 +msgid "Feed" +msgstr "" + +#: page_show_all_feeds.php:269 +msgid "Page: " +msgstr "" Added: trunk/i18n/en_EN/LC_MESSAGES/page_show_feed.po =================================================================== --- trunk/i18n/en_EN/LC_MESSAGES/page_show_feed.po (rev 0) +++ trunk/i18n/en_EN/LC_MESSAGES/page_show_feed.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,57 @@ +# 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-06 14:58+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" + +#: page_show_feed.php:117 +msgid "Related Sites:" +msgstr "" + +#: page_show_feed.php:121 +msgid "Feed-Collector" +msgstr "" + +#: page_show_feed.php:121 +msgid "{ stay up to date with all your news feeds! }" +msgstr "" + +#: page_show_feed.php:126 +msgid "You are not logged in" +msgstr "" + +#: page_show_feed.php:133 +msgid "Hello" +msgstr "" + +#: page_show_feed.php:155 +msgid "Tags" +msgstr "" + +#: page_show_feed.php:158 +msgid "No tag submitted yet, you can add one " +msgstr "" + +#: page_show_feed.php:158 +msgid "here!" +msgstr "" + +#: page_show_feed.php:169 +msgid "For comments or questions about this website, please" +msgstr "" + +#: page_show_feed.php:206 +msgid "Page: " +msgstr "" Added: trunk/i18n/en_EN/LC_MESSAGES/page_show_feed_tag.po =================================================================== --- trunk/i18n/en_EN/LC_MESSAGES/page_show_feed_tag.po (rev 0) +++ trunk/i18n/en_EN/LC_MESSAGES/page_show_feed_tag.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,67 @@ +# 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-06 14:58+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" + +#: page_show_feed_tag.php:103 +msgid "" +"You did not select a tag, please select one on the input-field on the right " +"side of the site... -->" +msgstr "" + +#: page_show_feed_tag.php:117 +msgid "Related Sites:" +msgstr "" + +#: page_show_feed_tag.php:121 +msgid "Feed-Collector" +msgstr "" + +#: page_show_feed_tag.php:121 +msgid "{ stay up to date with all your news feeds! }" +msgstr "" + +#: page_show_feed_tag.php:126 +msgid "You are not logged in" +msgstr "" + +#: page_show_feed_tag.php:133 +msgid "Hello" +msgstr "" + +#: page_show_feed_tag.php:151 +msgid "For comments or questions about this website, please" +msgstr "" + +#: page_show_feed_tag.php:169 +msgid "Feed" +msgstr "" + +#: page_show_feed_tag.php:169 +msgid "Language" +msgstr "" + +#: page_show_feed_tag.php:198 +msgid "Tags" +msgstr "" + +#: page_show_feed_tag.php:211 +msgid "Select a Tag" +msgstr "" + +#: page_show_feed_tag.php:211 +msgid "Submit!" +msgstr "" Added: trunk/i18n/en_EN/LC_MESSAGES/update_feeds.po =================================================================== --- trunk/i18n/en_EN/LC_MESSAGES/update_feeds.po (rev 0) +++ trunk/i18n/en_EN/LC_MESSAGES/update_feeds.po 2007-01-08 18:56:41 UTC (rev 97) @@ -0,0 +1,157 @@ +# 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-06 14:59+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" + +#: update_feeds.php:49 +#, php-format +msgid "Script startet at %s" +msgstr "" + +#: update_feeds.php:52 +msgid "Updates are enabled!" +msgstr "" + +#: update_feeds.php:73 update_feeds.php:90 +#, php-format +msgid "Script ended with error at %d" +msgstr "" + +#: update_feeds.php:76 +msgid "Successfully connected to the database" +msgstr "" + +#: update_feeds.php:93 +msgid "Successfully SELECTed the feeds-list from the database" +msgstr "" + +#: update_feeds.php:95 +#, php-format +msgid "We have got %d feeds in the database" +msgstr "" + +#: update_feeds.php:119 +msgid "The feed is not active!!" +msgstr "" + +#: update_feeds.php:122 +msgid "The feed is active!" +msgstr "" + +#: update_feeds.php:128 +msgid "WARING!! Difference negative!!" +msgstr "" + +#: update_feeds.php:132 +#, php-format +msgid "No Update: diff: %d -> %d" +msgstr "" + +#: update_feeds.php:133 +#, php-format +msgid "Not to update: %s" +msgstr "" + +#: update_feeds.php:140 +#, php-format +msgid "Update: %s | diff: %s -> %s" +msgstr "" + +#: update_feeds.php:149 +msgid "Feed type is ATOM 1.0, using ATOM-Parser" +msgstr "" + +#: update_feeds.php:153 +msgid "Feed type is RDF 0.9, using RSS-Parser" +msgstr "" + +#: update_feeds.php:157 +msgid "Feed type is RSS 1.0, using RSS-Parser" +msgstr "" + +#: update_feeds.php:161 +msgid "Feed type is RSS 2.0, using RSS-Parser" +msgstr "" + +#: update_feeds.php:165 +msgid "Feed type unknown, using ATOM-Parser" +msgstr "" + +#: update_feeds.php:171 +#, php-format +msgid "Feed invalid: %s" +msgstr "" + +#: update_feeds.php:179 +#, php-format +msgid "We've got %d items in the feed, %d added" +msgstr "" + +#: update_feeds.php:180 +#, php-format +msgid "Feed \"%s\" is up to date now!" +msgstr "" + +#: update_feeds.php:193 +msgid "The script is not allowed to update the feeds.<br />" +msgstr "" + +#: update_feeds.php:199 +msgid "Disconnected from the Database" +msgstr "" + +#: update_feeds.php:200 +#, php-format +msgid "Script finished at %s" +msgstr "" + +#: update_feeds.php:201 +#, php-format +msgid "Script needed %d seconds" +msgstr "" + +#: update_feeds.php:209 +msgid "checking if the url's are already in the db." +msgstr "" + +#: update_feeds.php:230 update_feeds.php:231 +#, php-format +msgid "ERROR: %s" +msgstr "" + +#: update_feeds.php:234 +#, php-format +msgid "Not inserting: %s | %s" +msgstr "" + +#: update_feeds.php:238 +#, php-format +msgid "inserting: %s | %s into the db" +msgstr "" + +#: update_feeds.php:255 update_feeds.php:289 +msgid "Loading the feed was successfull!" +msgstr "" + +#: update_feeds.php:262 update_feeds.php:296 +#, php-format +msgid "The feed has %d items." +msgstr "" + +#: update_feeds.php:273 update_feeds.php:312 +#, php-format +msgid "id: %d | subject: %s | URL: %s" +msgstr "" Modified: trunk/page_add_new_feed.php =================================================================== --- trunk/page_add_new_feed.php 2007-01-06 16:38:25 UTC (rev 96) +++ trunk/page_add_new_feed.php 2007-01-08 18:56:41 UTC (rev 97) @@ -91,12 +91,14 @@ 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)) { +} +elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) { $language = HTTP_Session :: get("lang"); } else { $language = "en_EN"; @@ -150,14 +152,37 @@ //print_r($_POST); if (!empty ($_POST['site_name']) and !empty ($_POST['site_url']) and !empty ($_POST['site_lang']) and !empty ($_POST['feed_name']) and !empty ($_POST['feed_url']) and !empty ($_POST['feed_type']) and !empty ($_POST['feed_db_name']) and !empty ($_POST['feed_lang']) and !empty ($_POST['is_active'])) { echo 1; - + $sql = sprintf("INSERT INTO `feeds` (`ID`, `site_name`, `site_url`, `site_lang`, " . + "`site_img`, `feed_name`, `feed_description`, `feed_url`, `feed_type`, `feed_db_name`, " . + "`feed_lang`, `feed_img`, `is_active`, `last_change`, `added`, `items`) VALUES " . + "(null, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d);", $_POST['site_name'], $_POST['site_url'], $_POST['site_lang'], !empty ($_POST['site_img']) ? $_POST['site_img'] : "", $_POST['feed_name'], !empty ($_POST['feed_description']) ? $_POST['feed_description'] : "", $_POST['feed_url'], $_POST['feed_type'], $_POST['feed_db_name'], $_POST['feed_lang'], !empty ($_POST['feed_img']) ? $_POST['feed_img'] : "", $_POST['is_active'], 0, time(), 0); + // $a > 5 ? "big" : "small"; + $insert = $db-query($sql); + if (PEAR :: isError($insert)) { + buildForm(& $main, _("Error, please check everything...")); + } else { + $db_name = $_POST['feed_db_name']; + $table = $db->query("CREATE TABLE `f_$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 ;"); + if (PEAR :: isError($table)) { + buildForm(& $main, _("Error, please check everything...")); + } else { + HTTP :: redirect("./page_show_all_feeds.php"); + } + } } else { - echo 2; if (!empty ($_POST['site_name']) or !empty ($_POST['site_url']) or !empty ($_POST['site_lang']) or !empty ($_POST['feed_name']) or !empty ($_POST['feed_url']) or !empty ($_POST['feed_type']) or !empty ($_POST['feed_db_name']) or !empty ($_POST['feed_lang']) or !empty ($_POST['is_active'])) { - echo 3; buildForm($main, _("Marked fields have to be filled!")); } else { - echo 4; buildForm($main); } } Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-01-06 16:38:25 UTC (rev 96) +++ trunk/page_main.php 2007-01-08 18:56:41 UTC (rev 97) @@ -85,13 +85,13 @@ } else { $language = "en_EN"; } -echo $language; +//echo $language; putenv("LANG=$language"); -echo setlocale(LC_ALL, $language); -echo "<br />"; -echo bindtextdomain("page_main", "./i18n"); -echo "<br />"; -echo textdomain("page_main"); +setlocale(LC_ALL, $language); +//echo "<br />"; +bindtextdomain("page_main", "./i18n"); +//echo "<br />"; +textdomain("page_main"); // // Now we're going to replace the placeholders in the template with the important content @@ -147,7 +147,7 @@ " <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 .= sprintf(" <div class=\"more\"><a href=\"./page_news.php\">%s</a></div>\n\n" . +$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 »")); $design = str_replace("<!-- latest news -->", $latest_news, $design); @@ -181,7 +181,7 @@ $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(("m.d.y H:m:s"), $newest['added']), $newest['items'], _(" Items")); + $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); Modified: trunk/styles/default/page_add_new_feed-screen.css =================================================================== --- trunk/styles/default/page_add_new_feed-screen.css 2007-01-06 16:38:25 UTC (rev 96) +++ trunk/styles/default/page_add_new_feed-screen.css 2007-01-08 18:56:41 UTC (rev 97) @@ -15,7 +15,7 @@ font-size: 9pt; } -acronym,.titleTip { +acronym,.titleTip {echo 4; border-bottom: 1px dotted rgb(61, 92, 122); cursor: help; margin: 0; @@ -239,15 +239,17 @@ } .required .formElem { - border-top: 1px dashed red; +/* border-top: 1px dashed red; border-left: 1px dashed red; - border-bottom: 1px dashed red; + border-bottom: 1px dashed red;*/ + background-color: rgb(204, 204, 204); } .required .formField { - border-top: 1px dashed red; + /*border-top: 1px dashed red; border-right: 1px dashed red; - border-bottom: 1px dashed red; + border-bottom: 1px dashed red;*/ + background-color: rgb(204, 204, 204); } .formElem,.formField { Modified: trunk/styles/default/page_login-screen.css =================================================================== --- trunk/styles/default/page_login-screen.css 2007-01-06 16:38:25 UTC (rev 96) +++ trunk/styles/default/page_login-screen.css 2007-01-08 18:56:41 UTC (rev 97) @@ -214,13 +214,13 @@ padding: 0; } -#registration_form { +#registration_form table { float: left; border: 1px solid rgb(204, 204, 204); - width: 80%; + width: 60%; margin-top: 1em; - margin-left: 9%; - margin-right: 9%; + margin-left: 20%; + } #formtitle { @@ -229,33 +229,22 @@ background-color: rgb(117, 144, 174); font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; font-size: 200%; -/* margin: 0;*/ padding: 0.5ex 10px; border-bottom: 1px solid rgb(204, 204, 204); } -.left,.right { - float: left; +.left_side,.right_side { + padding-top: 1%; + padding-bottom: 1%; + width: 49%; } -.left { - border-right: 1px solid rgb(204, 204, 204); -... [truncated message content] |
From: <c1...@us...> - 2007-01-06 16:38:27
|
Revision: 96 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=96&view=rev Author: c167 Date: 2007-01-06 08:38:25 -0800 (Sat, 06 Jan 2007) Log Message: ----------- Modified Paths: -------------- trunk/page_main.php Added Paths: ----------- trunk/i18n/de_DE/ trunk/i18n/de_DE/LC_MESSAGES/ trunk/i18n/en_EN/ trunk/i18n/en_EN/LC_MESSAGES/ Removed Paths: ------------- trunk/i18n/de_DE.php trunk/i18n/en_EN.php trunk/i18n/strings.php trunk/styles/sinorca2/ Deleted: trunk/i18n/de_DE.php =================================================================== --- trunk/i18n/de_DE.php 2007-01-06 15:13:49 UTC (rev 95) +++ trunk/i18n/de_DE.php 2007-01-06 16:38:25 UTC (rev 96) @@ -1,92 +0,0 @@ -<?php -/* - * Language file - * This is the language-file for: - * GERMAN - * - * @version 0.1 - * @author Stefan Valouch - */ -//$TEXT_css_ = - -// General Section -// Strings in here may appear on every page -$TEXT_global_navigation = "Navigation:"; -$TEXT_global_navigate_this_page = "Seitennavigation"; -$TEXT_global_Sample_menu = "Sample menu"; -$TEXT_global_you_are_here = "Sie sind hier: "; -$TEXT_global_main = "Hauptseite"; -$TEXT_global_search = "Suchen"; -$TEXT_global_searchresults = "Suchergebnisse"; -$TEXT_global_show = ""; -$TEXT_global_gototop = "Go to the top of this page"; -$TEXT_global_top = "^ TOP"; -// blocks -$TEXT_global_b1_title = "<a href=\"?page=version\">dev://VERSION</a>"; -$TEXT_global_b1_content = "<u><b>Version: 0.2</b></u><br /> Das ist die erste Version des Scriptes. Ein Teil des Codes funktioniert bereits, aber noch können weder Feeds geparsed werden noch News präsentiert werden."; -$TEXT_global_b2_title = "<a href=\"?page=php\">dev://PHP</a>"; -$TEXT_global_b2_content = "<u><b>Process: 20 %</b></u><br /> Es gibt Probleme mit den Datenbankfunktionen.<br />Der Teil des Codes, der die Projektseiten darstellt, funktioniert wie Sie sehen, sonst würden Sie das hier nicht sehen ;-)"; -$TEXT_global_b3_title = "<a href=\"?page=mysql\">dev://MySQL</a>"; -//$TEXT_global_b3_content = "<u><b>Process: 20 %</b></u><br /> Die Channels-Tabelle ist fast fertig, aber ich finde fast täglich Dinge, die man vielleicht noch hinzunehmen könnte, auch bin ich mir nicht sicher, ob ich für alle benötigten Information entsprechende Spalten in den feed-Tabellen habe."; -$TEXT_global_b3_content = "<u><b>Process: 20 %</b></u><br /> Channels-Tabelle fast fertig, finde fast täglich Dinge, die man vielleicht noch hinzunehmen könnte."; -$TEXT_global_b4_title = "<a href=\"?page=html\">dev://HTML</a>"; -$TEXT_global_b4_content = "<u><b>Process: 10 %</b></u><br /> Diese Seite unterliegt ständiger Entwicklung. \n <span class=\"titleTip\" title=\"At the time\">ATM</span> gibt es keine weiteren Seiten ausser diesen zu sehen, \n aber ich arbeite daran!"; -$TEXT_global_b5_title = "<a href=\"?page=css\">dev://CSS</a>"; -$TEXT_global_b5_content = "<u><b>Process: 90 %</b></u><br /> Das Stylesheet für das Standart-Design ist fast fertig."; -// links -$TEXT_global_links = array('Home'=>'?page=main', 'News'=>'?page=news'); - -// The main Page -// page = main - -$TEXT_main_site_title = "Feed collector - Watch the FEED!"; -$TEXT_main_site_title = "Feed collector - Watch the FEED!"; -$TEXT_main_related_sites = "Related sites:"; -$TEXT_main_more_rel_sites = "More related sites:"; -$TEXT_main_title = "Feed collector!"; -$TEXT_main_welcome = "› Willkommen..."; -$TEXT_main_Sample_menu = "Sample menu"; -$TEXT_main_sites = "Seiten:"; - - -$TEXT_main_1_id = "welcome"; -$TEXT_main_1_title = "Willkommen"; -$TEXT_main_1_content = "<p>Wilkommen auf der Homepage des \"feed collector\". Das ist die Hauptseite, die Ihnen erklären \n wird, was \"feed collector\" ist.<br />Diese Seite ist erst der Anfang, das eigentliche Script \n ist zurzeit noch pre-Alpha</p>"; -$TEXT_main_2_id = "background"; -$TEXT_main_2_title = "Hintergrund: News-feeds"; -$TEXT_main_2_content = "<p>Wir alle wissen, dass das Internet riesig ist.<br />Sehr riesig! Es gibt unzählbar viele \n Seiten. Um uns auf einfache Weise auf dem laufenden zu halten, bieten uns viele Seiten so genannte\n \"news feeds\" an. Diese Feeds sind recht simple <a href=\"http://de.wikipedia.org/wiki/XML\">XML</a>-Dateien, die einige Informationen enthalten. Es gibt einige verschiedene Standarts und dieses Script wird in der Lage sein, die beiden meist verwendetsten zu verarbeiten:<br /></p>\n <ul>\n <li><a href=\"http://de.wikipedia.org/wiki/RSS\">RSS</a> Versionen 0.9, 1.0 und 2.0</li>\n <li><a href=\"http://de.wikipedia.org/wiki/ATOM\">ATOM</a> Version 1.0</li>\n </ul><p> </p>"; -$TEXT_main_3_id = "overview"; -$TEXT_main_3_title = "Und wofür ist dieses Script?"; -$TEXT_main_3_content = "<p>Einige Leute möchten gerne über die Vorgänge auf einer Seite oder die Entwicklung von Programmen informiert sein. Sie können dazu Programme wie\n <a href=\"http://thunderbird-mail.de/\">Mozilla Thunderbird</a> oer <a href=\"http://google.de/\">RSS OWL</a> benutzen. \n Linux-Benutzer, die das Desktop-System <a href=\"http://kde.org/\">KDE</a> benutzen, haben bereits\n ein sehr gutes Programm: <a href=\"http://google.de/\">aKregator</a></p>"; - -// the page dev://HTML -$TEXT_html_site_title = "Feed collector - Watch the FEED!"; -$TEXT_html_related_sites = "Related sites:"; -$TEXT_html_more_rel_sites = "More related sites:"; -$TEXT_html_title = "Feed collector!"; -$TEXT_html_welcome = "› Willkommen..."; -$TEXT_html_Sample_menu = "Sample menu"; -$TEXT_html_sites = "Seiten:"; - -// the page dev://CSS -$TEXT_css_site_title = "Feed collector - Watch the FEED!"; -$TEXT_css_related_sites = "Related sites:"; -$TEXT_css_more_rel_sites = "More related sites:"; -$TEXT_css_title = "Feed collector!"; -$TEXT_css_welcome = "› Willkommen..."; -$TEXT_css_Sample_menu = "Sample menu"; -$TEXT_css_sites = "Seiten:"; -$TEXT_css_1_id = "welcome"; -$TEXT_css_1_title = "Willkommen"; -$TEXT_css_1_content = "<p>Wilkommen auf der Homepage des \"feed collector\". Das ist die Hauptseite, die Ihnen erklären \n wird, was \"feed collector\" ist.<br />Diese Seite ist erst der Anfang, das eigentliche Script \n ist zurzeit noch pre-Alpha</p>"; -$TEXT_css_2_id = "background"; -$TEXT_css_2_title = "Hintergrund: News-feeds"; -$TEXT_css_2_content = "<p>Wir alle wissen, dass das Internet riesig ist.<br />Sehr riesig! Es gibt unzählbar viele \n Seiten. Um uns auf einfache Weise auf dem laufenden zu halten, bieten uns viele Seiten so genannte\n \"news feeds\" an. Diese Feeds sind recht simple <a href=\"http://de.wikipedia.org/wiki/XML\">XML</a>-Dateien, die einige Informationen enthalten. Es gibt einige verschiedene Standarts und dieses Script wird in der Lage sein, die beiden meist verwendetsten zu verarbeiten:<br /></p>\n <ul>\n <li><a href=\"http://de.wikipedia.org/wiki/RSS\">RSS</a> Versionen 0.9, 1.0 und 2.0</li>\n <li><a href=\"http://de.wikipedia.org/wiki/ATOM\">ATOM</a> Version 1.0</li>\n </ul><p> </p>"; -$TEXT_css_3_id = "overview"; -$TEXT_css_3_title = "Und wofür ist dieses Script?"; -$TEXT_css_3_content = "<p>Einige Leute möchten gerne über die Vorgänge auf einer Seite oder die Entwicklung von Programmen informiert sein. Sie können dazu Programme wie\n <a href=\"http://thunderbird-mail.de/\">Mozilla Thunderbird</a> oer <a href=\"http://google.de/\">RSS OWL</a> benutzen. \n Linux-Benutzer, die das Desktop-System <a href=\"http://kde.org/\">KDE</a> benutzen, haben bereits\n ein sehr gutes Programm: <a href=\"http://google.de/\">aKregator</a></p>"; - -// Image -$IMAGE_de = 'German.gif'; - -?> \ No newline at end of file Deleted: trunk/i18n/en_EN.php =================================================================== --- trunk/i18n/en_EN.php 2007-01-06 15:13:49 UTC (rev 95) +++ trunk/i18n/en_EN.php 2007-01-06 16:38:25 UTC (rev 96) @@ -1,80 +0,0 @@ -<?php -/* - * Language file - * This is the language-file for: - * GERMAN - * - * @version 0.1 - * @author Stefan Valouch - */ -//$TEXT__ = - -// General Section -// Strings in here may appear on every page -$TEXT_global_navigate_this_page = "Navigation"; -$TEXT_global_navigation = "Navigation:"; -$TEXT_global_Sample_menu = "Sample menu"; -$TEXT_global_you_are_here = "You are here: "; -$TEXT_global_main = "Hauptseite"; -$TEXT_global_search = "Suchen"; -$TEXT_global_searchresults = "Suchergebnisse"; -$TEXT_global_show = ""; -$TEXT_global_gototop = "Go to the top of this page"; -$TEXT_global_top = "^ TOP"; -// blocks -$TEXT_global_b1_title = "<a href=\"?page=version\">dev://VERSION</a>"; -$TEXT_global_b1_content = "<u><b>Version: 0.2</b></u><br /> This is the initial release. some code is working, but the script cannot parse feeds or display items"; -$TEXT_global_b2_title = "<a href=\"?page=php\">dev://PHP</a>"; -$TEXT_global_b2_content = "<u><b>Progress: 20 %</b></u><br /> There are problems with the database-connection.<br />The page-code, that is finished yet, works fine, otherwise you would not see this ;-)"; -$TEXT_global_b3_title = "<a href=\"?page=mysql\">dev://MySQL</a>"; -$TEXT_global_b3_content = "<u><b>Progress: 20 %</b></u><br /> The Channels-table is nearly finished, but I find \n new things to add every day. I'm not sure if I included all the necesary information \n in the feed_tables."; -$TEXT_global_b4_title = "<a href=\"?page=html\">dev://HTML</a>"; -$TEXT_global_b4_content = "<u><b>Progress: 10 %</b></u><br /> The site is under heavy development. \n <span class=\"titleTip\" title=\"At the time\">ATM</span>, there are no more pages to see, \n cause there are problems with the stylesheets."; -$TEXT_global_b5_title = "<a href=\"?page=css\">dev://CSS</a>"; -$TEXT_global_b5_content = "<u><b>Progress: 90 %</b></u><br /> The stylesheet of the default-template is nearly finished."; - - -// The main Page -// page = main - -$TEXT_main_site_title = "Feed collector - Watch the FEED!"; -$TEXT_main_related_sites = "Related sites:"; -$TEXT_main_more_rel_sites = "More related sites:"; -$TEXT_main_title = "Feed collector!"; -$TEXT_main_welcome = "› Welcome..."; -$TEXT_main_sample_menu = "Sample menu"; -$TEXT_main_sites = "Sites:"; -$TEXT_main_l_highlight = " class=\"highlight\""; -$TEXT_main_l1_link = "?page=main"; -$TEXT_main_l1_title = "Home"; -$TEXT_main_l2_link = ""; -$TEXT_main_l2_title = "Deadlink"; -$TEXT_main_l3_link = ""; -$TEXT_main_l3_title = "Other"; -$TEXT_main_l4_link = ""; -$TEXT_main_l4_title = "Header"; -$TEXT_main_l5_link = ""; -$TEXT_main_l5_title = "Links"; -/* <a href="./index.php" class="highlight">Home</a> | - <a href="./index.php">Deadlink</a> | - <a href="./index.html">Other</a> | - <a href="./index.html">Header</a> | - <a href="./index.html">Links</a> -*/ -$TEXT_main_1_id = "welcome"; -$TEXT_main_1_title = "Welcome"; -$TEXT_main_1_content = "<p>Welcome to the home of \"feed collector\". This is the main page, that will explain You, what \n \"feed collector\" is.<br />This page is only the beginning, as the main script is pre-alpha \n at this time.<p>"; -$TEXT_main_2_id = "background"; -$TEXT_main_2_title = "Background: News-feeds"; -$TEXT_main_2_content = "<p>We all know that the internet is huge.<br />Very huge. There are much more pages and sites \n than anyone could ever count. In order to keep us up to date, there are tens of thousands of sites\n provide so called \"news feeds\". These feeds are quite simple <a href=\"http://en.wikipedia.org/wiki/XML\">XML</a>-pages containing some informations. There are several standarts for these feed files, this script will be able to parse the two most popular ones:<br /></p>\n <ul>\n <li><a href=\"http://en.wikipedia.org/wiki/RSS\">RSS</a> Versions 0.9, 1.0 and 2.0</li>\n <li><a href=\"http://en.wikipedia.org/wiki/ATOM\">ATOM</a> Version 1.0</li>\n </ul>\n<p> </p>"; -$TEXT_main_3_id = "overview"; -$TEXT_main_3_title = "Now what's this script good for?"; -$TEXT_main_3_content = "<p>Some people want to keep an eye on several sites. They can use programms like \n <a href=\"http://thunderbird-mail.de/\">Mozilla Thunderbird</a> or <a href=\"http://google.de/\">RSS OWL</a>. \n Linux users who use the Desktop-system <a href=\"http://kde.org/\">KDE</a> have already a good tool: \n <a href=\"http://google.de/\">aKregator</a></p>"; - -// The error-pages -// page = 404 -$TEXT_404_title = ""; -$TEXT_404_ = ""; - - -?> \ No newline at end of file Deleted: trunk/i18n/strings.php =================================================================== --- trunk/i18n/strings.php 2007-01-06 15:13:49 UTC (rev 95) +++ trunk/i18n/strings.php 2007-01-06 16:38:25 UTC (rev 96) @@ -1,113 +0,0 @@ -<?php -/** - * Created on 02.07.2006 - * This file contains the standard-Strings - * @since 14 - 02.07.2006 - * @author c167 <c1...@us...> - * @version 1.1 - */ - -//$TEXT_css_ = - -// General Section -// Strings in here may appear on every page -$TEXT_global_navigation = _("Navigation:"); -$TEXT_global_navigate_this_page = _("Pagenavigation"); -$TEXT_global_Sample_menu = _("Sample menu"); -$TEXT_global_you_are_here = _("You are here: "); -$TEXT_global_main = _("Main page"); -$TEXT_global_search = _("Search"); -$TEXT_global_searchresults = _("Search results"); -$TEXT_global_show = _("Show"); -$TEXT_global_gototop = _("Go to the top of this page"); -$TEXT_global_top = _("^ TOP"); -// blocks -$TEXT_global_navigate_this_page = _("Navigation"); -$TEXT_global_navigation = _("Navigation:"); -$TEXT_global_Sample_menu = _("Sample menu"); -$TEXT_global_you_are_here = _("You are here: "); -$TEXT_global_main = _("Main page"); -$TEXT_global_search = _("Search"); -$TEXT_global_searchresults = _("Search results"); -$TEXT_global_show = _("Show"); -$TEXT_global_gototop = _("Go to the top of this page"); -$TEXT_global_top = _("^ TOP"); -// links -$TEXT_global_links = array(_("Home")=>'?page=main', _("News")=>'?page=news'); - -// The main Page -// page = main - -$TEXT_main_site_title = _("Feed collector - Watch the FEED!"); -$TEXT_main_related_sites = _("Related sites:"); -$TEXT_main_more_rel_sites = _("More related sites:"); -$TEXT_main_title = _("Feed collector!"); -$TEXT_main_welcome = _("› Welcome..."); -$TEXT_main_sample_menu = _("Sample menu"); -$TEXT_main_sites = _("Sites:"); -$TEXT_main_l_highlight = " class=\"highlight\""; -$TEXT_main_l1_link = "?page=main"; -$TEXT_main_l1_title = _("Home"); -$TEXT_main_l2_link = "link"; -$TEXT_main_l2_title = _("Deadlink"); -$TEXT_main_l3_link = "link"; -$TEXT_main_l3_title = _("Other"); -$TEXT_main_l4_link = "link"; -$TEXT_main_l4_title = _("Header"); -$TEXT_main_l5_link = "link"; -$TEXT_main_l5_title = _("Links"); - -$TEXT_main_1_id = _("welcome"); -$TEXT_main_1_title = _("Welcome"); -$TEXT_main_1_content = _("<p>Welcome to the home of \"feed collector\". This is the main page, that will explain You, what \n \"feed collector\" is.<br />This page is only the beginning, as the main script is pre-alpha \n at this time.<p>"); -$TEXT_main_2_id = _("background"); -$TEXT_main_2_title = _("Background: News-feeds"); -$TEXT_main_2_content = _("<p>We all know that the internet is huge.<br />Very huge. There are much more pages and sites \n than anyone could ever count. In order to keep us up to date, there are tens of thousands of sites\n provide so called \"news feeds\". These feeds are quite simple <a href=\"http://en.wikipedia.org/wiki/XML\">XML</a>-pages containing some informations. There are several standarts for these feed files, this script will be able to parse the two most popular ones:<br /></p>\n <ul>\n <li><a href=\"http://en.wikipedia.org/wiki/RSS\">RSS</a> Versions 0.9, 1.0 and 2.0</li>\n <li><a href=\"http://en.wikipedia.org/wiki/ATOM\">ATOM</a> Version 1.0</li>\n </ul>\n<p> </p>"); -$TEXT_main_3_id = _("overview"); -$TEXT_main_3_title = _("Now what's this script good for?"); -$TEXT_main_3_content = _("<p>Some people want to keep an eye on several sites. They can use programms like \n <a href=\"http://thunderbird-mail.de/\">Mozilla Thunderbird</a> or <a href=\"http://google.de/\">RSS OWL</a>. \n Linux users who use the Desktop-system <a href=\"http://kde.org/\">KDE</a> have already a good tool: \n <a href=\"http://google.de/\">aKregator</a></p>"); - -//Boxes -//$TEXT_main_b1_title = "<a href=\"?page=version\">dev://VERSION</a>"; -$TEXT_main_b1_content = "<u><b>Version: 0.2</b></u><br /> This is the initial release. some code is working, but the script cannot parse feeds or display items"; -$TEXT_main_b2_title = "<a href=\"?page=php\">dev://PHP</a>"; -$TEXT_main_b2_content = "<u><b>Progress: 20 %</b></u><br /> There are problems with the database-connection.<br />The page-code, that is finished yet, works fine, otherwise you would not see this ;-)"; -$TEXT_main_b3_title = "<a href=\"?page=mysql\">dev://MySQL</a>"; -$TEXT_main_b3_content = "<u><b>Progress: 20 %</b></u><br /> The Channels-table is nearly finished, but I find \n new things to add every day. I'm not sure if I included all the necesary information \n in the feed_tables."; -$TEXT_main_b4_title = "<a href=\"?page=html\">dev://HTML</a>"; -$TEXT_main_b4_content = "<u><b>Progress: 10 %</b></u><br /> The site is under heavy development. \n <span class=\"titleTip\" title=\"At the time\">ATM</span>, there are no more pages to see, \n cause there are problems with the stylesheets."; -$TEXT_main_b5_title = "<a href=\"?page=css\">dev://CSS</a>"; -$TEXT_main_b5_content = "<u><b>Progress: 90 %</b></u><br /> The stylesheet of the default-template is nearly finished."; - - -// the page dev://HTML -$TEXT_html_site_title = _("Feed collector - Watch the FEED!"); -$TEXT_html_related_sites = _("Related sites:"); -$TEXT_html_more_rel_sites = _("More related sites:"); -$TEXT_html_title = _("Feed collector!"); -$TEXT_html_welcome = _("› Willkommen..."); -$TEXT_html_Sample_menu = _("Sample menu"); -$TEXT_html_sites = _("Seiten:"); - -// the page dev://CSS -$TEXT_css_site_title = _("Feed collector - Watch the FEED!"); -$TEXT_css_related_sites = _("Related sites:"); -$TEXT_css_more_rel_sites = _("More related sites:"); -$TEXT_css_title = _("Feed collector!"); -$TEXT_css_welcome = _("› Willkommen..."); -$TEXT_css_Sample_menu = _("Sample menu"); -$TEXT_css_sites = _("Seiten:"); -$TEXT_css_1_id = _("welcome"); -$TEXT_css_1_title = _("Willkommen"); -$TEXT_css_1_content = _("<p>Wilkommen auf der Homepage des \"feed collector\". Das ist die Hauptseite, die Ihnen erklären \n wird, was \"feed collector\" ist.<br />Diese Seite ist erst der Anfang, das eigentliche Script \n ist zurzeit noch pre-Alpha</p>"); -$TEXT_css_2_id = _("background"); -$TEXT_css_2_title = _("Hintergrund: News-feeds"); -$TEXT_css_2_content = _("<p>Wir alle wissen, dass das Internet riesig ist.<br />Sehr riesig! Es gibt unzählbar viele \n Seiten. Um uns auf einfache Weise auf dem laufenden zu halten, bieten uns viele Seiten so genannte\n \"news feeds\" an. Diese Feeds sind recht simple <a href=\"http://de.wikipedia.org/wiki/XML\">XML</a>-Dateien, die einige Informationen enthalten. Es gibt einige verschiedene Standarts und dieses Script wird in der Lage sein, die beiden meist verwendetsten zu verarbeiten:<br /></p>\n <ul>\n <li><a href=\"http://de.wikipedia.org/wiki/RSS\">RSS</a> Versionen 0.9, 1.0 und 2.0</li>\n <li><a href=\"http://de.wikipedia.org/wiki/ATOM\">ATOM</a> Version 1.0</li>\n </ul><p> </p>"); -$TEXT_css_3_id = _("overview"); -$TEXT_css_3_title = _("Und wofür ist dieses Script?"); - - -// Image -$IMAGE_de = 'German.gif'; - -?> Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-01-06 15:13:49 UTC (rev 95) +++ trunk/page_main.php 2007-01-06 16:38:25 UTC (rev 96) @@ -85,9 +85,13 @@ } else { $language = "en_EN"; } -setlocale(LC_ALL, $language); -bindtextdomain("page_$page", "./i18n"); -textdomain("page_$page"); +echo $language; +putenv("LANG=$language"); +echo setlocale(LC_ALL, $language); +echo "<br />"; +echo bindtextdomain("page_main", "./i18n"); +echo "<br />"; +echo textdomain("page_main"); // // Now we're going to replace the placeholders in the template with the important content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-06 15:13:49
|
Revision: 95 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=95&view=rev Author: c167 Date: 2007-01-06 07:13:49 -0800 (Sat, 06 Jan 2007) Log Message: ----------- Modified Paths: -------------- 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/update_feeds.php Modified: trunk/page_add_new_feed.php =================================================================== --- trunk/page_add_new_feed.php 2007-01-05 19:00:42 UTC (rev 94) +++ trunk/page_add_new_feed.php 2007-01-06 15:13:49 UTC (rev 95) @@ -83,10 +83,31 @@ //HTTP :: redirect("./page_login.php"); } +$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']; +} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) { + $language = HTTP_Session :: get("lang"); +} else { + $language = "en_EN"; +} +setlocale(LC_ALL, $language); +bindtextdomain("page_$page", "./i18n"); +textdomain("page_$page"); + ##################### # BUILD THE CONTENT # ##################### -$page = "add_new_feed"; // get the design $design = file_get_contents("styles/default/page_add_new_feed.tpl", "r"); Modified: trunk/page_add_tag.php =================================================================== --- trunk/page_add_tag.php 2007-01-05 19:00:42 UTC (rev 94) +++ trunk/page_add_tag.php 2007-01-06 15:13:49 UTC (rev 95) @@ -79,6 +79,28 @@ //HTTP :: redirect("./page_login.php"); } +$page = "add_tag"; + +############ +# 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']; +} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) { + $language = HTTP_Session :: get("lang"); +} else { + $language = "en_EN"; +} +setlocale(LC_ALL, $language); +bindtextdomain("page_$page", "./i18n"); +textdomain("page_$page"); + $main = ""; if (!$tag_manager->hasTags($_GET['feed'])) { @@ -109,7 +131,6 @@ ##################### # BUILD THE CONTENT # ##################### -$page = "add_tag"; // get the design $design = file_get_contents("styles/default/page_add_tag.tpl", "r"); Modified: trunk/page_login.php =================================================================== --- trunk/page_login.php 2007-01-05 19:00:42 UTC (rev 94) +++ trunk/page_login.php 2007-01-06 15:13:49 UTC (rev 95) @@ -67,6 +67,29 @@ ############## require_once "HTTP.php"; + +$page = "login"; + +############ +# 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']; +} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) { + $language = HTTP_Session :: get("lang"); +} else { + $language = "en_EN"; +} +setlocale(LC_ALL, $language); +bindtextdomain("page_$page", "./i18n"); +textdomain("page_$page"); + ################ # User-Manager # ################ @@ -113,7 +136,6 @@ HTTP :: redirect("./page_main.php"); } -$page = "login"; ##################### # BUILD THE CONTENT # ##################### @@ -167,7 +189,7 @@ 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.pgp\">register</a> a new one")); + $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"; @@ -177,12 +199,12 @@ default : $id_username = "ok"; $id_password = "ok"; - $message = sprintf(" <p>%s</p>\n", _("Please enter you username and your password to login. Cookies have to be enabled from this point.")); + $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 you username and your password to login. Cookies have to be enabled from this point.")); + $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" . Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-01-05 19:00:42 UTC (rev 94) +++ trunk/page_main.php 2007-01-06 15:13:49 UTC (rev 95) @@ -45,8 +45,7 @@ 'table' => $session['container']['tablename'], 'autooptimize' => $session['container']['autooptimize'] ); -HTTP_Session :: setContainer('MDB2', /*$session['container']['options']*/ -$options); +HTTP_Session :: setContainer('MDB2', $options); HTTP_Session :: start(); HTTP_Session :: setExpire($session['time']['expire']); HTTP_Session :: setIdle($session['time']['idle']); @@ -68,6 +67,7 @@ require_once "class/User_manager.php"; $user = new User_manager($db); +$page = "main"; ############ # LANGUAGE # @@ -78,14 +78,17 @@ 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 = HTTP :: negotiateLanguage($langs, "en_EN"); + $language = "en_EN"; } -/* -bindtextdomain("page_main", dirname($_SERVER['SCRIPT_FILENAME'])."i18n"); setlocale(LC_ALL, $language); -*/ -$page = "main"; +bindtextdomain("page_$page", "./i18n"); +textdomain("page_$page"); + // // Now we're going to replace the placeholders in the template with the important content // @@ -126,18 +129,7 @@ # 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>")); +$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); // latest news Modified: trunk/page_personal.php =================================================================== --- trunk/page_personal.php 2007-01-05 19:00:42 UTC (rev 94) +++ trunk/page_personal.php 2007-01-06 15:13:49 UTC (rev 95) @@ -72,6 +72,28 @@ $user = new User_manager($db); $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']; +} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) { + $language = HTTP_Session :: get("lang"); +} else { + $language = "en_EN"; +} +setlocale(LC_ALL, $language); +bindtextdomain("page_$page", "./i18n"); +textdomain("page_$page"); + + // // Now we're going to replace the placeholders in the template with the important content // Modified: trunk/page_register.php =================================================================== --- trunk/page_register.php 2007-01-05 19:00:42 UTC (rev 94) +++ trunk/page_register.php 2007-01-06 15:13:49 UTC (rev 95) @@ -81,10 +81,31 @@ require_once "class/User_manager.php"; $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)) { + $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"; +} +setlocale(LC_ALL, $language); +bindtextdomain("page_$page", "./i18n"); +textdomain("page_$page"); + + ##################### # BUILD THE CONTENT # ##################### -$page = "register"; // get the design $design = file_get_contents("styles/default/page_register.tpl", "r"); Modified: trunk/page_show_all_feeds.php =================================================================== --- trunk/page_show_all_feeds.php 2007-01-05 19:00:42 UTC (rev 94) +++ trunk/page_show_all_feeds.php 2007-01-06 15:13:49 UTC (rev 95) @@ -83,6 +83,28 @@ } $page = "show_all_feeds"; + +############ +# 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']; +} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) { + $language = HTTP_Session :: get("lang"); +} else { + $language = "en_EN"; +} +setlocale(LC_ALL, $language); +bindtextdomain("page_$page", "./i18n"); +textdomain("page_$page"); + + // // Now we're going to replace the placeholders in the template with the important content // Modified: trunk/page_show_feed.php =================================================================== --- trunk/page_show_feed.php 2007-01-05 19:00:42 UTC (rev 94) +++ trunk/page_show_feed.php 2007-01-06 15:13:49 UTC (rev 95) @@ -74,6 +74,28 @@ require_once "HTTP.php"; $page = "show_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']; +} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) { + $language = HTTP_Session :: get("lang"); +} else { + $language = "en_EN"; +} +setlocale(LC_ALL, $language); +bindtextdomain("page_$page", "./i18n"); +textdomain("page_$page"); + + // // Now we're going to replace the placeholders in the template with the important content // Modified: trunk/page_show_feed_tag.php =================================================================== --- trunk/page_show_feed_tag.php 2007-01-05 19:00:42 UTC (rev 94) +++ trunk/page_show_feed_tag.php 2007-01-06 15:13:49 UTC (rev 95) @@ -74,6 +74,28 @@ require_once "HTTP.php"; $page = "show_feed_tag"; + +############ +# 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']; +} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) { + $language = HTTP_Session :: get("lang"); +} else { + $language = "en_EN"; +} +setlocale(LC_ALL, $language); +bindtextdomain("page_$page", "./i18n"); +textdomain("page_$page"); + + // Now we're going to replace the placeholders in the template with the important content // if (!isset ($_GET['tag'])) { Modified: trunk/update_feeds.php =================================================================== --- trunk/update_feeds.php 2007-01-05 19:00:42 UTC (rev 94) +++ trunk/update_feeds.php 2007-01-06 15:13:49 UTC (rev 95) @@ -14,7 +14,7 @@ $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"; + \"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"; } @@ -26,7 +26,6 @@ require_once "Log.php"; // Logger // some other stuff require_once "inc/config.php"; -require_once "inc/definitions.php"; ############################### # Configure and start logging # ############################### @@ -56,11 +55,11 @@ ############################################## // Connect to the database $dsn = array ( - 'phptype' => DB_TYPE, - 'username' => DB_LOGIN, - 'password' => DB_PASSWD, - 'hostspec' => DB_HOST, - 'database' => DB_DATABASE + 'phptype' => $db['type'], + 'username' => $db['user'], + 'password' => $db['passwd'], + 'hostspec' => $db['host'], + 'database' => $db['database'] ); $options = array ( 'debug' => 2, @@ -200,8 +199,10 @@ $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) echo "\t</body>\n</html>"; -else echo ""; +if (false === $console) + 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-05 19:00:46
|
Revision: 94 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=94&view=rev Author: c167 Date: 2007-01-05 11:00:42 -0800 (Fri, 05 Jan 2007) Log Message: ----------- works nearly correct Modified Paths: -------------- trunk/.htaccess trunk/index.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/statistics.php trunk/styles/default/page_login-screen.css trunk/styles/default/page_login.tpl trunk/styles/default/page_show_feed_tag.tpl Added Paths: ----------- trunk/inc/navigation.php trunk/page_add_new_feed.php trunk/styles/default/page_add_new_feed-screen.css trunk/styles/default/page_add_new_feed.tpl Removed Paths: ------------- trunk/add_new_feed.php trunk/class/class.security.php trunk/class/template_manager.php trunk/class/template_manager_sidebar.php trunk/dynamic.php trunk/inc/definitions.php trunk/inc/functions.php trunk/inc/querys.php trunk/inc/secure.php trunk/inc/template.php trunk/todo.php Modified: trunk/.htaccess =================================================================== --- trunk/.htaccess 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/.htaccess 2007-01-05 19:00:42 UTC (rev 94) @@ -1,4 +0,0 @@ -<Files ~ "\.tpl$"> - Order allow, deny - Deny from all -</Files> \ No newline at end of file Deleted: trunk/add_new_feed.php =================================================================== --- trunk/add_new_feed.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/add_new_feed.php 2007-01-05 19:00:42 UTC (rev 94) @@ -1,205 +0,0 @@ -<?php -/** - * This script is used for adding feeds to the database - * //it gets the informarion about the new feeds throug POST-Messages - * It should be moved out of the project-root und run by Cronjob or by hand through console - * @version 1.7 - * @since 23 - 10.07.2006 - * @author c167 <c1...@us...> - * @todo Add error-messages to every point an error may occure - */ - - - -$sql = 'INSERT INTO `feed_list` (`ID`, `site_name`, `site_url`, `site_lang`, `feed_name`, `feed_url`, `feed_type`, `feed_lang`, `feed_img`, `is_active`, `last_change`) VALUES (NULL, \'Heise Online\', \'http://heise.de\', \'de_DE\', \'heise open news\', \'http://heise.de/open/Atom.rdf\', \'Atom 1.0\', \'de_DE\', \'heise_open.ico\', \'1\', \'1152864327\');'; - /*ID - site_name - site_url - site_lang - site_img - feed_name - feed_url - feed_type - feed_db_name - feed_lang - feed_img - is_active - last_change - */ -// We need some PEAR-classes -require_once "MDB2.php"; // Database -require_once "Log.php"; -require_once "HTML/QuickForm.php"; - -// some other stuff -require_once "inc/config.php"; -require_once "inc/definitions.php"; - /* -ID int(10) UNSIGNED Nein -site_name varchar(255) latin1_swedish_ci Nein -site_url varchar(255) latin1_swedish_ci Nein -site_lang varchar(7) latin1_swedish_ci Ja NULL -site_img varchar(20) latin1_swedish_ci Ja NULL -feed_name varchar(255) latin1_swedish_ci Nein -feed_url varchar(255) latin1_swedish_ci Nein -feed_type varchar(10) latin1_swedish_ci Nein -feed_db_name varchar(255) latin1_swedish_ci Nein -feed_lang varchar(8) latin1_swedish_ci Nein -feed_img varchar(255) latin1_swedish_ci Nein -is_active tinyint(1) Nein -last_change int(11) Nein 0 - */ - -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>"._("Add New Feed")."</title>\n\t</head>\n\t<body>\n"; -$form = new HTML_QuickForm('eingabe', 'post', $_SERVER['PHP_SELF']); - -// Now we create some objects... - -// We'll better ask for the admin-password -$pw = HTML_QuickForm::createElement('password', 'admin-pw', _("Admin password:")); -$pw->setSize(20); -$pw->setMaxlength(20); - -// site_name -$site_name = HTML_QuickForm::createElement('text', 'site_name', _("Site name:")); -$site_name->setSize(50); -$site_name->setMaxLength(255); - -// site_url -$site_url = HTML_QuickForm::createElement('text', 'site_url', _("URL of the site:")); -$site_url->setSize(50); -$site_url->setMaxLength(255); - -// site_lang -$site_lang = HTML_QuickForm::createElement('text', 'site_lang', _("Language of the site:")); -$site_lang->setSize(7); -$site_lang->setMaxLength(7); - -// site_img -$site_img = HTML_QuickForm::createElement('text', 'site_img', _("The image of the site:")); -$site_img->setSize(20); -$site_img->setMaxLength(20); - -// feed_name -$feed_name = HTML_QuickForm::createElement('text', 'feed_name', _("Name of the feed:")); -$feed_name->setSize(50); -$feed_name->setMaxLength(255); - -// feed_description -$feed_description = HTML_QuickForm::createElement('text', 'feed_description', _("Description of the feed:")); -$feed_description->setSize(50); -$feed_description->setMaxLength(255); - -// feed_url -$feed_url = HTML_QuickForm::createElement('text', 'feed_url', _("URL of the feed:")); -$feed_url->setSize(50); -$feed_url->setMaxLength(255); - -// feed_type -/* This should be a options-list with to elements, use JavaScript -$feed_type = HTML_QuickForm::createElement('text', 'feed_url', _("URL of the feed:")); -$feed_type->setSize(50); -$feed_type->setMaxLength(255); -*/ - -//$form->addElement($pw); -$form->addElement($site_name); -$form->addElement($site_url); -$form->addElement($site_lang); -$form->addElement($site_img); -$form->addElement($feed_name); -$form->addElement($feed_description); -$form->addElement($feed_url); -$form->display(); -/* -$time_now = time(); -echo _("Script startet at " . microtime() . "<br />\n"); -//if ($update['enabled']) { - - // Connect to the database - $dsn = array ( - 'phptype' => DB_TYPE, - 'username' => DB_LOGIN, - 'password' => DB_PASSWD, - 'hostspec' => DB_HOST, - 'database' => DB_DATABASE - ); - - $options = array ( - 'debug' => 2, - 'portability' => DB_PORTABILITY_ALL - ); - - $db = & DB :: connect($dsn, $options); - if (PEAR :: isError($db)) { - //$log-> - echo $db->getMessage() . "<br />\n"; - die(_("Script ended with error at ") . time()); - } else { - echo _("Successfully connected to the database<br />\n"); - } - $db->setFetchMode(DB_FETCHMODE_ASSOC); - - /* - * Now we get all the data from the feeds-table - *//* - // Proceed with a query... - $res = & $db->query('SELECT * FROM feed_list'); - - // Always check that result is not an error - if (PEAR :: isError($res)) { - echo $res->getMessage() . "<br />\n"; - die(_("Script stoped with error at ") . time()); - } else { - echo _("Successfully SELECTed the feeds-list from the database<br />\n"); - } - if (!isset ($row)) { - echo _("There are <b>no</b> feeds in the database.<br />" . - "This is quite bad, so please run the script \"add_new_feed.php\" from the console as described in the file \"README.txt\"<br />\n"); - } - /* - * Now we start the main thing - *//* - while ($row = & $res->fetchRow()) { - - foreach ($row as $var => $value) { - echo $var . "=> " . $value . "<br />\n"; - } - - // Is the feed active? - if ($row['is_active'] != 1) { - continue; - } - /* - * Do we have to look for an update? - * First we calculate the time difference - *//* - if (($time_now - $row['last_change']) < 0) { - echo _("WARING Differece negative!! <br />\n"); - } - if (($time_now - $row['last_change']) > $update['difference']) { - echo _("Update: " . $row['feed_name'] . " | diff: ") . ($time_now - $row['last_change']); - - } else { - echo _("Not to update: ") . $row['feed_name']; - continue; - } - - } -/*} else { - /** - * @todo write to log - */ -/* echo _("The script is not allowed to update the feeds.<br />" . - "This means that the feeds won't be updated, the lists are not up to datehttp://localhost/~stefan/ws32/feed-collector/trunk/update_feeds.php<br />"); -}*//* -echo _("Script finished at ") . microtime(); -*/ -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</head>\n\t<body>\n"; -?> \ No newline at end of file Deleted: trunk/class/class.security.php =================================================================== --- trunk/class/class.security.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/class/class.security.php 2007-01-05 19:00:42 UTC (rev 94) @@ -1,46 +0,0 @@ -<?php -/* -* This file contains the class(es) needed for updating the streams -* -*/ - -/** - * This class is used to validate the inputs. - * It checks for: - * SQL-Injecion - */ -class security { - /** - * The given Values, may be a file_get_contents or a $_GET or a $_POST-Statement - * @var resource - */ - private $resource; - - /** - * This function searches for standart-commands used in SQL-Statements - * @version 0.1 - * @return bool - */ - public function sql_checker() { - $seq = array("SELECT", "DROP", "ALTER"); - $seqi= array(); - } - - /** - * Sets the resource used in this class - * @param stream - */ - public function set_resource($res) { - $resource = $res; - } - - /** - * Sets the resource used in this class - * @return value - */ - public function get_resource() { - return $resource; - } - -} -?> \ No newline at end of file Deleted: trunk/class/template_manager.php =================================================================== --- trunk/class/template_manager.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/class/template_manager.php 2007-01-05 19:00:42 UTC (rev 94) @@ -1,96 +0,0 @@ -<?php - - -/** - * Created on 04.07.2006 - * This file is the home of the Template-Manager - * @version 46 - * @since 1.19 - 28.05.2006 - * @author c167 <c1...@us...> - */ - -class Template_Manager { - - /** - * The PEAR::MDB2-Object - * @access protected - */ - protected $mdb2; - - /** - * The name of the page - * @access protected - */ - protected $page; - - /** - * State of the sidebar - * @access protected - */ - protected $sidebar_created = false; - - /** - * The konstructor - * @param Object $db a PEAR::DP-object - * @param String $page The name of the desired page - * @param String $box_source The sourcedore of a box - * - * @version 1.2 - * @since 1.1 - 04.07.2006 - * @access public - */ - public function __construct($template, $page /* , $box_source*/ - ) { - //$this->box_source = $box_source; - //$this->db = $db; - $this->page = $page; - $this->template = $template; - } - - /** - * This function loads an extension - * @param String $name The extensions name - */ - public static function loadExtension($name) { - if(is_file("template_manager_".$name.".php")) { - include_once "template_manager_".$name.".php"; - return new Template_Manager_Sidebar(); - } else { - return false; - } - } - - /** - * Create the boxes - * - * @return String The HTML-Code representing the boxes - * @version 1.1 - * @since 1.1 - 04.07.2006 - * @access public - */ - public function createBoxes() { - /** - * @todo probably we set another language-domain, need to check that - */ - switch ($this->page) { - case "main" : - $b['1']['title'] = "<a href=\"?page=version\">dev://VERSION</a>"; - $b['1']['content'] = "<u><b>Version: 0.2</b></u><br /> This is the initial release. some code is working, but the script cannot parse feeds or display items"; - $b['2']['title'] = "<a href=\"?page=php\">dev://PHP</a>"; - $b2_content = "<u><b>Progress: 20 %</b></u><br /> There are problems with the database-connection.<br />The page-code, that is finished yet, works fine, otherwise you would not see this ;-)"; - $b3_title = "<a href=\"?page=mysql\">dev://MySQL</a>"; - $b3_content = "<u><b>Progress: 20 %</b></u><br /> The Channels-table is nearly finished, but I find \n new things to add every day. I'm not sure if I included all the necesary information \n in the feed_tables."; - $b4_title = "<a href=\"?page=html\">dev://HTML</a>"; - $b4_content = "<u><b>Progress: 10 %</b></u><br /> The site is under heavy development. \n <span class=\"titleTip\" title=\"At the time\">ATM</span>, there are no more pages to see, \n cause there are problems with the stylesheets."; - $b5_title = "<a href=\"?page=css\">dev://CSS</a>"; - $b5_content = "<u><b>Progress: 90 %</b></u><br /> The stylesheet of the default-template is nearly finished."; - - break; - - default : - // Do something - } - } - -} -?> \ No newline at end of file Deleted: trunk/class/template_manager_sidebar.php =================================================================== --- trunk/class/template_manager_sidebar.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/class/template_manager_sidebar.php 2007-01-05 19:00:42 UTC (rev 94) @@ -1,83 +0,0 @@ -<?php -/** - * Created on 02.10.2006 - * - * @version 46 - * @author C167 <c1...@us...> - * @since 45 - 02.10.2006 - */ - -/** - * - */ -define(TEMPLATE_SIDEBAR_TEXT, 0); - -/** - * - */ -define(TEMPLATE_SIDEBAR_LINK, 1); - -class Template_Manager_Sidebar extends Template_Manager { - /** - * The construcot - * - * @since 21 - 31.08.2006 - * @return void - * @param String $template - * @param String $page - */ - public function __construct($template, $page) { - parent::__construct($template, $page); - } - /** - * Create the sidebar - * - * @return object sidebar-object - * @version 1.1 - * @since 21 - 31.08.2006 - * @access public - */ - public function sidebar_create() { - $this->sidebar_created = true; - return true; - } - /** - * Create a sidebar-element - * - * @see createSidebar() - * @return void - * @version 1.1 - * @since 21 - 31.08.2006 - * @access public - */ - public function sidebar_addElement($type, $name, $link = null) { - switch($type) { - case TEMPLATE_SIDEBAR_TEXT: - - break; - case TEMPLATE_SIDEBAR_LINK: - if(null === $link) return false; - break; - - default: - return false; - } - } - - /** - * Show the sidebar - * - * @see createSidebar() - * @return void - * @version 1.1 - * @since 21 - 31.08.2006 - * @access public - */ - public function show() { - if(true === $this->sidebar_finished) { - echo $this->sidebar_code; - } else return false; - } -} - -?> Deleted: trunk/dynamic.php =================================================================== --- trunk/dynamic.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/dynamic.php 2007-01-05 19:00:42 UTC (rev 94) @@ -1,43 +0,0 @@ -<?php - - -/** - * Created on 13.11.2006 - * This script is called by the AJAX-Component in some sites - * @version 1 - * @since 56 - 13.11.2006 - * @author c167 <c1...@us...> - * @package feed-collector - */ - -require_once "inc/functions.php"; -require_once "class/Feed_manager.php"; -require_once "inc/config.php"; -require_once "inc/definitions.php"; -error_reporting(E_ALL); -############ -# DATABASE # -############ -require_once "MDB2.php"; -$dsn = array ('phptype' => DB_TYPE,'username' => DB_LOGIN,'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 { - //$log->log(_("Successfully connected to the database"), PEAR_LOG_DEGUB); -} -$db->setFetchMode(MDB2_FETCHMODE_ASSOC); - -if(!isset($_GET['id'])) { - -} else { - HTTP_Session :: start(); - HTTP_Session :: id($_GET['id']); - if(!HTTP_Session :: isNew) { - - } -} -?> \ No newline at end of file Deleted: trunk/inc/definitions.php =================================================================== --- trunk/inc/definitions.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/inc/definitions.php 2007-01-05 19:00:42 UTC (rev 94) @@ -1,26 +0,0 @@ -<?php -/** - * Definitions - * This file contains the definitions needed by the script - */ - -// Database -define('DB_TYPE', $db['type']); -define('DB_LOGIN', $db['user']); -define('DB_PASSWD', $db['passwd']); -define('DB_HOST', $db['host']); -define('DB_DATABASE', $db['database']); - -// Folders -define('FOLDER_LANG', "i18n/"); -define('FOLDER_TEMPLATES', "styles/"); -define('FOLDER_PIC_FAVICONS', "pic/feeds/"); -define('FOLDER_PIC_LANG', "pic/lang/"); -define('FOLDER_LOG', "log/"); - -define('FEED_RETURN_ONLY', 1); -define('FEED_DISPLAY_ONLY', 2); -define('FEED_RETURN_AND_DISPLAY', 3); - - -?> \ No newline at end of file Deleted: trunk/inc/functions.php =================================================================== --- trunk/inc/functions.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/inc/functions.php 2007-01-05 19:00:42 UTC (rev 94) @@ -1,162 +0,0 @@ -<?php - - -/** - * This file contains the main functions used by the script - * Please note: The functions that make the script more secure are in secure.php - * @author Stefan Valouch <ste...@go...> - * @since 1 - 03.07.2006 - * @version 14 - * @todo change the language-test to check for compiled .mo-files - */ - -/** Check the data the users browser sends to the server - * This function reads and converts the data given by the browser - * - * @return string_array - */ -function userdata() { - -} - -/** - * checks if the desired language is available - * @param $language string - * @return boolean true if available - * @since 3 - 03.07.2006 - * @version 1.4 - */ -function checkLang($language) { - if (is_file(FOLDER_TPLS . $language . ".mo")) { - return true; - } else { - return false; - } - - /*for($i = 0; $i < count($GLOBALS['lang_avail']); $i++) { - //echo $i; - if($language == $GLOBALS['lang_avail'][$i]) { - $return = "i18n/" .$GLOBALS['lang_avail_code'][$i] .".php"; - $GLOBALS['lang'] = $GLOBALS['lang_avail'][$i]; - $GLOBALS['lang_code'] = $GLOBALS['lang_avail_code'][$i]; - //echo $return; - } - } - if(isset($return)) { - return $return; - } else { - return "i18n/en_EN.php"; - }*/ -} - -/** - * Displays where the user is - * @param $location string - * @return html_string - */ -function you_are_here($location) { - $position = _("You are here: ") . '<a href="index.php?page=main">' . _("Main page") . '</a>'; - $search = ' => <a href="index.php?page=search">' . _("Search") . '</a>'; - $search_res = ' => <a href="index.php?page=searchresults">' . _("Search results") . '</a>'; - switch ($location) { - case "search" : - $position .= $search; - break; - case "searchresults" : - $position .= $search; - $position .= $search_res; - default : - - } - return $position; -} - -/** - * Check if the channel is already in the database. - * @param $channel_info string_array - * @return bool - */ -function add_feed($channel_info) { - $channels = mysql_query("SELECT * FROM channels") or die($error['mysql'] = true); - while ($channel_info = mysql_fetch_array($channels, MYSQL_ASSOC)) { - foreach ($line as $col_value) { - switch (true) { - case ($channel_info['site_url'] == $value) : - return 0; - break; - case ($channel_info['feed_url'] == $value) : - return 0; - break; - default : - return 1; - // Daten inzufügen - } - } - /* foreach($channels as $var => $value) { - switch(true) { - case $channel_info['site_url'] == $value: - return 0; - break; - case $channel_info['feed_url'] == $value: - return 0; - break; - default: - - }*/ - } - /*$sql_setup['crate_channels'] = '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) NULL, ' - . ' `feed_name` VARCHAR(255) 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' - . ' )' - . ' ENGINE = myisam;'; - $query = "SELECT * FROM Meine_Tabelle"; - $result = mysql_query($query) or die("Anfrage fehlgeschlagen: " . mysql_error()); - - /* Ausgabe der Ergebnisse in HTML */ /* - echo "<table>\n"; - while ($line = mysql_fetch_array($result, MYSQL_ASSOC)) { - echo "\t<tr>\n"; - foreach ($line as $col_value) { - echo "\t\t<td>$col_value</td>\n"; - } - echo "\t</tr>\n";*/ - -} -define(VAR_CHECK_TYPE_INT, 0); -define(VAR_CHECK_TYPE_FLOAT, 1); -define(VAR_CHECK_TYPE_DOUBLE, 2); -define(VAR_CHECK_TYPE_STRING, 3); - -define(VAR_CHECK_METHOD_GET, 0); -define(VAR_CHECK_METHOD_POST, 1); -/** - * Check if a variable has a specific type - * @param String $name The name of the variable - * @param Int $method The method {GET, POST} - * @param Int $type The type - * @return String description - */ -function getVariableCheckType($name, $method, $type) { - if(VAR_CHECK_METHOD_POST === $method) { - if(isset($_POST[$name])) { - - } - } elseif(VAR_CHECK_METHOD_POST === $method) { - if(isset($_GET[$name])) { - - } - } else { - return false; - } -} -?> \ No newline at end of file Added: trunk/inc/navigation.php =================================================================== --- trunk/inc/navigation.php (rev 0) +++ trunk/inc/navigation.php 2007-01-05 19:00:42 UTC (rev 94) @@ -0,0 +1,68 @@ +<?php + + +/** + * Created on 05.01.2007 + * + * + * @author C167 <c1...@us...> + */ + +$hl = " class=\"highlight\""; +if (!isset ($page)) { + $page = ""; +} +switch ($page) { + case "main" : + $page_main = $hl; + $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $login = $register = $personal = ""; + break; + case "show_all_feeds" : + $show_all_feeds = $hl; + $page_main = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $login = $register = $personal = ""; + break; + case "show_feed_tag" : + $show_feed_tag = $hl; + $page_main = $show_all_feeds = $add_new_feed = $show_feed = $add_tag = $login = $register = $personal = ""; + break; + case "add_new_feed" : + $add_new_feed = $hl; + $page_main = $show_all_feeds = $show_feed_tag = $show_feed = $add_tag = $login = $register = $personal = ""; + break; + case "show_feed" : + $show_feed = $hl; + $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $add_tag = $login = $register = $personal = ""; + break; + case "add_tag": + $add_tag = $hl; + $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $register = $personal = ""; + break; + case "login" : + $login = $hl; + $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $register = $personal = ""; + break; + case "register" : + $register = $hl; + $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $login = $personal = ""; + break; + case "personal" : + $personal = $hl; + $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $login = $register = ""; + break; + default : + $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $login = $register = $personal = ""; +} +$navigation = sprintf(" <a href=\"./page_main.php\"$page_main>%s</a> |\n" . +" <a href=\"./page_show_all_feeds.php\"$show_all_feeds>%s</a> |\n" . +" <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\"$add_tag>%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Display a Feed"), _("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")); +} 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")); +} +?> Deleted: trunk/inc/querys.php =================================================================== --- trunk/inc/querys.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/inc/querys.php 2007-01-05 19:00:42 UTC (rev 94) @@ -1,33 +0,0 @@ -<?php -/** - * This file contains the most used querys of this project - */ - -#$select_all_channels = "SELECT ID, Titel, Inhalt, Datum, Autor FROM News ORDER BY Datum DESC;"; -/** - * Select all the channels - */ -$select_all_channels = "SELECT ID, site_name, site_url, site_lang, feed_name, feed_url, feed_type, feed_lang, is_active, last_change, encoding, add_date FROM channels ORDER BY add_date DESC;"; - -/** - * Select the information needed to make a list of feeds - */ -$select_feeds_to_show = "SELECT ID, site_name, site_url, site_lang, feed_name, feed_url feed_lang, last_change, add_date FROM channels ORDER BY add_date DESC;"; -/* -REATE 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 ; -*/ -?> \ No newline at end of file Deleted: trunk/inc/secure.php =================================================================== --- trunk/inc/secure.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/inc/secure.php 2007-01-05 19:00:42 UTC (rev 94) @@ -1,144 +0,0 @@ -<?php -/* -* This file contains functions ans classes to improve the security of the script -* Please use them! -* -*/ - -////////////////////// -// GENERAL-SECURITY // -////////////////////// - -/** - * Checks if the page exists - * @param $page page_name - * @return bool - */ -function page_exists($page) { - switch($page) { - case "main": - return 1; - break; - case "show_feed": - return 1; - break; - case "search": - return 1; - break; - case "admin": - return 1; - break; - case "css": - return 1; - break; - case "html": - return 1; - break; - case "mysql": - return 1; - break; - default: - return 0; - } -} - -//////////////////// -// ERROR-HANDLING // -//////////////////// - -/** - * Function to react on errors - * @param $error String - * @param $error_type Int - */ - function error_page($error) { - - } - -////////// -// GET // -////////// -/** - * Secure way to get a GET-Integer - * @param $name string - * @param $optional bool - * @return $x - * @author boinc.berkeley.edu - */ - function get_int($name, $optional=false) { - $x=null; - if (isset($_GET[$name])) $x = $_GET[$name]; - if (!is_numeric($x)) { - if ($optional) { - return null; - } else { - error_page("missing or bad parameter: $name $x"); - } - } - return (int)$x; - } - -/** - * Secure way to get a GET-String - * @param $name string - * @param $optional bool - * @return $x string - * @author boinc.berkeley.edu - */ - function get_str($name, $optional=false) { - $x = null; - if (isset($_GET[$name])) { - $x = $_GET[$name]; - } - if (!$x && !$optional) { - error_page("missing or bad parameter: $name"); - } - return $x; - } - -////////// -// POST // -////////// -/** - * Secure way to get a POST-Integer - * @param $name sting - * @param $optional bool - * @return $x - * @author boinc.berkeley.edu - */ - function post_int($name, $optional=false) { - $x = null; - if (isset($_POST[$name])) $x = $_POST[$name]; - if (!is_numeric($x)) { - if ($optional) { - return null; - } else { - error_page("missing or bad parameter: $name $x"); - } - } - return (int)$x; - } - -/** - * Secure way to get a POST-String - * @param $name string - * @param $optional bool - * @return $x - * @author boinc.berkeley.edu - */ - function post_str($name, $optional=false) { - $x = $_POST[$name]; - if (!$x && !$optional) { - error_page("missing or bad parameter: $name"); - } - return $x; - } - -/** - * Secure way to get a GET-String - * - * @author Berkeley - */ - - -?> \ No newline at end of file Deleted: trunk/inc/template.php =================================================================== --- trunk/inc/template.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/inc/template.php 2007-01-05 19:00:42 UTC (rev 94) @@ -1,121 +0,0 @@ -<?php -/* -* This file contains the functions for using the templates -* that are stored in inc/templates/ -* -*/ - - -/** - * Dummy Class - * This class contains the dummys - */ -class dummys { - - /** - * @var Highlightable link - */ - var $link = ' <a href="{url}" alt={alt} {class}>{name}</a> '; - - /** - * @var Highlight actual link - */ - var $highlight = 'class="highlight"'; - - /** - * @var Footer_left - */ - var $footer_left = ' E-mail: <a href="./index.html" title="Email webmaster">web...@yo...</a><br /> - <a href="./index.html" class="doNotPrint">Contact Us</a>'; - - /** - * @var Footer_right - */ - var $footer_right = ' This design is (almost) public domain.<br /> - <a href="./index.html" class="doNotPrint">This is a footer link</a>'; - - /** - * Get the navi-left - * @return navi-left - */ - //function get_dummy_left() { - // return $dummy_navi_left; - //} -} -/* -/** - * Find and replace a String - * @param $search String: The string that should be searched for - * @param $replace String - * @param $input String: The Text given - * @return String - */ -function My_str_replace($search,$replace,$input) { - if(strstr($input,$search)) { - $x = strpos($input,$search); - return substr($input,0,$x) . $replace . substr($input,$x+strlen($search)); - } else { - return $input; - } -} -/* -/** - * Includes a page and replaces the {}-placeholders - * @param $page string - * @param $design string - * @return html-page - * -function print_page($page='main',$design='sinorca2') { - - } - - // now we return the page - return $file; - echo $file; - echo $file; -}*/ - -/** - * Creates the links in the navibar - * @param $urls string_array - * @param $names string_array - * @param $position int - * @param $optional bool - * @return html-link - */ -function navi_links($url, $names, $position, $display=false) { - if($display) { - $dummy = new dummys; - // Load a dummy-Link into the array - for($i = 0; $i < sizeof($url); $i++) { - $a[$i] = $dummy->link; - } - // Replace - for($i = 0; $i < sizeof($url); $i++) { - $a[$i] = str_replace("{url}", $url[$i], $a[$i]); - $a[$i] = str_replace("{alt}", $alt[$i], $a[$i]); - $a[$i] = str_replace("{name}", $name[$i], $a[$i]); - if($i = ($position-1)) { - $a[$i] = str_replace("{class}", $dummy->highlight, $a[$i]); - } else { - $a[$i] = str_replace("{class}", "", $a[$i]); - } - $a; - } - return array($a); - } -} - - -/** - * Thsi function generates the left navibar - * @param $urls string_array - * @param $names string_array - * @param $actual_page int - * @param $optional bool - * @return html-link - */ -function navi_left($urls, $names, $actual_page, $optional=false) { - -} -?> \ No newline at end of file Modified: trunk/index.php =================================================================== --- trunk/index.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/index.php 2007-01-05 19:00:42 UTC (rev 94) @@ -2,67 +2,10 @@ /** - * Main page - * - * @version 33 + * Dummy Page * @author C167 <c1...@us...> */ -# include the standard pear-files -//require_once "XML/Parser.php"; # The PEAR::XML_PARSER -require_once "MDB2.php"; # The PEAR::MDB2 -require_once "HTTP/Session2.php"; # The session-manager - -require_once "inc/definitions.php"; -require_once "inc/functions.php"; // some functions -require_once "inc/secure.php"; -require_once "class/template_manager.php"; // The template-system -require_once "inc/config.php"; -require_once "inc/querys.php"; - -// Connect to the database -$dsn = array ( - 'phptype' => DB_TYPE, - 'username' => DB_LOGIN, - 'password' => DB_PASSWD, - 'hostspec' => DB_HOST, - 'database' => DB_DATABASE -); - -$options = array ( - 'debug' => 2, - 'result_buffering' => false, - 'portability' => MDB2_PORTABILITY_ALL -); - -$db = & MDB2 :: connect($dsn, $options); -if (PEAR :: isError($db)) { - $db->getMessage(); - die(); -} - -// Now we start the session and set some values -//HTTP_Session2::setContainer('MDB', $session['container']['options']); -HTTP_Session2::start(); -HTTP_Session2::setExpire($session['time']['expire']); -HTTP_Session2::setIdle($session['time']['idle']); - -//$template = new Template_Manager(); -//if(HTTP_Session2::isNew()) { -//$template->showLoginForm -//} -$_GET['page'] = "show_feeds"; -switch ($_GET['page']) { - case "main" : - include_once "page_main.php"; - break; - case "show_feeds" : - include_once "page_show_feeds.php"; - break; - case "about" : - - break; - default : - include_once "page_main.php"; -} +require_once "HTTP.php"; +HTTP :: redirect("./page_main.php"); ?> \ No newline at end of file Copied: trunk/page_add_new_feed.php (from rev 64, trunk/add_new_feed.php) =================================================================== --- trunk/page_add_new_feed.php (rev 0) +++ trunk/page_add_new_feed.php 2007-01-05 19:00:42 UTC (rev 94) @@ -0,0 +1,240 @@ +<?php + + +/** + * Created on 30.08.2006 + * + * @version 1 + * @since 56 - 17.11.2006 + * @author c167 <c1...@us...> + * @package feed-collector + */ + +require_once "inc/config.php"; +error_reporting(E_ALL); + +############### +# DEFINITIONS # +############### +define('FC_PASS_OK', 0); +define('FC_PASS_TOO_SHORT', 1); + +############ +# 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); + +########### +# 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']); + +if (true === HTTP_Session :: isNew()) { + HTTP_Session :: set("logged_in", false); +} + +################ +# FEED-Manager # +################ +require_once "class/Feed_manager.php"; +$feed = new Feed_manager($db); + +############## +# HTTP-Class # +############## +require_once "HTTP.php"; + +################ +# 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"); +} + +##################### +# BUILD THE CONTENT # +##################### +$page = "add_new_feed"; +// get the design +$design = file_get_contents("styles/default/page_add_new_feed.tpl", "r"); + +# Header +// title +$title = "Feed-Collector"; +$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:")); +$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 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); +} +$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); + +// navigation +require_once "inc/navigation.php"; +$design = str_replace("<!-- navigation -->", $navigation, $design); + +/* + * At this point we have to decide wether we display only one Feed or some more, perhaps loaded and movable by AJAX... + */ +# Main copy + +$main = ""; +//print_r($_POST); +if (!empty ($_POST['site_name']) and !empty ($_POST['site_url']) and !empty ($_POST['site_lang']) and !empty ($_POST['feed_name']) and !empty ($_POST['feed_url']) and !empty ($_POST['feed_type']) and !empty ($_POST['feed_db_name']) and !empty ($_POST['feed_lang']) and !empty ($_POST['is_active'])) { + echo 1; + +} else { + echo 2; + if (!empty ($_POST['site_name']) or !empty ($_POST['site_url']) or !empty ($_POST['site_lang']) or !empty ($_POST['feed_name']) or !empty ($_POST['feed_url']) or !empty ($_POST['feed_type']) or !empty ($_POST['feed_db_name']) or !empty ($_POST['feed_lang']) or !empty ($_POST['is_active'])) { + echo 3; + buildForm($main, _("Marked fields have to be filled!")); + } else { + echo 4; + buildForm($main); + } +} +$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 •"); +$design = str_replace("<!-- footer -->", $footer, $design); + +echo $design; + +function buildForm(& $form, $message = null) { + $form = sprintf(" <h1>%s</h1>\n <p>%s</p>\n", _("Add a feed"), _("<b>How do I do that?</b><br />\n The Scripts need some information about the site that creates the script (e.g. name and url) and about the feed (e.g. url, name, type)")); + if (!is_null($message)) { + $form .= sprintf(" <h2>%s</h2>\n", $message); + } + $form .= sprintf(" <div id=\"add_form\">\n" . + " <form action=\"%s\" method=\"post\" accept-charset=\"UTF-8\">\n" . + " <table summary=\"\">\n" . + " <tr>\n" . + " <th colspan=\"2\" id=\"formtitle\">%s</th>\n" . + " </tr>\n" . + " <tr class=\"required\">\n" . + " <td class=\"formElem\" >%s</td>\n" . + " <td class=\"formField\"><input type=\"text\" name=\"site_name\" size=\"30\" maxlength=\"255\" /></td>\n" . + " </tr>\n" . + " <tr class=\"required\">\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\"><input type=\"text\" name=\"site_url\" size=\"30\" maxlength=\"255\" /></td>\n" . + " </tr>\n" . + " <tr class=\"required\">\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\">\n" . + " <select name=\"site_lang\">\n" . + " <option value=\"en_EN\">%s</option>\n" . + " <option value=\"de_DE\">%s</option>\n" . + " </select>\n" . + " </td>\n" . + " <tr>\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\"><input type=\"text\" name=\"site_img\" size=\"30\" maxlength=\"255\" /></td>\n" . + " </tr>\n" . + " <tr class=\"required\">\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\"><input type=\"text\" name=\"feed_name\" size=\"30\" maxlength=\"255\" /></td>\n" . + " </tr>\n" . + " <tr>\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\"><input type=\"text\" name=\"feed_description\" size=\"30\" maxlength=\"255\" /></td>\n" . + " </tr>\n" . + " <tr class=\"required\">\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\"><input type=\"text\" name=\"feed_url\" size=\"30\" maxlength=\"255\" /></td>\n" . + " </tr>\n" . + " <tr class=\"required\">\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\">\n" . + " <select name=\"feed_type\">\n" . + " <option value=\"atom10\">%s</option>\n" . + " <option value=\"rss20\">%s</option>\n" . + " <option value=\"rss10\">%s</option>\n" . + " <option value=\"rdf09\">%s</option>\n" . + " </select>\n" . + " </td>\n" . + " </tr>\n" . + " <tr class=\"required\">\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\"><input type=\"text\" name=\"feed_db_name\" size=\"30\" maxlength=\"255\" /></td>\n" . + " </tr>\n" . + " <tr>\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\">\n" . + " <select name=\"feed_lang\">\n" . + " <option value=\"en_EN\">%s</option>\n" . + " <option value=\"de_DE\">%s</option>\n" . + " </select>\n" . + " </td>\n" . + " </tr>\n" . + " <tr>\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\"><input type=\"text\" name=\"feed_image\" size=\"30\" maxlength=\"255\" /></td>\n" . + " </tr>\n" . + " <tr class=\"required\">\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\">\n" . + " <select name=\"is_active\">\n" . + " <option value=\"1\">%s</option>\n" . + " <option value=\"0\">%s</option>\n" . + " </select>\n" . + " </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" . + " </form>\n" . + " <p id=\"required\">%s</p>\n" . + " </div>\n", $_SERVER['PHP_SELF'], _("ADD IT!"), _("Site Name"), _("Site URL"), _("Site Language"), _("English"), _("German"), _("Site Image"), _("Feed Name"), _("Feed Description"), _("Feed URL"), _("Feed Type"), _("ATOM 1.0"), _("RSS 2.0"), _("RSS 1.0"), _("RDF 0.9"), _("Feed Database Name"), _("Feed Language"), _("English"), _("German"), _("Feed Image"), _("Active?"), _("Yes!"), _("No!"), _("Submit!"), _("Reset"), _("Marked fields are required")); +} +?> \ No newline at end of file Modified: trunk/page_add_tag.php =================================================================== --- trunk/page_add_tag.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/page_add_tag.php 2007-01-05 19:00:42 UTC (rev 94) @@ -10,12 +10,8 @@ * @package feed-collector */ -require_once "inc/functions.php"; -require_once "class/Feed_manager.php"; require_once "inc/config.php"; -require_once "inc/definitions.php"; -error_reporting(E_ALL); - +//error_reporting(E_ALL); ############ # DATABASE # ############ @@ -52,13 +48,16 @@ HTTP_Session :: setExpire($session['time']['expire']); HTTP_Session :: setIdle($session['time']['idle']); -$feed = new Feed_manager($db); - if (true === HTTP_Session :: isNew()) { HTTP_Session :: set("logged_in", false); - } +################ +# FEED-Manager # +################ +require_once "class/Feed_manager.php"; +$feed = new Feed_manager($db); + ############## # HTTP-Class # ############## @@ -77,13 +76,13 @@ $user = new User_manager($db); if (false === HTTP_Session :: get("logged_in", false)) { - HTTP :: redirect("./page_login.php"); + //HTTP :: redirect("./page_login.php"); } $main = ""; if (!$tag_manager->hasTags($_GET['feed'])) { - $main .= sprintf("hi"); + $main .= sprintf(""); // there are no tags yet, please add one... } else { $main .= sprintf(" <div id=\"tags\">\n" . @@ -110,7 +109,7 @@ ##################### # BUILD THE CONTENT # ##################### - +$page = "add_tag"; // get the design $design = file_get_contents("styles/default/page_add_tag.tpl", "r"); @@ -128,11 +127,20 @@ $design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design); // midHeader title right -$midHeader_title_right = sprintf(" <span class=\"doNotDisplay\">%s</span>\n <a href=\"./index2.html\">view an alternative layout «</a>\n <span class=\"doNotDisplay\">|</span>\n <a style=\"cursor: help;\" title=\"Thanks to CSS, this page is already printer friendly!\">printer-friendly version «</a>", _("Tools:")); +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); +} $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation -$navigation = sprintf(" <span class=\"doNotDisplay\">Navigation:</span>\n <a href=\"./page_main.php\">%s</a> |\n <a href=\"./page_show_feeds.php\">%s</a> |\n <a href=\"./page_search.php\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n <a href=\"./page_login.php\" class=\"highlight\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Home"), _("Show Feeds"), _("Search"), _("Show TAGs"), _("About"), _("Login"), _("Register")); +require_once "inc/navigation.php"; $design = str_replace("<!-- navigation -->", $navigation, $design); // main @@ -148,16 +156,18 @@ function displayAddForm() { $form = sprintf(" <div id=\"addTags_form\">\n" . " <form action=\"%s\" method=\"post\" accept-charset=\"UTF-8\">\n" . - " <div id=\"formtitle\">%s</div>\n" . - " <div class=\"left\">\n" . - " <div class=\"formElem\">%s</div>\n" . - " </div>\n" . - " <div class=\"right\">\n" . - " <div class=\"formField\" ><input type=\"text\" name=\"tag\" size=\"30\" maxlength=\"30\" /></div>\n" . - " </div>\n" . - " <div id=\"formButtons\">\n" . - " <input type=\"submit\" value=\"%s\" name=\"submit\" />\n" . - " </div>\n" . + " <table summary=\"\">\n" . + " <tr>\n" . + " <td colspan=2 id=\"formtitle\">%s</td>\n" . + " </tr>\n" . + " <tr>\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\" ><input type=\"text\" name=\"tag\" size=\"30\" maxlength=\"30\" /></td>\n" . + " </tr>\n" . + " <tr>\n" . + " <td colspan=2 id=\"formButtons\"><input type=\"submit\" value=\"%s\" name=\"submit\" /></td>\n" . + " </tr>\n" . + " </table>\n" . " </form>\n" . " </div>\n", $_SERVER['PHP_SELF'] . "?feed=" . $_GET['feed'], _("Add Tag"), _("tag name"), _("Submit!")); return $form; Modified: trunk/page_login.php =================================================================== --- trunk/page_login.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/page_login.php 2007-01-05 19:00:42 UTC (rev 94) @@ -10,10 +10,7 @@ * @package feed-collector */ -require_once "inc/functions.php"; -require_once "class/Feed_manager.php"; require_once "inc/config.php"; -require_once "inc/definitions.php"; error_reporting(E_ALL); ############### @@ -60,8 +57,6 @@ HTTP_Session :: setExpire($session['time']['expire']); HTTP_Session :: setIdle($session['time']['idle']); -$feed = new Feed_manager($db); - if (true === HTTP_Session :: isNew()) { HTTP_Session :: set("logged_in", false); @@ -77,6 +72,7 @@ ################ require_once "class/User_manager.php"; $user = new User_manager($db); + if (false === HTTP_Session :: get("logged_in", false)) { if (isset ($_POST['submit'])) { if (empty ($_POST['username']) or empty ($_POST['passwd'])) { @@ -111,12 +107,13 @@ } } else { - $main = displayLoginForm(0); + $main = displayLoginForm(); } } else { - HTTP :: redirect ("./page_main.php"); + HTTP :: redirect("./page_main.php"); } +$page = "login"; ##################### # BUILD THE CONTENT # ##################### @@ -138,11 +135,20 @@ $design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design); // midHeader title right -$midHeader_title_right = sprintf(" <span class=\"doNotDisplay\">%s</span>\n <a href=\"./index2.html\">view an alternative layout «</a>\n <span class=\"doNotDisplay\">|</span>\n <a style=\"cursor: help;\" title=\"Thanks to CSS, this page is already printer friendly!\">printer-friendly version «</a>", _("Tools:")); +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); +} $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation -$navigation = sprintf(" <span class=\"doNotDisplay\">Navigation:</span>\n <a href=\"./page_main.php\">%s</a> |\n <a href=\"./page_show_feeds.php\">%s</a> |\n <a href=\"./page_search.php\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n <a href=\"./page_login.php\" class=\"highlight\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Home"), _("Show Feeds"), _("Search"), _("Show TAGs"), _("About"), _("Login"), _("Register")); +require_once "inc/navigation.php"; $design = str_replace("<!-- navigation -->", $navigation, $design); // main @@ -155,22 +161,29 @@ echo $design; -function displayLoginForm($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.pgp\">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 you username and your password to login. Cookies have to be enabled from this point.")); +function displayLoginForm($error = null) { + 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.pgp\">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 you 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 you 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" . Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/page_main.php 2007-01-05 19:00:42 UTC (rev 94) @@ -10,9 +10,7 @@ * @package feed-collector */ -require_once "inc/functions.php"; require_once "inc/config.php"; -require_once "inc/definitions.php"; error_reporting(E_ALL); ############ # DATABASE # @@ -123,17 +121,7 @@ $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation -$navigation = sprintf(" <a href=\"./page_main.php\" class=\"highlight\">%s</a> |\n" . -" <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . -" <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . -" <a href=\"./page_add_new_feed.php\">%s</a> |\n" . -" <a href=\"./page_show_all_tags.php\">%s</a> |\n", - _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); -if (false === HTTP_Session :: get("logged_in", false)) { - $navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register")); -} else { - $navigation .= sprintf(" <a href=\"./page_personal.php\">%s</a> |\n <a href=\"./page_logout.php?returnto=page_main.php\">%s</a>", _("Personal Page"), _("LogOut")); -} +require_once "inc/navigation.php"; $design = str_replace("<!-- navigation -->", $navigation, $design); # Main copy Modified: trunk/page_personal.php =================================================================== --- trunk/page_personal.php 2007-01-05 00:35:47 UTC (rev 93) +++ trunk/page_personal.php 2007-01-05 19:00:42 UTC (rev 94) @@ -10,21 +10,18 @@ * @package feed-collector */ -require_once "inc/functions.php"; - require_once "inc/config.php"; -require_once "inc/definitions.php"; error_reporting(E_ALL); ############ # DATABASE # ############ require_once "MDB2.php"; $dsn = array ( - 'phptype' => DB_TYPE, - 'username' => DB_LOGIN, - 'password' => DB_PASSWD, - 'hostspec' => DB_HOST, - 'database' => DB_DATABASE + 'phptype' => $db['type'], + 'username' => $db['user'], + 'password' => $db['passwd'], + 'hostspec' => $db['host'], + 'database' => $db['database'] ); $options = array ( 'debug' => 2, @@ -74,7 +71,7 @@ require_once "class/User_manager.php"; $user = new User_manager($db); -$page = "main"; +$page = "personal"; // // Now we're going to replace the placeholders in the template with the important content // @@ -93,34 +90,24 @@ $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", _("Feed-Collector"), _("{ stay up to date with all your news feeds! }")); +$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 right if (false === HTTP_Session :: get("logged_in", false)) { - $midHeader_title_right = sprintf(" <form action=\"./page_login.php\" method=\"post\"><span>%s</span> <input type=\"submit\" name=\"submit\" value=\"%s\" /><br />\n" . - " <input type=\"text\" name=\"username\" value=\"%s\" size=\"20\" /><br />\n" . - " <input type=\"password\" name=\"passwd\" value=\"%s\" /><br />\n" . - " <input type=\"hidden\" name=\"cameFrom\" value=\"%s\" />" . - " </form>\n" . - " </div>", _("Login:"), _("Submit!"), _("Username"), _("Password"), basename($_SERVER['PHP_SELF'])); + $midHeader_title_right = sprintf(" <p>%s</p>", _("You are not logged in")); } else { - $midHeader_title_right = sprintf(" <span>%s %s</span><br />\n" . - " <p id=\"userinfo\">%s %s</p>", _("Hello"), $user->getUsername(), _("Your last login was at"), date("H:m:i", HTTP_Session :: get("lastLogin"))); + 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); } $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation -$navigation = sprintf(" <a href=\"./page_main.php\">%s</a> |\n" . - " <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . - " <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . - " <a href=\"./page_add_new_feed.php\">%s</a> |\n" . - " <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); -if (false === HTTP_Session :: get("logged_in", false)) { - $navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register")); -} else { - $navigation .= sprintf(" <a href=\"./page_personal.php\" class=\"highlight\">%s</a> |\n <a href=\"./page_logout.php?returnto=page_main.php\">%s</a>", _("Personal Page"), _("LogOut")); -} +require_once "inc/navigation.php"; $design = str_replace("<!-- navigation -->", $navigation, $design); /* @@ -164,20 +151,6 @@ //} $design = str_replace("<!-- main -->", $main, $design); -/* -# sideBar -// sideBarElement one -$sideBarElement_one = sprintf(" <p class=\"sideBarTitle\">%s</p>\n\n <div class=\"sideBarText\"><strong>? May 03</strong><br />\n Submitted revised version of Gila to <a href=\"http://www.oswd.org\">OSWD</a></div>\n\n <div class=\"sideBarText\"><strong>3 Feb 03</strong><br />\n Original version of Gila submitted</div>\n\n <a href=\"./index.html\" class=\"more\">more news »</a>", _("News")); -$design = str_replace("<!-- sideBarElement one -->", $sideBarElement_one, $design); - -// sideBarElement two -$sideBarElement_two = sprintf(" <p class=\"sideBarTitle\">Downloads</p>\n\n <div class=\"sideBarText\"><st... [truncated message content] |
From: <c1...@us...> - 2007-01-05 00:35:49
|
Revision: 93 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=93&view=rev Author: c167 Date: 2007-01-04 16:35:47 -0800 (Thu, 04 Jan 2007) Log Message: ----------- some big changes Modified Paths: -------------- trunk/class/Tag_manager.php trunk/class/User_manager.php trunk/page_main.php trunk/styles/default/page_add_tag-screen.css trunk/styles/default/page_add_tag.tpl trunk/styles/default/page_login.tpl trunk/styles/default/page_personal-screen.css trunk/styles/default/page_personal.tpl trunk/styles/default/page_register.tpl trunk/styles/default/page_show_all_feeds-screen.css trunk/styles/default/page_show_all_feeds.tpl trunk/styles/default/page_show_feed-screen.css trunk/styles/default/page_show_feed.tpl trunk/styles/default/page_show_feed_tag-screen.css trunk/styles/default/page_show_feed_tag.tpl trunk/update_feeds.php Modified: trunk/class/Tag_manager.php =================================================================== --- trunk/class/Tag_manager.php 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/class/Tag_manager.php 2007-01-05 00:35:47 UTC (rev 93) @@ -79,9 +79,9 @@ return false; } while ($row = $query->fetchRow()) { - if (!isset ($row['tag'])) { + /*if (!isset ($row['tag']) or empty($row['tag'])) { return false; - } + }*/ $return[] = $row['tag']; } return $return; Modified: trunk/class/User_manager.php =================================================================== --- trunk/class/User_manager.php 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/class/User_manager.php 2007-01-05 00:35:47 UTC (rev 93) @@ -43,33 +43,29 @@ * @access protected */ protected $mdb; - - + /** * The userid * @access protected */ protected $uid = null; - + /** * The username * @access protected */ protected $username = null; - + /** * The users language * @access protected */ protected $language = null; - + /** * The standard-constructor - * * @param Object $db The PEAR::MDB2 - * * @return void - * @version 1.1 * @access public */ public function __construct($mdb) { @@ -80,7 +76,8 @@ * Return the content of the colums of a users personal page, deserialised * @param int $id The users user-id * @param boolean $serialised If the output should be serialised or as arrays - * @return mixed + * @return mixed + * @access public */ public function getUserCols($id, $serialised = false) { $info = $this->mdb->query("SELECT columns FROM users WHERE id = \"$id\";"); @@ -101,6 +98,7 @@ * @param int $userid * @param String $column * @return boolean + * @access public */ public function updateUserCols($userid, $column) { $cols = $this->mdb->query("UPDATE `users` SET `columns` = '$column' WHERE `users`.`ID` = '$userid'LIMIT 1 ;"); @@ -120,14 +118,17 @@ * @access public */ public function reg_registrateUser($username, $email, $passwd, $language) { - $add = $this->mdb5->query(sprintf("INSERT INTO `users` (`ID`, `name`, `email`, `pass`, `language`, `state`) " . - "VALUES (null, `%s`, `%s`, `%s`, `%s`, `active`);", $username, $email, $passwd, $language)); + $add = $this->mdb->query(sprintf("INSERT INTO `users` ( `ID` , `name` , `email` , `pass` , `language` , `columns` , `state` , `last_action` )" . + "VALUES (NULL , '%s', '%s', '%s', '%s', '', 'active', '0');", $username, $email, $passwd, $language)); + if (PEAR :: isError($add)) { + echo $add->getMessage(); + echo "<br />" . $add->getDebugInfo(); return false; } return true; } - + /** * Checks if the passwords a new user enters are totaly equal * @param String $passwd1 The first password @@ -136,30 +137,36 @@ * @access public */ public function reg_checkPasswordEquality($passwd1, $passwd2) { - if(strlen($passwd1) == strlen($passwd2)) { - if($passwd1 === $passwd2) { + if (strlen($passwd1) == strlen($passwd2)) { + if ($passwd1 === $passwd2) { return true; } } return false; } - + /** * Encryptes the password. if it gets passwords already enrypted, it returns them * @param String $passwd The password password * @return Mixed * @access public */ - public function reg_encryptPassword ($passwd) { - if(strlen($passwd) == 32) { - return array('pass' => $passwd, 'encrypted' => false); + public function reg_encryptPassword($passwd) { + if (strlen($passwd) == 32) { + return array ( + 'pass' => $passwd, + 'encrypted' => false + ); } - return array('pass' => md5($passwd), 'encrypted' => true); + return array ( + 'pass' => md5($passwd + ), 'encrypted' => true); } /** * Returns the number of users from the db * @return int + * @access public */ public function getNumberOfUsers() { $number = $this->mdb->queryOne("SELECT COUNT(*) FROM users;"); @@ -179,11 +186,15 @@ public function loginUser($username, $passwd) { $query = $this->mdb->query("SELECT id,name,pass,state FROM users WHERE name = '$username';"); if (PEAR :: isError($query)) { - return array('state' => LOGIN_WRONG_VALUES); + return array ( + 'state' => LOGIN_WRONG_VALUES + ); } $row = $query->fetchRow(); - if($row['state'] == "inactive") { - return array('state' => LOGIN_INACTIVE); + if ($row['state'] == "inactive") { + return array ( + 'state' => LOGIN_INACTIVE + ); } if ($passwd == $row['pass']) { $this->uid = $row['id']; @@ -197,72 +208,76 @@ ); } } - + /** * Logs out a user * @return boolean + * @access public */ public function logOut() { - if(is_null($this->uid)) { + if (is_null($this->uid)) { return false; } $this->uid = null; return true; } - + /** * Sets the time of the users last action * @return boolean + * @access public */ public function updateUserAction() { - if(is_null($this->uid)) { + if (is_null($this->uid)) { return false; } $query = $this->mdb->query(sprintf("UPDATE `users` SET `last_action` = '%d' WHERE `users`.`ID` = %d LIMIT 1 ;", time(), $this->uid)); - if(PEAR :: isError($query)) { + if (PEAR :: isError($query)) { return false; } return true; } - + /** * returns the time of the users last action * @return int + * @access public */ public function getUserActionTime() { - if(is_null($this->uid)) { + if (is_null($this->uid)) { return false; } $query = $this->mdb->queryOne(sprintf("SELECT last_action FROM users WHERE id= %d LIMIT 1;", $this->uid)); } - + /** * Returns the username * @return String/boolean on error + * @access public */ public function getUsername() { - if(is_null($this->uid)) { + if (is_null($this->uid)) { return false; } - if(is_null($this->username)) { - $this->username = $this->mdb2->queryOne("SELECT name FROM users WHERE id = ".$this->uid.";"); + if (is_null($this->username)) { + $this->username = $this->mdb2->queryOne("SELECT name FROM users WHERE id = " . $this->uid . ";"); } return $this->username; - + } - + /** * Returns the users language * @return String * @access public */ public function getUserLanguage() { - if(is_null($this->language)) { + if (is_null($this->language)) { $this->language = $this->mdb->queryOne(sprintf("SELECT language FROM users WHERE id = '%s';", $this->uid)); } return $this->language; } - + /** * Creates the Column-Strings * @param Array $array The users column-array @@ -271,13 +286,27 @@ */ public function createColumnString($array) { $return = ""; - for($i = 0; $i < count($array); $i++) { + for ($i = 0; $i < count($array); $i++) { $return .= $array[$i]; - if($i !== count($array)-1) { + if ($i !== count($array) - 1) { $return .= "|"; } } return $return; } + + /** + * Set the User-ID + * @param Int $id The user-id + * @return boolean + * @access public + */ + public function setUserId($id) { + if(is_null($this->uid)) { + $this->uid = $id; + return true; + } + return false; + } } ?> \ No newline at end of file Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/page_main.php 2007-01-05 00:35:47 UTC (rev 93) @@ -35,8 +35,6 @@ echo $db->getMessage(); echo "<br />"; echo $db->getDebugInfo(); -} else { - //$log->log(_("Successfully connected to the database"), PEAR_LOG_DEGUB); } $db->setFetchMode(MDB2_FETCHMODE_ASSOC); @@ -72,10 +70,12 @@ require_once "class/User_manager.php"; $user = new User_manager($db); + ############ # 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"; @@ -83,10 +83,10 @@ } else { $language = HTTP :: negotiateLanguage($langs, "en_EN"); } - +/* bindtextdomain("page_main", dirname($_SERVER['SCRIPT_FILENAME'])."i18n"); setlocale(LC_ALL, $language); - +*/ $page = "main"; // // Now we're going to replace the placeholders in the template with the important content @@ -106,25 +106,19 @@ $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", _("Feed-Collector"), _("{ stay up to date with all your news feeds! }")); +$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 right if (false === HTTP_Session :: get("logged_in", false)) { - $midHeader_title_right = sprintf(" <form action=\"./page_login.php\" method=\"post\"><span>%s</span> <input type=\"submit\" name=\"submit\" value=\"%s\" /><br />\n" . - " <input type=\"text\" name=\"username\" value=\"%s\" size=\"20\" /><br />\n" . - " <input type=\"password\" name=\"passwd\" value=\"%s\" /><br />\n" . - " <input type=\"hidden\" name=\"cameFrom\" value=\"%s\" />" . - " </form>\n" . - " </div>", _("Login:"), _("Submit!"), _("Username"), _("Password"), basename($_SERVER['PHP_SELF'])); + $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(" <span>%s %s</span><br />\n" . - " <div id=\"userinfo\">%s %s</div>", _("Hello"), $username, _("Your last login was at"), date("H:m:i", HTTP_Session :: get("lastLogin"))); + $midHeader_title_right = sprintf(" <p>%s %s</p>", _("Hello"), $username); } $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); @@ -133,7 +127,8 @@ " <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . " <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . " <a href=\"./page_add_new_feed.php\">%s</a> |\n" . -" <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); +" <a href=\"./page_show_all_tags.php\">%s</a> |\n", + _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); if (false === HTTP_Session :: get("logged_in", false)) { $navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register")); } else { @@ -202,7 +197,7 @@ $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_feeds.php?feed=%s\"><!--•-->%s</a> %s (%d%s)</li>\n", $newest['feed_db_name'], $newest['feed_name'], date(("m.d.y H:m:s"), $newest['added']), $newest['items'], _(" Items")); + $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(("m.d.y H:m:s"), $newest['added']), $newest['items'], _(" Items")); } $box_4 .= " </ul>"; $design = str_replace("<!-- box 4 -->", $box_4, $design); Modified: trunk/styles/default/page_add_tag-screen.css =================================================================== --- trunk/styles/default/page_add_tag-screen.css 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_add_tag-screen.css 2007-01-05 00:35:47 UTC (rev 93) @@ -135,6 +135,15 @@ padding: 0; } +.headerLogin { + border: 1px solid rgb(255,255,255); + text-align: right; + padding: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; +} + .headerLinks { text-align: right; margin: 0; Modified: trunk/styles/default/page_add_tag.tpl =================================================================== --- trunk/styles/default/page_add_tag.tpl 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_add_tag.tpl 2007-01-05 00:35:47 UTC (rev 93) @@ -28,7 +28,7 @@ <br class="doNotDisplay doNotPrint" /> - <div class="headerLinks"> + <div class="headerLogin"> <!-- midHeader title right --> </div> </div> Modified: trunk/styles/default/page_login.tpl =================================================================== --- trunk/styles/default/page_login.tpl 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_login.tpl 2007-01-05 00:35:47 UTC (rev 93) @@ -8,8 +8,6 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_login-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_login-print.css" media="screen" title="Print Preview" /> - <link rel="stylesheet" type="text/css" href="./styles/default/page_login-print.css" media="print" /> <title><!-- title --></title> </head> @@ -27,7 +25,6 @@ <div class="midHeader"> <!-- midHeader title left --> - </div> <br class="doNotDisplay doNotPrint" /> Modified: trunk/styles/default/page_personal-screen.css =================================================================== --- trunk/styles/default/page_personal-screen.css 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_personal-screen.css 2007-01-05 00:35:47 UTC (rev 93) @@ -135,6 +135,15 @@ padding: 0; } +.headerLogin { + border: 1px solid rgb(255,255,255); + text-align: right; + padding: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; +} + .headerLinks { text-align: right; margin: 0; Modified: trunk/styles/default/page_personal.tpl =================================================================== --- trunk/styles/default/page_personal.tpl 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_personal.tpl 2007-01-05 00:35:47 UTC (rev 93) @@ -8,8 +8,6 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_personal-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_personal-print.css" media="screen" title="Print Preview" /> - <link rel="stylesheet" type="text/css" href="./styles/default/page_personal-print.css" media="print" /> <script type="text/javascript" src="js.js" /> <title><!-- title --></title> @@ -28,7 +26,6 @@ <div class="midHeader"> <!-- midHeader title left --> - </div> <br class="doNotDisplay doNotPrint" /> Modified: trunk/styles/default/page_register.tpl =================================================================== --- trunk/styles/default/page_register.tpl 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_register.tpl 2007-01-05 00:35:47 UTC (rev 93) @@ -8,8 +8,6 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_register-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_register-print.css" media="screen" title="Print Preview" /> - <link rel="stylesheet" type="text/css" href="./styles/default/page_register-print.css" media="print" /> <title><!-- title --></title> </head> @@ -27,14 +25,9 @@ <div class="midHeader"> <!-- midHeader title left --> - </div> <br class="doNotDisplay doNotPrint" /> - <div class="headerLinks"> -<!-- midHeader title right --> - </div> - <div class="subHeader"> <!-- navigation --> </div> Modified: trunk/styles/default/page_show_all_feeds-screen.css =================================================================== --- trunk/styles/default/page_show_all_feeds-screen.css 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_show_all_feeds-screen.css 2007-01-05 00:35:47 UTC (rev 93) @@ -144,6 +144,15 @@ .headerLogin { border: 1px solid rgb(255,255,255); text-align: right; + padding: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; +} + +.headerLogin { + border: 1px solid rgb(255,255,255); + text-align: right; margin: 0; /* padding: 0 0 2ex 0;*/ padding-bottom: 1ex; Modified: trunk/styles/default/page_show_all_feeds.tpl =================================================================== --- trunk/styles/default/page_show_all_feeds.tpl 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_show_all_feeds.tpl 2007-01-05 00:35:47 UTC (rev 93) @@ -25,7 +25,7 @@ <div class="midHeader"> <!-- midHeader title left --> - </div> + <br class="doNotDisplay doNotPrint" /> <div class="headerLogin"> Modified: trunk/styles/default/page_show_feed-screen.css =================================================================== --- trunk/styles/default/page_show_feed-screen.css 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_show_feed-screen.css 2007-01-05 00:35:47 UTC (rev 93) @@ -139,6 +139,15 @@ font-style: italic; margin: 0 0 1ex 0; padding: 0; +} + +.headerLogin { + border: 1px solid rgb(255,255,255); + text-align: right; + padding: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; } .headerLinks { Modified: trunk/styles/default/page_show_feed.tpl =================================================================== --- trunk/styles/default/page_show_feed.tpl 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_show_feed.tpl 2007-01-05 00:35:47 UTC (rev 93) @@ -8,10 +8,7 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feed-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_show_feed-print.css" media="screen" title="Print Preview" /> - <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feed-print.css" media="print" /> - <script type="text/javascript" src="js.js" /> <title><!-- title --></title> </head> @@ -28,7 +25,6 @@ <div class="midHeader"> <!-- midHeader title left --> - </div> <br class="doNotDisplay doNotPrint" /> Modified: trunk/styles/default/page_show_feed_tag-screen.css =================================================================== --- trunk/styles/default/page_show_feed_tag-screen.css 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_show_feed_tag-screen.css 2007-01-05 00:35:47 UTC (rev 93) @@ -139,6 +139,15 @@ font-style: italic; margin: 0 0 1ex 0; padding: 0; +} + +.headerLogin { + border: 1px solid rgb(255,255,255); + text-align: right; + padding: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; } .headerLinks { Modified: trunk/styles/default/page_show_feed_tag.tpl =================================================================== --- trunk/styles/default/page_show_feed_tag.tpl 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/styles/default/page_show_feed_tag.tpl 2007-01-05 00:35:47 UTC (rev 93) @@ -9,7 +9,6 @@ <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feed_tag-screen.css" media="screen, tv, projection" title="Default" /> - <script type="text/javascript" src="js.js" /> <title><!-- title --></title> </head> @@ -26,7 +25,6 @@ <div class="midHeader"> <!-- midHeader title left --> - </div> <br class="doNotDisplay doNotPrint" /> Modified: trunk/update_feeds.php =================================================================== --- trunk/update_feeds.php 2007-01-05 00:15:40 UTC (rev 92) +++ trunk/update_feeds.php 2007-01-05 00:35:47 UTC (rev 93) @@ -19,7 +19,6 @@ 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"; } error_reporting(E_ALL); -//error_reporting(E_STRICT); // We need some PEAR-classes require_once "MDB2.php"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-05 00:15:40
|
Revision: 92 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=92&view=rev Author: c167 Date: 2007-01-04 16:15:40 -0800 (Thu, 04 Jan 2007) Log Message: ----------- fixed display-bug Modified Paths: -------------- trunk/styles/default/page_main-screen.css trunk/styles/default/page_main.tpl Modified: trunk/styles/default/page_main-screen.css =================================================================== --- trunk/styles/default/page_main-screen.css 2007-01-05 00:15:21 UTC (rev 91) +++ trunk/styles/default/page_main-screen.css 2007-01-05 00:15:40 UTC (rev 92) @@ -144,16 +144,12 @@ .headerLogin { border: 1px solid rgb(255,255,255); text-align: right; - margin: 0; -/* padding: 0 0 2ex 0;*/ - padding-bottom: 1ex; + padding: 1ex; position: absolute; right: 1.5em; top: 3.5em; -/* margin-left: 1em; - margin-right: 1em;*/ } - +/* .headerLogin a { color: white; background-color: transparent; @@ -162,26 +158,7 @@ padding: 0 0 0.5ex 0; display: block; } - -.headerLogin span { - -} - -#userinfo p { - color: white; - background-color: transparent; - margin: 0; -/* padding: 0 0 0.5ex 0;*/ - display: block; -} - -.headerLogin input:hover { /* color: rgb(195,196,210);*/ - color: black; - /* background-color: transparent;*/ - background-color: rgb(117, 144, 174); - text-decoration: underline; -} - +*/ .subHeader { color: white; background-color: rgb(117, 144, 174); Modified: trunk/styles/default/page_main.tpl =================================================================== --- trunk/styles/default/page_main.tpl 2007-01-05 00:15:21 UTC (rev 91) +++ trunk/styles/default/page_main.tpl 2007-01-05 00:15:40 UTC (rev 92) @@ -8,8 +8,6 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_main-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_main-print.css" media="screen" title="Print Preview" /> - <link rel="stylesheet" type="text/css" href="./styles/default/page_main-print.css" media="print" /> <title><!-- title --></title> </head> @@ -27,11 +25,12 @@ <div class="midHeader"> <!-- midHeader title left --> - </div> + <br class="doNotDisplay doNotPrint" /> <div class="headerLogin"> <!-- midHeader title right --> + </div> </div> <div class="subHeader"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-05 00:15:21
|
Revision: 91 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=91&view=rev Author: c167 Date: 2007-01-04 16:15:21 -0800 (Thu, 04 Jan 2007) Log Message: ----------- fixed display-bug Modified Paths: -------------- trunk/styles/default/page_add_tag-screen.css trunk/styles/default/page_add_tag.tpl Modified: trunk/styles/default/page_add_tag-screen.css =================================================================== --- trunk/styles/default/page_add_tag-screen.css 2007-01-04 18:18:34 UTC (rev 90) +++ trunk/styles/default/page_add_tag-screen.css 2007-01-05 00:15:21 UTC (rev 91) @@ -214,114 +214,41 @@ padding: 0; } -#registration_form { - float: left; - border: 1px solid rgb(204, 204, 204); - width: 80%; - margin-top: 1em; - margin-left: 9%; - margin-right: 9%; -} - #formtitle { text-align: center; color: white; background-color: rgb(117, 144, 174); font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; + font-size: 180%; /* margin: 0;*/ padding: 0.5ex 10px; border-bottom: 1px solid rgb(204, 204, 204); } -.left,.right { - float: left; +#addTags_form table { + width: 40%; + margin-left: 29%; + border: 1px solid rgb(204, 204, 204); } -.left { - border-right: 1px solid rgb(204, 204, 204); - margin-left: 20%; - padding-right: 20%; - margin-right: 20%; +.formElem { + width: 49%; + text-align: center; } -.right { - padding-left: 1em; - margin-left: 1em; -} - -.formElem_ok,.formElem_error,.formField_ok,.formElem_error { +.formField { } -.formElem_ok,.formElem_error { - -} - -.formElem_ok input { - background-color: yellow; -} - -.formElem_error input { - background-color: red; -} - -.formField_ok input { - background-color: yellow; -} - -.formField_error input { - background-color: red; -} - #formButtons { 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); + padding-top: 1.5%; + padding-bottom: 1.5%; + border-top: 1px solid rgb(204, 204, 204); } -#required { - width: 80%; -} - -.quarter,.oneThird,.half,.twoThirds,.fullWidth { - margin: 1em 0; - float: left; - border-left: 1px solid rgb(204, 204, 204); -} - -.quarter { - width: 21%; - padding: 0 1.9%; -} - -.oneThird { - width: 28%; - padding: 0 1.9%; -} - -.half { - text-align: justify; - width: 46%; - padding: 0 1.9%; -} - -.twoThirds { - text-align: justify; - width: 63%; - padding: 0 1.9%; -} - -.fullWidth { - text-align: justify; - width: 96%; - padding: 0 1.2em; - border-left: none; -} - .filler { /* use with an empty <p> element to add padding to the end of a text box */ border: 1px solid white; Modified: trunk/styles/default/page_add_tag.tpl =================================================================== --- trunk/styles/default/page_add_tag.tpl 2007-01-04 18:18:34 UTC (rev 90) +++ trunk/styles/default/page_add_tag.tpl 2007-01-05 00:15:21 UTC (rev 91) @@ -8,8 +8,6 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_add_tag-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_add_tag-print.css" media="screen" title="Print Preview" /> - <link rel="stylesheet" type="text/css" href="./styles/default/page_add_tag-print.css" media="print" /> <title><!-- title --></title> </head> @@ -27,12 +25,12 @@ <div class="midHeader"> <!-- midHeader title left --> - </div> <br class="doNotDisplay doNotPrint" /> <div class="headerLinks"> <!-- midHeader title right --> + </div> </div> <div class="subHeader"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-04 18:18:43
|
Revision: 90 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=90&view=rev Author: c167 Date: 2007-01-04 10:18:34 -0800 (Thu, 04 Jan 2007) Log Message: ----------- working now, XHTML-valid Modified Paths: -------------- trunk/page_register.php trunk/styles/default/page_register-screen.css Modified: trunk/page_register.php =================================================================== --- trunk/page_register.php 2007-01-04 14:52:53 UTC (rev 89) +++ trunk/page_register.php 2007-01-04 18:18:34 UTC (rev 90) @@ -69,6 +69,17 @@ } +############## +# HTTP-Class # +############## +require_once "HTTP.php"; + +################ +# User-Manager # +################ +require_once "class/User_manager.php"; +$user = new User_manager($db); + ##################### # BUILD THE CONTENT # ##################### @@ -112,7 +123,7 @@ $main = ""; //if (empty ($_POST['username']) or empty ($_POST['mail']) or empty ($_POST['passwd1']) or empty ($_POST['passwd2'])) { -if (isset ($_POST) and is_array($_POST)) { +/*if (isset ($_POST) and is_array($_POST)) { if (isset ($_POST['username']) and isset ($_POST['mail']) and isset ($_POST['passwd1']) and isset ($_POST['passwd2']) and isset ($_POST['language'])) { if (md5($_POST['passwd1']) === md5($_POST['passwd2'])) { $passwd_checked = checkPassword($_POST['passwd1']); @@ -132,6 +143,17 @@ } } else { +}*/ +if (isset ($_POST['username']) and isset ($_POST['mail']) and isset ($_POST['passwd1']) and isset ($_POST['passwd2']) and isset ($_POST['language'])) { + if(true === $user->reg_checkPasswordEquality($_POST['passwd1'], $_POST['passwd2'])) { + if(true === $user->reg_registrateUser($_POST['username'], $_POST['mail'], md5($_POST['passwd1']), $_POST['language'])) { + HTTP :: redirect("./page_main.php"); + } else { + buildForm($main, _("An error occured")); + } + } +} else { + buildForm($main); } $design = str_replace("<!-- main -->", $main, $design); @@ -143,36 +165,49 @@ echo $design; function buildForm(& $form, $message = null) { - $form = sprintf(" <h1>%s</h1>\n <p>%s</p>", _("Registration"), _("<b>Why register?</b><br />\n If you register, you'll have a personal page with lots of free space to place your favourite newsfeeds (only limited by your screen)")); + $form = sprintf(" <h1>%s</h1>\n <p>%s</p>\n", _("Registration"), _("<b>Why register?</b><br />\n If you register, you'll have a personal page with lots of free space to place your favourite newsfeeds (only limited by your screen)")); if (!is_null($message)) { $form .= sprintf(" <h2>%s</h2>\n", $message); } $form .= sprintf(" <div id=\"registration_form\">\n" . " <form action=\"%s\" method=\"post\" accept-charset=\"UTF-8\">\n" . - " <div id=\"formtitle\">%s</div>\n" . - " <div id=\"left\">\n" . - " <div class=\"formElem\">%s</div>\n" . - " <div class=\"formElem\">%s</div>\n" . - " <div class=\"formElem\">%s</div>\n" . - " <div class=\"formElem\">%s</div>\n" . - " <div class=\"formElem\">%s</div>\n" . - " <div class=\"formElem\">%s</div>\n" . - " </div>\n" . - " <div id=\"right\">\n" . - " <div class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></div>\n" . - " <div class=\"formField\"><input type=\"text\" name=\"mail\" size=\"30\" maxlength=\"30\" /></div>\n" . - " <div class=\"formField\"><input type=\"text\" name=\"passwd1\" size=\"30\" maxlength=\"30\" /></div>\n" . - " <div class=\"formField\"><input type=\"text\" name=\"passwd2\" size=\"30\" maxlength=\"30\" /></div>\n" . - " <div class=\"formField\"><input type=\"text\" name=\"option_list1\" size=\"30\" maxlength=\"30\" /></div>\n" . - " <div class=\"formField\"><input type=\"text\" name=\"option_list2\" size=\"30\" maxlength=\"30\" /></div>\n" . - " </div>\n" . - " <div id=\"formButtons\">\n" . - " <input type=\"submit\" value=\"%s\" name=\"submit\" />\n" . - " <input type=\"reset\" value=\"%s\" />\n" . - " </div>\n" . + " <table summary=\"\">\n" . + " <tr>\n" . + " <th colspan=\"2\" id=\"formtitle\">%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\" /></td>\n" . + " </tr>\n" . + " <tr>\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\"><input type=\"text\" name=\"mail\" size=\"30\" maxlength=\"30\" /></td>\n" . + " </tr>\n" . + " <tr>\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\"><input type=\"password\" name=\"passwd1\" size=\"30\" maxlength=\"30\" /></td>\n" . + " </tr>\n" . + " <tr>\n" . + " <td class=\"formElem\">%s</td>\n" . + " <td class=\"formField\"><input type=\"password\" name=\"passwd2\" size=\"30\" maxlength=\"30\" /></td>\n" . + " </tr>\n" . + " <tr>\n" . + " <td class=\"formElem\">%s</td>\n" . + " <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" . + " </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" . " </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"), _("opt1"), _("opt2"), _("Submit!"), _("Reset!")); + " </div>\n", $_SERVER['PHP_SELF'], _("Registration information"), _("Username"), _("E-MAIL-address"), _("Password"), _("Repeat password"), _("Language"), _("English"), _("German"), _("Submit!"), _("Reset!")); } function checkPassword($pass) { Modified: trunk/styles/default/page_register-screen.css =================================================================== --- trunk/styles/default/page_register-screen.css 2007-01-04 14:52:53 UTC (rev 89) +++ trunk/styles/default/page_register-screen.css 2007-01-04 18:18:34 UTC (rev 90) @@ -234,40 +234,30 @@ border-bottom: 1px solid rgb(204, 204, 204); } -#left,#right { - margin: 1em 0; - margin-top: 0em; - /* padding: 0 2%;*/ - float: left; +table { + width: 100%; } -#left { - width: 45%; - border-right: 1px solid rgb(204, 204, 204); -} - -#right { - width: 45%; -} - .formElem,.formField { - /*margin: 1em 0;*/ - padding-top: 1em; + padding-top: 0em; padding-left: 1em; + } .formElem { border-bottom: 1px solid rgb(204, 204, 204); - padding-top: 7%; + padding-top: 2%; + padding-left: 5%; } .formField { border-bottom: 1px solid rgb(204, 204, 204); - padding-top: 7%; - + padding-top: 2%; + padding-left: 5%; + border-left: 1px solid rgb(204, 204, 204); } -#registration_form #formButtons { +#formButtons { text-align: center; background-color: rgb(117, 144, 174); margin-top: 16em; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-04 14:52:52
|
Revision: 89 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=89&view=rev Author: c167 Date: 2007-01-04 06:52:53 -0800 (Thu, 04 Jan 2007) Log Message: ----------- working correctly, XHTML valid Modified Paths: -------------- trunk/page_show_all_feeds.php trunk/styles/default/page_show_all_feeds-screen.css trunk/styles/default/page_show_all_feeds.tpl Modified: trunk/page_show_all_feeds.php =================================================================== --- trunk/page_show_all_feeds.php 2007-01-04 14:20:35 UTC (rev 88) +++ trunk/page_show_all_feeds.php 2007-01-04 14:52:53 UTC (rev 89) @@ -35,8 +35,6 @@ echo $db->getMessage(); echo "<br />"; echo $db->getDebugInfo(); -} else { - //$log->log(_("Successfully connected to the database"), PEAR_LOG_DEGUB); } $db->setFetchMode(MDB2_FETCHMODE_ASSOC); @@ -49,8 +47,7 @@ 'table' => $session['container']['tablename'], 'autooptimize' => $session['container']['autooptimize'] ); -HTTP_Session :: setContainer('MDB2', /*$session['container']['options']*/ -$options); +HTTP_Session :: setContainer('MDB2', $options); HTTP_Session :: start(); HTTP_Session :: setExpire($session['time']['expire']); HTTP_Session :: setIdle($session['time']['idle']); @@ -79,9 +76,6 @@ require_once "class/Tag_manager.php"; $tag_manager = new Tag_Manager($db); -HTTP_Session :: set("logged_in", true); -HTTP_Session :: set("uid", 0); - #################################### # Working with the users feed-list # #################################### @@ -144,8 +138,7 @@ if (true === HTTP_Session :: get("logged_in", false)) { $main = createSelectionForm($feed, $tag_manager, $user); } else { - $main = createSelectionTable($feed, /*30, detectActualPage($maxpages),*/ - $tag_manager); + $main = createSelectionTable($feed, $tag_manager); } $design = str_replace("<!-- main -->", $main, $design); @@ -166,7 +159,7 @@ return "error!!!"; } $return = sprintf(" <form action=\"%s\" method=\"post\">\n", $_SERVER['PHP_SELF']); - $return .= sprintf(" <table summary=\"\" border=\"1\">\n" . + $return .= sprintf(" <table summary=\"\" >\n" . " <tr>\n" . " <th colspan=\"5\" class=\"submit\"><input type=\"submit\" name=\"Submit\" value=\"%s\" /></th>\n" . " </tr>\n" . @@ -244,11 +237,11 @@ } else { $return .= " <td>\n"; foreach ($tags as $id => $tag) { - $return .= " <a href=\"./page_show_feed_tag.php?tag=$tag\">$tag</a>"; + $taglink = str_replace(" ", "%20", $tag); + $return .= "<a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>"; if ($id !== (count($tags) - 1)) { $return .= ", "; } - //$main .= "\n"; } $return .= " </td>\n"; } Modified: trunk/styles/default/page_show_all_feeds-screen.css =================================================================== --- trunk/styles/default/page_show_all_feeds-screen.css 2007-01-04 14:20:35 UTC (rev 88) +++ trunk/styles/default/page_show_all_feeds-screen.css 2007-01-04 14:52:53 UTC (rev 89) @@ -237,6 +237,21 @@ padding: 0; } +table { + width: 100%; +} + +th { + text-align: left; + border-left: 1px solid rgb(204, 204, 204); + border-top: 1px solid rgb(204, 204, 204); + border-bottom: 1px solid rgb(204, 204, 204); +} + +td { + border-bottom: 1px solid rgb(204, 204, 204); + border-left: 1px solid rgb(204, 204, 204); +} .checked { background-color: yellow; } Modified: trunk/styles/default/page_show_all_feeds.tpl =================================================================== --- trunk/styles/default/page_show_all_feeds.tpl 2007-01-04 14:20:35 UTC (rev 88) +++ trunk/styles/default/page_show_all_feeds.tpl 2007-01-04 14:52:53 UTC (rev 89) @@ -8,8 +8,6 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_show_all_feeds-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_show_all_feeds-print.css" media="screen" title="Print Preview" /> - <link rel="stylesheet" type="text/css" href="./styles/default/page_show_all_feeds-print.css" media="print" /> <title><!-- title --></title> </head> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-04 14:20:35
|
Revision: 88 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=88&view=rev Author: c167 Date: 2007-01-04 06:20:35 -0800 (Thu, 04 Jan 2007) Log Message: ----------- fixed display bug Modified Paths: -------------- trunk/page_show_feed_tag.php trunk/styles/default/page_show_feed_tag-screen.css trunk/styles/default/page_show_feed_tag.tpl Modified: trunk/page_show_feed_tag.php =================================================================== --- trunk/page_show_feed_tag.php 2007-01-03 18:43:31 UTC (rev 87) +++ trunk/page_show_feed_tag.php 2007-01-04 14:20:35 UTC (rev 88) @@ -77,7 +77,7 @@ // if (!isset ($_GET['tag'])) { $form = displaySearchForm(); - $main = sprintf(" <p class=\"space\">%s</p>", _("You did not select a tag, please select one on the input-field on the right side of the site... -->")); + $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); Modified: trunk/styles/default/page_show_feed_tag-screen.css =================================================================== --- trunk/styles/default/page_show_feed_tag-screen.css 2007-01-03 18:43:31 UTC (rev 87) +++ trunk/styles/default/page_show_feed_tag-screen.css 2007-01-04 14:20:35 UTC (rev 88) @@ -272,6 +272,10 @@ margin: 1em 0 1.5em 0; padding: 0; } + +p .space { + margin-top: 4em; +} .newsHeading { color: rgb(61,92,122); Modified: trunk/styles/default/page_show_feed_tag.tpl =================================================================== --- trunk/styles/default/page_show_feed_tag.tpl 2007-01-03 18:43:31 UTC (rev 87) +++ trunk/styles/default/page_show_feed_tag.tpl 2007-01-04 14:20:35 UTC (rev 88) @@ -8,8 +8,6 @@ <meta name="generator" content="haran" /> <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feed_tag-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_show_feed_tag-print.css" media="screen" title="Print Preview" /> - <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feed_tag-print.css" media="print" /> <script type="text/javascript" src="js.js" /> <title><!-- title --></title> @@ -50,8 +48,6 @@ <!-- main --> </div> - - <!-- ##### Footer ##### --> <div id="footer"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-03 18:43:33
|
Revision: 87 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=87&view=rev Author: c167 Date: 2007-01-03 10:43:31 -0800 (Wed, 03 Jan 2007) Log Message: ----------- Closed bug, thx to PsYCoN Modified Paths: -------------- trunk/page_personal.php Modified: trunk/page_personal.php =================================================================== --- trunk/page_personal.php 2007-01-03 16:51:39 UTC (rev 86) +++ trunk/page_personal.php 2007-01-03 18:43:31 UTC (rev 87) @@ -59,7 +59,7 @@ HTTP_Session :: setIdle($session['time']['idle']); if(false === HTTP_Session :: get("logged_in", false)) { - //HTTP :: redirect("./page_login.php"); + HTTP :: redirect("./page_login.php"); } ################ @@ -128,38 +128,40 @@ */ # Main copy // main -HTTP_Session :: set("uid", 0); -HTTP_Session :: set("logged_in", true); -if (HTTP_Session :: get("uid") >= 0 and HTTP_Session :: get("uid") < $user->getNumberOfUsers()) { +//if (HTTP_Session :: get("uid") >= 0 and HTTP_Session :: get("uid") < $user->getNumberOfUsers()) { $cols = $user->getUserCols(HTTP_Session :: get("uid"), false); - + $count = count($cols); $main = ""; + if($count > 0) { ############ # Column 1 # ############ - for($i = 0; $i < count($cols); $i+=3) { + for($i = 0; $i < $count; $i+=3) { $col1[] = $cols[$i]; } $main .= createColumn($col1, 1, $feed); - + } + if($count > 1) { ############ # Column 2 # ############ - for($i = 1; $i < count($cols); $i+=3) { + for($i = 1; $i < $count; $i+=3) { $col2[] = $cols[$i]; } $main .= createColumn($col2, 2, $feed); - + } + if($count > 2) { ############ # Column 3 # ############ - for($i = 2; $i < count($cols); $i+=3) { + for($i = 2; $i < $count; $i+=3) { $col3[] = $cols[$i]; } $main .= createColumn($col3, 3, $feed); -} else { - $main = ""; -} + } +//} else { +// $main = ""; +//} $design = str_replace("<!-- main -->", $main, $design); /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-03 16:51:46
|
Revision: 86 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=86&view=rev Author: c167 Date: 2007-01-03 08:51:39 -0800 (Wed, 03 Jan 2007) Log Message: ----------- some changes Modified Paths: -------------- trunk/class/User_manager.php trunk/page_main.php trunk/page_personal.php trunk/page_show_all_feeds.php trunk/styles/default/page_show_all_feeds-screen.css Modified: trunk/class/User_manager.php =================================================================== --- trunk/class/User_manager.php 2007-01-02 14:57:23 UTC (rev 85) +++ trunk/class/User_manager.php 2007-01-03 16:51:39 UTC (rev 86) @@ -83,19 +83,15 @@ * @return mixed */ public function getUserCols($id, $serialised = false) { - $info = $this->mdb->query("SELECT col1,col2,col3 FROM users WHERE id = \"$id\";"); + $info = $this->mdb->query("SELECT columns FROM users WHERE id = \"$id\";"); if (PEAR :: isError($info)) { return false; } $row = $info->fetchRow(); if (true === $serialised) { - $return['column1'] = $row['col1']; - $return['column2'] = $row['col2']; - $return['column3'] = $row['col3']; + $return = $row['columns']; } else { - $return['column1'] = unserialize($row['col1']); - $return['column2'] = unserialize($row['col2']); - $return['column3'] = unserialize($row['col3']); + $return = explode("|", $row['columns']); } return $return; } @@ -103,23 +99,11 @@ /** * Updates the users personal page colums * @param int $userid - * @param Array/String $col1 - * @param Array/String $col2 - * @param Array/String $col4 + * @param String $column * @return boolean */ - public function updateUserCols($userid, $col1, $col2, $col3) { - if (true === is_array($col1)) { - $col1 = serialize($col1); - } - if (true === is_array($col2)) { - $col2 = serialize($col2); - } - if (true === is_array($col3)) { - $col3 = serialize($col3); - } - - $cols = $this->mdb->query("UPDATE `users` SET `col1` = '$col1', `col2` = '$col2', `col3` = '$col3' WHERE `users`.`ID` = $userid LIMIT 1 ;"); + public function updateUserCols($userid, $column) { + $cols = $this->mdb->query("UPDATE `users` SET `columns` = '$column' WHERE `users`.`ID` = '$userid'LIMIT 1 ;"); if (PEAR :: isError($cols)) { return false; } @@ -130,14 +114,14 @@ * Adds a user * @param String $username * @param String $email - * @param String $passwd MD5-sum of the users password + * @param String $passwd MD5-sum of the users password * @param String $timezone * @return boolean * @access public */ public function reg_registrateUser($username, $email, $passwd, $language) { $add = $this->mdb5->query(sprintf("INSERT INTO `users` (`ID`, `name`, `email`, `pass`, `language`, `state`) " . - "VALUES (null, `%s`, `%s`, `%s`, `%s`, `regged`);", $username, $email, $passwd, $language)); + "VALUES (null, `%s`, `%s`, `%s`, `%s`, `active`);", $username, $email, $passwd, $language)); if (PEAR :: isError($add)) { return false; } @@ -156,10 +140,8 @@ if($passwd1 === $passwd2) { return true; } - return false; - } else { - return false; } + return false; } /** @@ -278,7 +260,24 @@ if(is_null($this->language)) { $this->language = $this->mdb->queryOne(sprintf("SELECT language FROM users WHERE id = '%s';", $this->uid)); } - return $This->language; + return $this->language; } + + /** + * Creates the Column-Strings + * @param Array $array The users column-array + * @return String + * @access public + */ + public function createColumnString($array) { + $return = ""; + for($i = 0; $i < count($array); $i++) { + $return .= $array[$i]; + if($i !== count($array)-1) { + $return .= "|"; + } + } + return $return; + } } ?> \ No newline at end of file Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-01-02 14:57:23 UTC (rev 85) +++ trunk/page_main.php 2007-01-03 16:51:39 UTC (rev 86) @@ -118,8 +118,13 @@ " </form>\n" . " </div>", _("Login:"), _("Submit!"), _("Username"), _("Password"), basename($_SERVER['PHP_SELF'])); } else { + if(HTTP_Session :: get("username", false) == false) { + $username = $user->getUsername(); + } else { + $username = HTTP_Session :: get("username"); + } $midHeader_title_right = sprintf(" <span>%s %s</span><br />\n" . - " <div id=\"userinfo\">%s %s</div>", _("Hello"), HTTP_Session :: get("username"), _("Your last login was at"), date("H:m:i", HTTP_Session :: get("lastLogin"))); + " <div id=\"userinfo\">%s %s</div>", _("Hello"), $username, _("Your last login was at"), date("H:m:i", HTTP_Session :: get("lastLogin"))); } $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); Modified: trunk/page_personal.php =================================================================== --- trunk/page_personal.php 2007-01-02 14:57:23 UTC (rev 85) +++ trunk/page_personal.php 2007-01-03 16:51:39 UTC (rev 86) @@ -59,7 +59,7 @@ HTTP_Session :: setIdle($session['time']['idle']); if(false === HTTP_Session :: get("logged_in", false)) { - HTTP :: redirect("./page_login.php"); + //HTTP :: redirect("./page_login.php"); } ################ @@ -129,23 +129,34 @@ # Main copy // main HTTP_Session :: set("uid", 0); +HTTP_Session :: set("logged_in", true); if (HTTP_Session :: get("uid") >= 0 and HTTP_Session :: get("uid") < $user->getNumberOfUsers()) { $cols = $user->getUserCols(HTTP_Session :: get("uid"), false); + $main = ""; ############ # Column 1 # ############ - $main .= createColumn($cols, 1, $feed); + for($i = 0; $i < count($cols); $i+=3) { + $col1[] = $cols[$i]; + } + $main .= createColumn($col1, 1, $feed); ############ # Column 2 # ############ - $main .= createColumn($cols, 2, $feed); + for($i = 1; $i < count($cols); $i+=3) { + $col2[] = $cols[$i]; + } + $main .= createColumn($col2, 2, $feed); ############ # Column 3 # ############ - $main .= createColumn($cols, 3, $feed); + for($i = 2; $i < count($cols); $i+=3) { + $col3[] = $cols[$i]; + } + $main .= createColumn($col3, 3, $feed); } else { $main = ""; } @@ -172,9 +183,9 @@ echo $design; -function createColumn($cols, $number, $feed) { +function createColumn($column, $number, $feed) { $return = " <div class=\"column$number\">\n"; - foreach ($cols["column$number"] as $col) { + foreach ($column as $col) { $return .= " <div 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']); @@ -187,18 +198,4 @@ $return .= " </div>\n"; return $return; } - -function findBiggestArray($a1, $a2, $a3) { - $a1 = count($a1); - $a2 = count($a2); - $a3 = count($a3); - $number = 0; - if ($a1 > $number) - $number = $a1; - if ($a2 > $number) - $number = $a2; - if ($a3 > $number) - $number = $a3; - return $number; -} ?> \ No newline at end of file Modified: trunk/page_show_all_feeds.php =================================================================== --- trunk/page_show_all_feeds.php 2007-01-02 14:57:23 UTC (rev 85) +++ trunk/page_show_all_feeds.php 2007-01-03 16:51:39 UTC (rev 86) @@ -80,8 +80,15 @@ $tag_manager = new Tag_Manager($db); HTTP_Session :: set("logged_in", true); +HTTP_Session :: set("uid", 0); -//$maxpages = $feed->getFeedsMaxPages(10); +#################################### +# 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']); +} $page = "main"; // @@ -120,8 +127,8 @@ $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation -$navigation = sprintf(" <a href=\"./page_main.php\" class=\"highlight\">%s</a> |\n" . -" <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . +$navigation = sprintf(" <a href=\"./page_main.php\">%s</a> |\n" . +" <a href=\"./page_show_all_feeds.php\" class=\"highlight\">%s</a> |\n" . " <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . " <a href=\"./page_add_new_feed.php\">%s</a> |\n" . " <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); @@ -134,8 +141,8 @@ # Main copy // main -if (true === HTTP_Session :: get("logged_in")) { - $main = createSelectionForm($feed, $tag_manager); +if (true === HTTP_Session :: get("logged_in", false)) { + $main = createSelectionForm($feed, $tag_manager, $user); } else { $main = createSelectionTable($feed, /*30, detectActualPage($maxpages),*/ $tag_manager); @@ -153,22 +160,32 @@ echo $design; -function createSelectionForm($feed, $tag_manager) { - $items = $feed->getFeeds(); - if (false === $items) { +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" . + $return .= sprintf(" <table summary=\"\" border=\"1\">\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", _("Feed List"), _("Site"), _("Tags"), _("Languages")); - foreach ($items as $list) { + " </tr>\n", _("Submit"), _("Feed List"), _("Site"), _("Tags"), _("Languages")); + foreach ($feeds as $list) { + $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" . @@ -182,7 +199,8 @@ } else { $return .= " <td>"; foreach ($tags as $id => $tag) { - $return .= "<a href=\"./page_show_feed_tag.php?tag=$tag\">$tag</a>"; + $taglink = str_replace(" ", "%20", $tag); + $return .= "<a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>"; if ($id !== (count($tags) - 1)) { $return .= ", "; } @@ -194,7 +212,10 @@ " </tr>\n", $list['site_lang'], $list['site_lang']); } - $return .= " </table>\n </form>"; + $return .= sprintf(" <tr>\n" . + " <th colspan=\"5\" class=\"submit\"><input type=\"submit\" name=\"Submit\" value=\"%s\" /></th>\n" . + " </tr>\n" . + " </table>\n </form>", _("Submit")); return $return; } Modified: trunk/styles/default/page_show_all_feeds-screen.css =================================================================== --- trunk/styles/default/page_show_all_feeds-screen.css 2007-01-02 14:57:23 UTC (rev 85) +++ trunk/styles/default/page_show_all_feeds-screen.css 2007-01-03 16:51:39 UTC (rev 86) @@ -237,93 +237,10 @@ padding: 0; } -.newsHeading { - color: rgb(61, 92, 122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 145%; - text-decoration: none; - margin: 0; - padding: 1ex 0 0 0; - display: block; +.checked { + background-color: yellow; } -.newsHeading:hover { - color: rgb(117, 144, 174); - background-color: transparent; - text-decoration: underline; -} - -.newsDate { - font-style: italic; - margin: 0 !important; - padding: 0; -} - -.newsSummary { - margin: 1.5ex 0 2.5ex 0.75ex !important; - padding: 0; -} - -.more { - text-align: right; - margin: 0; - padding: 0.5em 0; -} - -.more a { - color: rgb(61, 92, 122); - background-color: transparent; - font-size: 92%; - text-decoration: underline; - margin: 0; - padding: 0.25ex 0.75ex; -} - -.more a:hover { - color: rgb(117, 144, 174); - text-decoration: none; -} - -.rowOfBoxes { - clear: both; -} - -.quarter,.oneThird,.half,.twoThirds,.fullWidth { - margin: 1em 0; - float: left; - border-left: 1px solid rgb(204, 204, 204); -} - -.quarter { - width: 21%; - padding: 0 1.9%; -} - -.oneThird { - width: 28%; - padding: 0 1.9%; -} - -.half { - text-align: justify; - width: 46%; - padding: 0 1.9%; -} - -.twoThirds { - text-align: justify; - width: 63%; - padding: 0 1.9%; -} - -.fullWidth { - text-align: justify; - width: 96%; - padding: 0 1.2em; - border-left: none; -} - .filler { /* use with an empty <p> element to add padding to the end of a text box */ border: 1px solid white; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-02 15:00:46
|
Revision: 83 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=83&view=rev Author: c167 Date: 2007-01-02 06:56:03 -0800 (Tue, 02 Jan 2007) Log Message: ----------- some changes Modified Paths: -------------- trunk/page_add_tag.php trunk/page_main.php trunk/page_show_all_feeds.php trunk/page_show_feed.php trunk/page_show_feed_tag.php trunk/styles/default/page_show_all_feeds.tpl trunk/styles/default/page_show_feed_tag-screen.css trunk/styles/default/page_show_feed_tag.tpl trunk/update_feeds.php Modified: trunk/page_add_tag.php =================================================================== --- trunk/page_add_tag.php 2006-12-30 09:06:45 UTC (rev 82) +++ trunk/page_add_tag.php 2007-01-02 14:56:03 UTC (rev 83) @@ -76,32 +76,32 @@ require_once "class/User_manager.php"; $user = new User_manager($db); -if(false === HTTP_Session :: get("logged_in", false)) { +if (false === HTTP_Session :: get("logged_in", false)) { HTTP :: redirect("./page_login.php"); } $main = ""; - if (!$tag_manager->hasTags($_GET['feed'])) { - $main .= sprintf("hi"); - // there are no tags yet, please add one... +if (!$tag_manager->hasTags($_GET['feed'])) { + $main .= sprintf("hi"); + // there are no tags yet, please add one... +} 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 { - $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"; + 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"; } + $main .= " </div>\n"; +} if (isset ($_POST['tag'])) { $tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']); } @@ -159,22 +159,7 @@ " <input type=\"submit\" value=\"%s\" name=\"submit\" />\n" . " </div>\n" . " </form>\n" . - " </div>\n", $_SERVER['PHP_SELF']."?feed=".$_GET['feed'], _("Add Tag"), _("tag name"), _("Submit!")); + " </div>\n", $_SERVER['PHP_SELF'] . "?feed=" . $_GET['feed'], _("Add Tag"), _("tag name"), _("Submit!")); return $form; } - -function filterInput($input, $type) { - $inhalt = trim($inhalt); - $inhalt = htmlspecialchars($inhalt); - switch ($type) { - case "username" : - - break; - case "mail" : - - break; - } - - return $inhalt; -} ?> \ No newline at end of file Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2006-12-30 09:06:45 UTC (rev 82) +++ trunk/page_main.php 2007-01-02 14:56:03 UTC (rev 83) @@ -128,7 +128,7 @@ " <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . " <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . " <a href=\"./page_add_new_feed.php\">%s</a> |\n" . -" <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); +" <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); if (false === HTTP_Session :: get("logged_in", false)) { $navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register")); } else { Modified: trunk/page_show_all_feeds.php =================================================================== --- trunk/page_show_all_feeds.php 2006-12-30 09:06:45 UTC (rev 82) +++ trunk/page_show_all_feeds.php 2007-01-02 14:56:03 UTC (rev 83) @@ -79,6 +79,8 @@ require_once "class/Tag_manager.php"; $tag_manager = new Tag_Manager($db); +HTTP_Session :: set("logged_in", true); + //$maxpages = $feed->getFeedsMaxPages(10); $page = "main"; @@ -118,18 +120,22 @@ $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation -$navigation = sprintf(" <a href=\"./page_main.php\" class=\"highlight\">%s</a> |\n <a href=\"./page_show_feeds.php\">%s</a> |\n <a href=\"./page_search.php\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Search"), _("Show TAGs"), _("About")); +$navigation = sprintf(" <a href=\"./page_main.php\" class=\"highlight\">%s</a> |\n" . +" <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . +" <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . +" <a href=\"./page_add_new_feed.php\">%s</a> |\n" . +" <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); if (false === HTTP_Session :: get("logged_in", false)) { $navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register")); } else { - $navigation .= sprintf(" <a href=\"./page_profile.php\">%s</a>", _("Profile")); + $navigation .= sprintf(" <a href=\"./page_personal.php\">%s</a> |\n <a href=\"./page_logout.php?returnto=page_main.php\">%s</a>", _("Personal Page"), _("LogOut")); } $design = str_replace("<!-- navigation -->", $navigation, $design); # Main copy // main if (true === HTTP_Session :: get("logged_in")) { - $main = createSelectionForm(); + $main = createSelectionForm($feed, $tag_manager); } else { $main = createSelectionTable($feed, /*30, detectActualPage($maxpages),*/ $tag_manager); @@ -152,41 +158,43 @@ if (false === $items) { return "error!!!"; } - $return = sprintf(" <form action=\"$PHP_SELF\" method=\"post\">"); - $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")); + $return = sprintf(" <form action=\"%s\" method=\"post\">\n", $_SERVER['PHP_SELF']); + $return .= sprintf(" <table summary=\"\">\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", _("Feed List"), _("Site"), _("Tags"), _("Languages")); 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']); + $return .= " <tr>\n"; + + $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 (false === $tag_manager->hasTags($list['feed_url'])) { - $return .= " <td> </td>\n"; + $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]); + $return .= sprintf(" <td><a href=\"./page_show_feed_tag.php?tag=%s\">%s</a></td>\n", $tags[0], $tags[0]); } else { - $return .= " <td>\n"; + $return .= " <td>"; foreach ($tags as $id => $tag) { - $return .= " <a href=\"./page_show_feed_tag.php?tag=$tag\">$tag</a>"; + $return .= "<a href=\"./page_show_feed_tag.php?tag=$tag\">$tag</a>"; if ($id !== (count($tags) - 1)) { $return .= ", "; } - //$main .= "\n"; } - $return .= " </td>\n"; + $return .= "</td>\n"; } } - $return .= sprintf(" <td><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . - " </tr>\n", $list['site_lang'], $list['site_lang']); + $return .= sprintf(" <td><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . + " </tr>\n", $list['site_lang'], $list['site_lang']); } - $return .= " </table>"; + $return .= " </table>\n </form>"; return $return; } Modified: trunk/page_show_feed.php =================================================================== --- trunk/page_show_feed.php 2006-12-30 09:06:45 UTC (rev 82) +++ trunk/page_show_feed.php 2007-01-02 14:56:03 UTC (rev 83) @@ -112,11 +112,15 @@ $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation -$navigation = sprintf(" <span class=\"doNotDisplay\">Navigation:</span>\n <a href=\"./page_main.php\">%s</a> |\n <a href=\"./page_show_feeds.php\" class=\"highlight\">%s</a> |\n <a href=\"./page_search.php\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Search"), _("Show TAGs"), _("About")); +$navigation = sprintf(" <a href=\"./page_main.php\" class=\"highlight\">%s</a> |\n" . +" <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . +" <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . +" <a href=\"./page_add_new_feed.php\">%s</a> |\n" . +" <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); if (false === HTTP_Session :: get("logged_in", false)) { $navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register")); } else { - $navigation .= sprintf(" <a href=\"./page_profile.php\">%s</a>", _("Profile")); + $navigation .= sprintf(" <a href=\"./page_personal.php\">%s</a> |\n <a href=\"./page_logout.php?returnto=page_main.php\">%s</a>", _("Personal Page"), _("LogOut")); } $design = str_replace("<!-- navigation -->", $navigation, $design); @@ -137,7 +141,7 @@ $rightSideBar = sprintf(" <p class=\"sideBarTitle\">%s</p>\n\n <div class=\"sideBarText\"><strong>%s</strong><br />\n", _("Tags"), $feedinfo['feed_name']); $tags = $tag_manager->getTags($_GET['feed']); if (false == $tags) { -$rightSideBar .= sprintf("%s <a href=\"./page_add_tag.php?feed=%s\">%s</a>", _("No tag submitted yet, you can add one "), $_GET['feed'], _("here!")); + $rightSideBar .= sprintf("%s <a href=\"./page_add_tag.php?feed=%s\">%s</a>", _("No tag submitted yet, you can add one "), $_GET['feed'], _("here!")); } else { foreach ($tags as $tag) { $rightSideBar .= sprintf(" <a href=\"./page_show_feed_tag.php?tag=%s\">%s</a>, \n", $tag, $tag); Modified: trunk/page_show_feed_tag.php =================================================================== --- trunk/page_show_feed_tag.php 2006-12-30 09:06:45 UTC (rev 82) +++ trunk/page_show_feed_tag.php 2007-01-02 14:56:03 UTC (rev 83) @@ -75,10 +75,11 @@ // // Now we're going to replace the placeholders in the template with the important content // -$_GET['tag'] = "heise"; if (!isset ($_GET['tag'])) { - //HTTP :: redirect("./page_show_all_feeds.php"); + $form = displaySearchForm(); + $main = sprintf(" <p class=\"space\">%s</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); } @@ -120,16 +121,13 @@ } $design = str_replace("<!-- navigation -->", $navigation, $design); -/* - * At this point we have to decide wether we display only one Feed or some more, perhaps loaded and movable by AJAX... - */ # Main copy // main $design = str_replace("<!-- main -->", $main, $design); -// page-navigation -//$page_navigation = displayPageNavi($maxpages, detectActualPage($maxpages), $_GET['feed']); -//$design = str_replace("<!-- page-navigation -->", $page_navigation, $design); +# sideBar +// rightSideBar +$design = str_replace("<!-- rightSideBar -->", $form, $design); # footer // footer @@ -143,29 +141,21 @@ if (false === $feeds) { return "error!!!"; } - $return = sprintf(" <p class=\"tagname\">%s</p>\n", $_GET['tag']); - $return .= sprintf(" <table summary=\"%s\">\n" . - " <tr>\n" . - " <th>%s</th>\n" . - " <th><img src=\"./pic/lang/International.gif\" alt=\"%s\" /></th>\n" . - " </tr>\n", $tag, _("Feed"), _("Language")); + $return = sprintf(" <p class=\"tagname\">%s</p>\n", $_GET['tag']); + $return .= sprintf(" <table summary=\"%s\">\n" . + " <tr>\n" . + " <th>%s</th>\n" . + " <th><img src=\"./pic/lang/International.gif\" alt=\"%s\" /></th>\n" . + " </tr>\n", $tag, _("Feed"), _("Language")); $feeds = $feed_manager->getSpecFeeds($feeds); - for($i = 0; $i < count($feeds); $i++) { - $return .= sprintf(" <tr>\n" . - " <td><a id=\"n%d\" href=\"./page_show_feed.php?feed=%s\">%s</a></td>\n" . - " <td><img src=\"./pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . - " </tr>\n", $feeds[$i]['id'], $feeds[$i]['feed_url'], $feeds[$i]['feed_name'], $feeds[$i]['feed_lang'], $feeds[$i]['feed_lang']); - + for ($i = 0; $i < count($feeds); $i++) { + $return .= sprintf(" <tr>\n" . + " <td><a id=\"n%d\" href=\"./page_show_feed.php?feed=%s\">%s</a></td>\n" . + " <td><img src=\"./pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . + " </tr>\n", $feeds[$i]['id'], $feeds[$i]['feed_url'], $feeds[$i]['feed_name'], $feeds[$i]['feed_lang'], $feeds[$i]['feed_lang']); + } - /* - for ($i = count($feeds) - 1; $i >= 0; $i--) { - //foreach ($items as $list) { - $return .= sprintf(" <tr>\n" . - " <td><a id=\"n%d\" href=\"%s\">%s</a></td>\n" . - " </tr>\n", $feeds[$i]['id'], $feeds[$i]['url'], $feeds[$i]['title'], $feeds[$i]['summary']); - } -*/ - $return .= " </table>"; + $return .= " </table>"; return $return; } @@ -183,30 +173,22 @@ return $number; } -function displayPageNavi($maxpages, $page, $feedname) { - $return = _("Page: "); - for ($i = 1; $i <= $maxpages; $i++) { - if ($i !== 1) { - $return .= " | "; - } - if ($i !== $page) { - $return .= sprintf(" [<a href=\"./page_show_feed.php?feed=%s&page=%d\">%d</a>]", $feedname, $i, $i); - } else { - $return .= sprintf(" [%d]", $i); - } - } - return $return; -} +function displaySearchForm() { -function detectActualPage($maxpages) { - if (!isset ($_GET['page'])) { - return 1; - } - if ($maxpages < $_GET['page']) { - return $maxpages; - } - $page = $_GET['page']; - settype($page, 'int'); - return $page; + $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_all_feeds.tpl =================================================================== --- trunk/styles/default/page_show_all_feeds.tpl 2006-12-30 09:06:45 UTC (rev 82) +++ trunk/styles/default/page_show_all_feeds.tpl 2007-01-02 14:56:03 UTC (rev 83) @@ -32,6 +32,7 @@ <div class="headerLogin"> <!-- midHeader title right --> + </div> </div> <div class="subHeader"> Modified: trunk/styles/default/page_show_feed_tag-screen.css =================================================================== --- trunk/styles/default/page_show_feed_tag-screen.css 2006-12-30 09:06:45 UTC (rev 82) +++ trunk/styles/default/page_show_feed_tag-screen.css 2007-01-02 14:56:03 UTC (rev 83) @@ -187,6 +187,58 @@ background-color: transparent; text-decoration: none; } + +/* ##### Right Side Bar ##### */ + +.rightSideBar { + width: 13em; + margin: 2ex 0.75ex 0 0; + padding: 0; + float: right; + clear: right; + border: 1px solid rgb(216,210,195); +} + +[class~="rightSideBar"] { + margin-right: 1.5ex; +} + +.rightSideBar .sideBarTitle { + color: black; + background-color: rgb(230,223,207); + font-weight: bold; + margin: 1.25ex 1ex; + padding: 0.9ex 1ex; +} + +.rightSideBar a { + color: rgb(166,140,83); + background-color: transparent; + text-decoration: underline; + font-weight: bold; +} + +.rightSideBar a:hover { + text-decoration: none; +} + +.rightSideBar .sideBarText { + line-height: 1.5em; + margin: 0; + padding: 0 2ex 1em 2ex; +} + +.rightSideBar .more { + text-decoration: none; + text-align: right; + margin: 0; + padding: 0 2ex 1em 2ex; + display: block; +} + +.rightSideBar .more:hover { + text-decoration: underline; +} /* ##### Main Copy ##### */ Modified: trunk/styles/default/page_show_feed_tag.tpl =================================================================== --- trunk/styles/default/page_show_feed_tag.tpl 2006-12-30 09:06:45 UTC (rev 82) +++ trunk/styles/default/page_show_feed_tag.tpl 2007-01-02 14:56:03 UTC (rev 83) @@ -44,11 +44,10 @@ <!-- ##### Main Copy ##### --> <div id="main-copy"> -<!-- main --> - - <div id="page-navigation"> -<!-- page-navigation --> + <div class="rightSideBar"> +<!-- rightSideBar --> </div> +<!-- main --> </div> Modified: trunk/update_feeds.php =================================================================== --- trunk/update_feeds.php 2006-12-30 09:06:45 UTC (rev 82) +++ trunk/update_feeds.php 2007-01-02 14:56:03 UTC (rev 83) @@ -96,6 +96,7 @@ } $log->log(sprintf(_("We have got %d feeds in the database"), $nummberoffeeds), PEAR_LOG_NOTICE); $added_overall = 0; + echo $conf['error_prepend'] . "-----------------------------------------------------" . $conf['error_append'] . $conf['linebreak']; ########################## # Starting the main part # ########################## @@ -194,7 +195,7 @@ $log->log(_("The script is not allowed to update the feeds.<br />" . "This means that the feeds won't be updated, the lists are not up to date"), PEAR_LOG_WARNING); } -echo $conf['error_prepend'] . "-----------------------------------------------------" . $conf['error_append'] . $conf['linebreak']; +echo $conf['error_prepend'] . "=====================================================" . $conf['error_append'] . $conf['linebreak']; $log->log(sprintf("Added %d items", $added_overall), PEAR_LOG_NOTICE); $db->disconnect(); $log->log(_("Disconnected from the Database"), PEAR_LOG_NOTICE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-02 15:00:45
|
Revision: 84 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=84&view=rev Author: c167 Date: 2007-01-02 06:56:44 -0800 (Tue, 02 Jan 2007) Log Message: ----------- Removed Paths: ------------- trunk/styles/default/page_main-print.css trunk/styles/default/page_main-screen-alt.css Deleted: trunk/styles/default/page_main-print.css =================================================================== --- trunk/styles/default/page_main-print.css 2007-01-02 14:56:03 UTC (rev 83) +++ trunk/styles/default/page_main-print.css 2007-01-02 14:56:44 UTC (rev 84) @@ -1,225 +0,0 @@ -/********************************************* - * TITLE: Main Page Print Stylesheet * - * URI : styles/default/page_main-print.css * - * MODIF: 2006-Nov-11 23:09 +0100 * - *********************************************/ - - -/* ##### Common Styles ##### */ - -body { - color: black; - background-color: white; - font-family: "times new roman", times, roman, serif; - font-size: 12pt; - margin: 0; - padding: 0; -} - -acronym, .titleTip { - font-style: italic; - border-bottom: none; -} - -acronym:after, .titleTip:after { /* Prints titles after the acronyms/titletips. Doesn't work in MSIE */ - content: "(" attr(title) ")"; - font-size: 90%; - font-style: normal; - padding-left: 1ex; -} - -a { - color: black; - background-color: transparent; - text-decoration: none; -} - -a[href]:after { /* Prints the links' URIs after the links' texts. Doesn't work in MSIE */ - content: "<" attr(href) ">"; - font-size: 90%; - padding-left: 1ex; -} - -ol { - margin: -0.25em 0 1em 0; - padding: 0; -} - -ul { - list-style-type: square; - margin: -0.25em 0 1em 0; - padding: 0; -} - -dl { - margin: 0 0 1em 0; - padding: 0; -} - -ul li { - margin: 1ex 0 0 1.5em; - padding: 0; -} - -ol li { - margin: 1ex 0 0 1.5em; - padding: 0; -} - -dt { - font-weight: bold; - margin: 0; - padding: 0; -} - -dd { - margin: 0 0 0 1.5em; - padding: 0; -} - -.doNotPrint { - display: none; -} - - -/* ##### Header ##### */ - -#header { -} - -.superHeader { - display: none; -} - -.midHeader { - color: black; - background-color: transparent; - margin: 0; - padding: 0; - border-bottom: 1px solid black; -} - -.headerTitle { - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - font-weight: normal; - margin: 0; - padding: 0; -} - -.headerSubTitle { - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 110%; - font-weight: normal; - font-style: italic; - margin: 0; - padding: 0 0 1ex 0; -} - -.headerLinks { - display: none; -} - -.subHeader { - display: none; -} - - -/* ##### Side Menu ##### */ - -#side-bar { - display: none !important; -} - - -/* ##### Main Copy ##### */ - -#main-copy { - text-align: justify; - margin: 0 !important; - padding: 0; -} - -#main-copy h1 { - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 120%; - margin: 2ex 0 1ex 0; - padding: 0; -} - -#main-copy h2 { - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-weight: normal; - font-size: 100%; - margin: 0; - padding: 2ex 0 0.5ex 0; -} - -#main-copy h1 + h2 { - padding-top: 0; -} - -#main-copy p { - margin: 0 0 2ex 0; - padding: 0; -} - -h2 a:after { - content: "" !important; -} - -.newsDate { - font-style: italic; - margin: 0; - padding: 0; - display: inline; -} - -.newsDate:before { /* Prints an '[' before the news item's date. Doesn't work in MSIE */ - content: "["; - font-style: normal; -} - -.newsDate:after { /* Prints a ']' after the news item's date. Doesn't work in MSIE */ - content: "]"; - font-style: normal; -} - -.newsSummary { - display: inline; - margin: 0 0 0 1ex !important; - padding: 0; -} - -.more { - display: none; -} - -.smallCaps { - font-variant: small-caps; -} - -.quarter, .oneThird, .half, .twoThirds, .fullWidth { - margin: 0; - padding: 0; -} - - -/* ##### Footer ##### */ - -#footer { - color: black; - background-color: transparent; - font-size: 100%; - text-align: center; - margin: 2em 0 0 0; - padding: 1ex 0 0 0; - border-top: 1px solid black; - display: block; -} - -#footer a { - color: black; - background-color: transparent; - text-decoration: none; -} \ No newline at end of file Deleted: trunk/styles/default/page_main-screen-alt.css =================================================================== --- trunk/styles/default/page_main-screen-alt.css 2007-01-02 14:56:03 UTC (rev 83) +++ trunk/styles/default/page_main-screen-alt.css 2007-01-02 14:56:44 UTC (rev 84) @@ -1,342 +0,0 @@ -/************************************************** - * TITLE: Main Page Print Stylesheet * - * URI : styles/default/page_main-screen-alt.css * - * MODIF: 2006-Nov-11 23:09 +0100 * - **************************************************/ - - -/* ##### Common Styles ##### */ - -body { - font-family: verdana, helvetica, arial, sans-serif; - font-size: 73%; /* Enables font size scaling in MSIE */ - margin: 0; - padding: 0; -} - -html > body { - font-size: 9pt; -} - -acronym, .titleTip { - border-bottom: 1px dotted rgb(61,92,122); - cursor: help; - margin: 0; - padding: 0 0 0.4px 0; -} - -a { - color: rgb(61,92,122); - background-color: transparent; - text-decoration: underline; - margin: 0; - padding: 0 1px 2px 1px; -} - -a:hover { - color: rgb(117,144,174); - text-decoration: none; -} - -ol { - margin: 1em 0 1.5em 0; - padding: 0; -} - -ul { - list-style-type: square; - margin: 1em 0 1.5em 0; - padding: 0; -} - -dl { - margin: 1em 0 0.5em 0; - padding: 0; -} - -ul li { - line-height: 1.5em; - margin: 1.25ex 0 0 1.5em; - padding: 0; -} - -ol li { - line-height: 1.5em; - margin: 1.25ex 0 0 2em; - padding: 0; -} - -dt { - font-weight: bold; - margin: 0; - padding: 0 0 1ex 0; -} - -dd { - line-height: 1.75em; - margin: 0 0 1.5em 1.5em; - padding: 0; -} - -.doNotDisplay { - display: none !important; -} - - -.smallCaps { - font-size: 117%; - font-variant: small-caps; -} - - -/* ##### Header ##### */ - -.superHeader { - color: rgb(130,128,154); - background-color: rgb(33,50,66); - text-align: right; - margin: 0; - padding: 0.5ex 10px; -} - -.superHeader span { - color: rgb(195,196,210); - background-color: transparent; - font-weight: bold; - text-transform: uppercase; -} - -.superHeader a { - color: rgb(195,196,210); - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.superHeader a:hover { - color: rgb(193,102,90); - background-color: transparent; - text-decoration: none; -} - -.midHeader { - color: white; - background-color: rgb(61,92,122); - margin: 0; - padding: 0.26ex 10px; -} - -.headerTitle { - font-size: 300%; - margin: 0; - padding: 0; -} - -.headerSubTitle { - font-size: 151%; - font-weight: normal; - font-style: italic; - margin: 0 0 1ex 0; - padding: 0; -} - -.headerLinks { - text-align: right; - margin: 0; - padding: 0 0 2ex 0; - position: absolute; - right: 1.5em; - top: 3.5em; -} - -.headerLinks a { - color: white; - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0 0.5ex 0; - display: block; -} - -.headerLinks a:hover { - color: rgb(195,196,210); - background-color: transparent; - text-decoration: underline; -} - -.subHeader { - color: white; - background-color: rgb(117,144,174); - margin: 0; - padding: 0.5ex 10px; -} - -.subHeader a, .subHeader .highlight { - color: white; - background-color: transparent; - font-size: 110%; - font-weight: bold; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.subHeader a:hover, .subHeader .highlight { - color: rgb(255,204,0); - background-color: transparent; - text-decoration: none; -} - - -/* ##### Side Menu ##### */ - -#side-bar { - color: rgb(204,204,204); - background-color: transparent; - list-style-type: square; - list-style-position: inside; - width: 10em; - margin: 0; - padding: 1ex 0; - border: 1px solid rgb(204,204,204); - position: absolute; - left: 1.5ex; - top: 12em; -} - -[id="side-bar"] { - position: fixed !important; /* Makes the side menu scroll with the page. Doesn't work in MSIE */ -} - -#side-bar a { - text-decoration: none; -} - -#side-bar:hover { - color: rgb(117,144,174); - background-color: transparent; - border-color: rgb(117,144,174); -} - -#side-bar li { - margin: 0; - padding: 0.75ex 0 1ex 1.75ex; -} - -#side-bar li:hover { - color: rgb(61,92,122); - background-color: transparent; -} - - -#side-bar li a:hover { - text-decoration: underline; -} - - -/* ##### Main Copy ##### */ - -#main-copy { - text-align: justify; - margin: -0.5ex 1em 1em 12.5em; - padding: 0.5em 10px; - clear: left; -} - -#main-copy h1 { - color: rgb(117,144,174); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 186%; - margin: 0; - padding: 1.5ex 0 0 0; -} - -#main-copy h2 { - color: rgb(61,92,122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-weight: normal; - font-size: 151%; - margin: 0; - padding: 1ex 0 0 0; -} - -#main-copy p { - line-height: 1.75em; - margin: 1em 0 1.5em 0; - padding: 0; -} - -.newsHeading { - color: rgb(61,92,122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 145%; - text-decoration: none; - margin: 0; - padding: 1ex 0 0 0; - display: block; -} - -.newsHeading:hover { - color: rgb(117,144,174); - background-color: transparent; - text-decoration: underline; -} - -.newsDate { - font-style: italic; - margin: 0 !important; - padding: 0; -} - -.newsSummary { - margin: 1.5ex 0 2.5ex 0.75ex !important; - padding: 0; -} - -.more { - text-align: right; - margin: 0; - padding: 0.5em 0; -} - -.more a { - color: rgb(61,92,122); - background-color: transparent; - font-size: 92%; - text-decoration: underline; - margin: 0; - padding: 0.25ex 0.75ex; -} - -.more a:hover { - color: rgb(117,144,174); - text-decoration: none; -} - - -/* ##### Footer ##### */ - -#footer { - color: rgb(51,51,102); - background-color: rgb(239,239,239); - font-size: 87%; - text-align: center; - line-height: 1.25em; - margin: 2em 0 0 0; - padding: 1ex 10px; - clear: left; -} - -#footer a { - color: rgb(0,68,204); - background-color: transparent; - text-decoration: underline; -} - -#footer a:hover { - text-decoration: none; -} \ 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-02 15:00:45
|
Revision: 85 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=85&view=rev Author: c167 Date: 2007-01-02 06:57:23 -0800 (Tue, 02 Jan 2007) Log Message: ----------- added Added Paths: ----------- trunk/page_logout.php Added: trunk/page_logout.php =================================================================== --- trunk/page_logout.php (rev 0) +++ trunk/page_logout.php 2007-01-02 14:57:23 UTC (rev 85) @@ -0,0 +1,78 @@ +<?php + + +/** + * Created on 29.12.2006 + * + * + * @author C167 <c1...@us...> + */ +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); + +########### +# 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']); + +############## +# HTTP-Class # +############## +require_once "HTTP.php"; + +################ +# User-Manager # +################ +require_once "class/User_manager.php"; +$user = new User_manager($db); + +################### +# WORKING CONTENT # +################### +if (true === HTTP_Session :: isNew()) { + HTTP_Session :: set("logged_in", false); + HTTP :: redirect("./page_login.php"); +} +$user->logOut(); +if (isset ($_GET['returnto']) and true === in_array(basename($_GET['returnto']), $validPages)) { + HTTP_Session :: set("logged_in", false); + HTTP :: redirect("./" . $_GET['returnto']); + die(); +} else { + HTTP_Session :: set("logged_in", false); + HTTP :: redirect("./page_main.php"); + die(); +} +?> \ 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...> - 2006-12-30 09:06:45
|
Revision: 82 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=82&view=rev Author: c167 Date: 2006-12-30 01:06:45 -0800 (Sat, 30 Dec 2006) Log Message: ----------- some changes Modified Paths: -------------- trunk/class/User_manager.php trunk/inc/config.php trunk/page_main.php trunk/page_personal.php trunk/page_register.php Modified: trunk/class/User_manager.php =================================================================== --- trunk/class/User_manager.php 2006-12-28 21:20:31 UTC (rev 81) +++ trunk/class/User_manager.php 2006-12-30 09:06:45 UTC (rev 82) @@ -58,6 +58,12 @@ protected $username = null; /** + * The users language + * @access protected + */ + protected $language = null; + + /** * The standard-constructor * * @param Object $db The PEAR::MDB2 @@ -129,14 +135,45 @@ * @return boolean * @access public */ - public function createUser($username, $email, $passwd, $timezone) { - $add = $this->mdb5->query(sprintf("INSERT INTO `users` (`ID`, `name`, `email`, `pass`, `timezone`, `state`) " . - "VALUES (null, `%s`, `%s`, `%s`, `%s`, `regged`);", $username, $email, $passwd, $timezone)); + public function reg_registrateUser($username, $email, $passwd, $language) { + $add = $this->mdb5->query(sprintf("INSERT INTO `users` (`ID`, `name`, `email`, `pass`, `language`, `state`) " . + "VALUES (null, `%s`, `%s`, `%s`, `%s`, `regged`);", $username, $email, $passwd, $language)); if (PEAR :: isError($add)) { return false; } return true; } + + /** + * Checks if the passwords a new user enters are totaly equal + * @param String $passwd1 The first password + * @param String $passwd2 The second password + * @return boolean + * @access public + */ + public function reg_checkPasswordEquality($passwd1, $passwd2) { + if(strlen($passwd1) == strlen($passwd2)) { + if($passwd1 === $passwd2) { + return true; + } + return false; + } else { + return false; + } + } + + /** + * Encryptes the password. if it gets passwords already enrypted, it returns them + * @param String $passwd The password password + * @return Mixed + * @access public + */ + public function reg_encryptPassword ($passwd) { + if(strlen($passwd) == 32) { + return array('pass' => $passwd, 'encrypted' => false); + } + return array('pass' => md5($passwd), 'encrypted' => true); + } /** * Returns the number of users from the db @@ -226,10 +263,22 @@ return false; } if(is_null($this->username)) { - $this->username = $this->mdb2->queryOne("SELECT name FROM users WHERE id = $this->uid"); + $this->username = $this->mdb2->queryOne("SELECT name FROM users WHERE id = ".$this->uid.";"); } return $this->username; } + + /** + * Returns the users language + * @return String + * @access public + */ + public function getUserLanguage() { + if(is_null($this->language)) { + $this->language = $this->mdb->queryOne(sprintf("SELECT language FROM users WHERE id = '%s';", $this->uid)); + } + return $This->language; + } } ?> \ No newline at end of file Modified: trunk/inc/config.php =================================================================== --- trunk/inc/config.php 2006-12-28 21:20:31 UTC (rev 81) +++ trunk/inc/config.php 2006-12-30 09:06:45 UTC (rev 82) @@ -39,10 +39,8 @@ $validPages[] = "page_faq.php"; // Languages -$langs["de_DE"] = "de_DE"; -$langs["de_DE"] = "de"; -$langs["en_EN"] = "en_EN"; -$langs["en_EN"] = "en"; +$langs[] = "de_DE"; +$langs[] = "en_EN"; /* * AUTO-CONFIGURATION Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2006-12-28 21:20:31 UTC (rev 81) +++ trunk/page_main.php 2006-12-30 09:06:45 UTC (rev 82) @@ -61,11 +61,10 @@ require_once "class/Feed_manager.php"; $feed = new Feed_manager($db); -############ -# LANGUAGE # -############ +############## +# HTTP-BASIS # +############## require_once "HTTP.php"; -$language = HTTP::negotiateLanguage($langs, "en_EN"); ################ # User-Manager # @@ -73,6 +72,21 @@ require_once "class/User_manager.php"; $user = new User_manager($db); +############ +# LANGUAGE # +############ +if (true === HTTP_Session :: get("logged_in", false)) { + $language = $user->getUserLanguage(); + if(!in_array($language, $langs)) { + $language = "en_EN"; + } +} else { + $language = HTTP :: negotiateLanguage($langs, "en_EN"); +} + +bindtextdomain("page_main", dirname($_SERVER['SCRIPT_FILENAME'])."i18n"); +setlocale(LC_ALL, $language); + $page = "main"; // // Now we're going to replace the placeholders in the template with the important content @@ -111,21 +125,20 @@ // navigation $navigation = sprintf(" <a href=\"./page_main.php\" class=\"highlight\">%s</a> |\n" . - " <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . - " <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . - " <a href=\"./page_add_new_feed.php\">%s</a> |\n" . - " <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); +" <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . +" <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . +" <a href=\"./page_add_new_feed.php\">%s</a> |\n" . +" <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); if (false === HTTP_Session :: get("logged_in", false)) { $navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register")); } else { - $navigation .= sprintf(" <a href=\"./page_personal.php\">%s</a> |\n <a href=\"./page_logout.php\">%s</a>", _("Personal Page"), _("LogOut")); + $navigation .= sprintf(" <a href=\"./page_personal.php\">%s</a> |\n <a href=\"./page_logout.php?returnto=page_main.php\">%s</a>", _("Personal Page"), _("LogOut")); } $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" . +$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" . @@ -145,13 +158,13 @@ echo $latestnews->getMessage(); } $latest_news = sprintf(" <h1>%s</h1>\n", _("Latest News")); -while($news = $latestnews->fetchRow()) { -$latest_news .= sprintf(" <a href=\"./page_news.php?newsid=%d\" class=\"newsHeading\">%s</a>\n" . +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.= 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 »")); +$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 »")); $design = str_replace("<!-- latest news -->", $latest_news, $design); @@ -166,7 +179,7 @@ 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"; +$box_2 .= " </ul>\n"; $design = str_replace("<!-- box 2 -->", $box_2, $design); // box 3 Modified: trunk/page_personal.php =================================================================== --- trunk/page_personal.php 2006-12-28 21:20:31 UTC (rev 81) +++ trunk/page_personal.php 2006-12-30 09:06:45 UTC (rev 82) @@ -39,6 +39,11 @@ } $db->setFetchMode(MDB2_FETCHMODE_ASSOC); +######## +# HTTP # +######## +require_once "HTTP.php"; + ########### # SESSION # ########### @@ -53,6 +58,10 @@ HTTP_Session :: setExpire($session['time']['expire']); HTTP_Session :: setIdle($session['time']['idle']); +if(false === HTTP_Session :: get("logged_in", false)) { + HTTP :: redirect("./page_login.php"); +} + ################ # Feed-Manager # ################ @@ -76,7 +85,7 @@ # Header // title $title = "Feed-Collector"; -if (HTTP_Session :: get("personal_page", true)); +//if (HTTP_Session :: get("personal_page", true)); $design = str_replace("<!-- title -->", $title, $design); // related sites @@ -102,11 +111,15 @@ $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation -$navigation = sprintf(" <span class=\"doNotDisplay\">Navigation:</span>\n <a href=\"./page_main.php\">%s</a> |\n <a href=\"./page_show_feeds.php\" class=\"highlight\">%s</a> |\n <a href=\"./page_search.php\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Search"), _("Show TAGs"), _("About")); +$navigation = sprintf(" <a href=\"./page_main.php\">%s</a> |\n" . + " <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . + " <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . + " <a href=\"./page_add_new_feed.php\">%s</a> |\n" . + " <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); if (false === HTTP_Session :: get("logged_in", false)) { $navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register")); } else { - $navigation .= sprintf(" <a href=\"./page_profile.php\">%s</a>", _("Profile")); + $navigation .= sprintf(" <a href=\"./page_personal.php\" class=\"highlight\">%s</a> |\n <a href=\"./page_logout.php?returnto=page_main.php\">%s</a>", _("Personal Page"), _("LogOut")); } $design = str_replace("<!-- navigation -->", $navigation, $design); Modified: trunk/page_register.php =================================================================== --- trunk/page_register.php 2006-12-28 21:20:31 UTC (rev 81) +++ trunk/page_register.php 2006-12-30 09:06:45 UTC (rev 82) @@ -111,29 +111,27 @@ $main = ""; -if (empty ($_POST['username']) or empty ($_POST['mail']) or empty ($_POST['passwd1']) or empty ($_POST['passwd2'])) { - if (!empty ($_POST['username'])) { - $values['username'] = $_POST['username']; +//if (empty ($_POST['username']) or empty ($_POST['mail']) or empty ($_POST['passwd1']) or empty ($_POST['passwd2'])) { +if (isset ($_POST) and is_array($_POST)) { + if (isset ($_POST['username']) and isset ($_POST['mail']) and isset ($_POST['passwd1']) and isset ($_POST['passwd2']) and isset ($_POST['language'])) { + if (md5($_POST['passwd1']) === md5($_POST['passwd2'])) { + $passwd_checked = checkPassword($_POST['passwd1']); + if ($passwd_checked == FC_PASS_TOO_SHORT) { + buildForm($main, _("Your password is too short, please use min. 7 characters!")); + } else { + + } + } else { + buildForm($main, _("Your passwords are not equal")); + } + if (false === createUser($username, $email, $passwd, $language)) { + + } } else { - $values['username'] = ""; + buildForm($main); } - if (!empty ($_POST['mail'])) { - $values['mail'] = $_POST['mail']; - } else { - $values['mail'] = ""; - } - buildForm($main, $values); - } else { - $username = filterInput($_POST['username'], "username"); - $mail = filterInput($_POST['mail'], "mail"); - if (md5($_POST['passwd1']) === md5($_POST['passwd2'])) { - $passwd_checked = checkPassword($_POST['passwd1']); - if ($passwd_checked == FC_PASS_TOO_SHORT) { - buildForm("too short"); - } - } } $design = str_replace("<!-- main -->", $main, $design); @@ -144,8 +142,11 @@ echo $design; -function buildForm(& $form, $values, $message = null) { +function buildForm(& $form, $message = null) { $form = sprintf(" <h1>%s</h1>\n <p>%s</p>", _("Registration"), _("<b>Why register?</b><br />\n If you register, you'll have a personal page with lots of free space to place your favourite newsfeeds (only limited by your screen)")); + if (!is_null($message)) { + $form .= sprintf(" <h2>%s</h2>\n", $message); + } $form .= sprintf(" <div id=\"registration_form\">\n" . " <form action=\"%s\" method=\"post\" accept-charset=\"UTF-8\">\n" . " <div id=\"formtitle\">%s</div>\n" . @@ -158,8 +159,8 @@ " <div class=\"formElem\">%s</div>\n" . " </div>\n" . " <div id=\"right\">\n" . - " <div class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" value=\"%s\" /></div>\n" . - " <div class=\"formField\"><input type=\"text\" name=\"mail\" size=\"30\" maxlength=\"30\" value=\"%s\" /></div>\n" . + " <div class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></div>\n" . + " <div class=\"formField\"><input type=\"text\" name=\"mail\" size=\"30\" maxlength=\"30\" /></div>\n" . " <div class=\"formField\"><input type=\"text\" name=\"passwd1\" size=\"30\" maxlength=\"30\" /></div>\n" . " <div class=\"formField\"><input type=\"text\" name=\"passwd2\" size=\"30\" maxlength=\"30\" /></div>\n" . " <div class=\"formField\"><input type=\"text\" name=\"option_list1\" size=\"30\" maxlength=\"30\" /></div>\n" . @@ -171,7 +172,7 @@ " </div>\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"), _("opt1"), _("opt2"), $values['username'], $values['mail'], _("Submit!"), _("Reset!")); + " </div>\n", $_SERVER['PHP_SELF'], _("Registration information"), _("Username"), _("E-MAIL-address"), _("Password"), _("Repeat password"), _("opt1"), _("opt2"), _("Submit!"), _("Reset!")); } function checkPassword($pass) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2006-12-28 21:20:32
|
Revision: 81 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=81&view=rev Author: c167 Date: 2006-12-28 13:20:31 -0800 (Thu, 28 Dec 2006) Log Message: ----------- some changes Modified Paths: -------------- trunk/class/Feed_manager.php trunk/class/Tag_manager.php trunk/page_main.php trunk/page_show_feed_tag.php trunk/styles/default/page_register-screen.css Modified: trunk/class/Feed_manager.php =================================================================== --- trunk/class/Feed_manager.php 2006-12-27 23:24:04 UTC (rev 80) +++ trunk/class/Feed_manager.php 2006-12-28 21:20:31 UTC (rev 81) @@ -217,19 +217,17 @@ public function getSpecFeeds($feed) { $i = 0; foreach ($feed as $oneFeed) { - $query = $this->mdb->query("SELECT id, feed_name, feed_db_name, feed_lang FROM feeds GROUP BY feed_name ASC;"); + $query = $this->mdb->query("SELECT id, feed_name, feed_db_name, feed_lang FROM feeds WHERE feed_db_name = '$oneFeed';"); if (PEAR :: isError($query)) { - return false; + continue; } - while ($row = $query->fetchRow()) { - $return[$i]['id'] = $row['id']; - $return[$i]['feed_name'] = $row['feed_name']; - $return[$i]['feed_url'] = $row['feed_db_name']; - $return[$i]['feed_lang'] = $row['feed_lang']; - $i++; - } + $row = $query->fetchRow(); + $return[$i]['id'] = $row['id']; + $return[$i]['feed_name'] = $row['feed_name']; + $return[$i]['feed_url'] = $row['feed_db_name']; + $return[$i]['feed_lang'] = $row['feed_lang']; + $i++; } - return $return; } Modified: trunk/class/Tag_manager.php =================================================================== --- trunk/class/Tag_manager.php 2006-12-27 23:24:04 UTC (rev 80) +++ trunk/class/Tag_manager.php 2006-12-28 21:20:31 UTC (rev 81) @@ -94,7 +94,7 @@ * @access public */ public function getFeedsByTag($tag) { - $query = $this->db->query("SELECT feed FROM tags WHERE tag = '$tag';"); + $query = $this->db->query(sprintf("SELECT feed FROM tags WHERE tag = '%s';", $tag)); if (PEAR :: isError($query)) { return false; } Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2006-12-27 23:24:04 UTC (rev 80) +++ trunk/page_main.php 2006-12-28 21:20:31 UTC (rev 81) @@ -110,7 +110,11 @@ $design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation -$navigation = sprintf(" <a href=\"./page_main.php\" class=\"highlight\">%s</a> |\n <a href=\"./page_show_feeds.php\">%s</a> |\n <a href=\"./page_search.php\">%s</a> |\n <a href=\"./page_show_all_feeds.php\">%s</a> |\n <a href=\"./page_show_feed_tag.php\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Search"), _("Select a Feed"), _("TABs")); +$navigation = sprintf(" <a href=\"./page_main.php\" class=\"highlight\">%s</a> |\n" . + " <a href=\"./page_show_all_feeds.php\">%s</a> |\n" . + " <a href=\"./page_show_feed_tag.php\">%s</a> |\n" . + " <a href=\"./page_add_new_feed.php\">%s</a> |\n" . + " <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs")); if (false === HTTP_Session :: get("logged_in", false)) { $navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register")); } else { Modified: trunk/page_show_feed_tag.php =================================================================== --- trunk/page_show_feed_tag.php 2006-12-27 23:24:04 UTC (rev 80) +++ trunk/page_show_feed_tag.php 2006-12-28 21:20:31 UTC (rev 81) @@ -143,15 +143,16 @@ if (false === $feeds) { return "error!!!"; } - $return = sprintf(" <table summary=\"%s\">\n" . + $return = sprintf(" <p class=\"tagname\">%s</p>\n", $_GET['tag']); + $return .= sprintf(" <table summary=\"%s\">\n" . " <tr>\n" . " <th>%s</th>\n" . - " <th><img src=\"./pic/lang/International.gif\" alt=\"\" /></th>\n" . - " </tr>\n", $tag, _("Feed")); + " <th><img src=\"./pic/lang/International.gif\" alt=\"%s\" /></th>\n" . + " </tr>\n", $tag, _("Feed"), _("Language")); $feeds = $feed_manager->getSpecFeeds($feeds); for($i = 0; $i < count($feeds); $i++) { $return .= sprintf(" <tr>\n" . - " <td><a id=\"n%d\" href=\"%s\">%s</a></td>\n" . + " <td><a id=\"n%d\" href=\"./page_show_feed.php?feed=%s\">%s</a></td>\n" . " <td><img src=\"./pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . " </tr>\n", $feeds[$i]['id'], $feeds[$i]['feed_url'], $feeds[$i]['feed_name'], $feeds[$i]['feed_lang'], $feeds[$i]['feed_lang']); Modified: trunk/styles/default/page_register-screen.css =================================================================== --- trunk/styles/default/page_register-screen.css 2006-12-27 23:24:04 UTC (rev 80) +++ trunk/styles/default/page_register-screen.css 2006-12-28 21:20:31 UTC (rev 81) @@ -215,7 +215,10 @@ } #registration_form { - margin: 1em 0; + /*margin: 1em 0;*/ + margin-top: 1em; + margin-left: 10%; + margin-right: 10%; float: left; border: 1px solid rgb(204, 204, 204); } @@ -232,42 +235,48 @@ } #left,#right { - margin: 3em 0; + margin: 1em 0; + margin-top: 0em; /* padding: 0 2%;*/ float: left; - width: 45%; } #left { + width: 45%; border-right: 1px solid rgb(204, 204, 204); } #right { - + width: 45%; } .formElem,.formField { - margin: 1em 0; + /*margin: 1em 0;*/ + padding-top: 1em; + padding-left: 1em; } .formElem { border-bottom: 1px solid rgb(204, 204, 204); + padding-top: 7%; } .formField { border-bottom: 1px solid rgb(204, 204, 204); + padding-top: 7%; + } #registration_form #formButtons { text-align: center; background-color: rgb(117, 144, 174); - margin: 0; + margin-top: 16em; padding: 1ex 10px; border-top: 1px solid rgb(204, 204, 204); } .quarter,.oneThird,.half,.twoThirds,.fullWidth { - margin: 1em 0; + /*margin: 1em 0;*/ float: left; border-left: 1px solid rgb(204, 204, 204); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2006-12-27 23:24:04
|
Revision: 80 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=80&view=rev Author: c167 Date: 2006-12-27 15:24:04 -0800 (Wed, 27 Dec 2006) Log Message: ----------- page_show_feed_tag.php working now Modified Paths: -------------- trunk/class/Feed_manager.php trunk/page_show_feed_tag.php Modified: trunk/class/Feed_manager.php =================================================================== --- trunk/class/Feed_manager.php 2006-12-27 10:56:35 UTC (rev 79) +++ trunk/class/Feed_manager.php 2006-12-27 23:24:04 UTC (rev 80) @@ -209,24 +209,27 @@ } /** - * Get one specific feed - * @param String $feed The feeds name + * Get all feeds from an array + * @param Array $feed The feed names * @return Mixed * @access public */ - public function getSpecFeed($feed) { - $query = $this->mdb->query("SELECT id, site_name, site_url, site_lang, feed_name, feed_db_name FROM feeds GROUP BY feed_name ASC;"); - if (PEAR :: isError($query)) { - return false; + public function getSpecFeeds($feed) { + $i = 0; + foreach ($feed as $oneFeed) { + $query = $this->mdb->query("SELECT id, feed_name, feed_db_name, feed_lang FROM feeds GROUP BY feed_name ASC;"); + if (PEAR :: isError($query)) { + return false; + } + while ($row = $query->fetchRow()) { + $return[$i]['id'] = $row['id']; + $return[$i]['feed_name'] = $row['feed_name']; + $return[$i]['feed_url'] = $row['feed_db_name']; + $return[$i]['feed_lang'] = $row['feed_lang']; + $i++; + } } - $row = $query->fetchRow(); - $return['id'] = $row['id']; - $return['site_name'] = $row['site_name']; - $return['site_url'] = $row['site_url']; - $return['site_lang'] = $row['site_lang']; - $return['feed_name'] = $row['feed_name']; - $return['feed_url'] = $row['feed_db_name']; return $return; } Modified: trunk/page_show_feed_tag.php =================================================================== --- trunk/page_show_feed_tag.php 2006-12-27 10:56:35 UTC (rev 79) +++ trunk/page_show_feed_tag.php 2006-12-27 23:24:04 UTC (rev 80) @@ -143,11 +143,17 @@ if (false === $feeds) { return "error!!!"; } - $return = sprintf(" <table summary=\"%s\">\n", $tag); - foreach($feeds as $feed) { + $return = sprintf(" <table summary=\"%s\">\n" . + " <tr>\n" . + " <th>%s</th>\n" . + " <th><img src=\"./pic/lang/International.gif\" alt=\"\" /></th>\n" . + " </tr>\n", $tag, _("Feed")); + $feeds = $feed_manager->getSpecFeeds($feeds); + for($i = 0; $i < count($feeds); $i++) { $return .= sprintf(" <tr>\n" . " <td><a id=\"n%d\" href=\"%s\">%s</a></td>\n" . - " </tr>\n", $feed['id'], $feed['feed_url'], $feeds['feed_name']); + " <td><img src=\"./pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . + " </tr>\n", $feeds[$i]['id'], $feeds[$i]['feed_url'], $feeds[$i]['feed_name'], $feeds[$i]['feed_lang'], $feeds[$i]['feed_lang']); } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2006-12-27 10:56:37
|
Revision: 79 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=79&view=rev Author: c167 Date: 2006-12-27 02:56:35 -0800 (Wed, 27 Dec 2006) Log Message: ----------- some changes Modified Paths: -------------- trunk/class/Feed_manager.php trunk/class/Tag_manager.php trunk/page_add_tag.php trunk/page_show_all_feeds.php trunk/page_show_feed.php Added Paths: ----------- trunk/page_show_feed_tag.php trunk/styles/default/page_show_feed_tag-screen.css trunk/styles/default/page_show_feed_tag.tpl Modified: trunk/class/Feed_manager.php =================================================================== --- trunk/class/Feed_manager.php 2006-12-20 21:46:24 UTC (rev 78) +++ trunk/class/Feed_manager.php 2006-12-27 10:56:35 UTC (rev 79) @@ -187,6 +187,50 @@ } /** + * Get all the feeds + * @return mixed + * @access public + */ + public function getFeeds() { + $query = $this->mdb->query("SELECT site_name, site_url, site_lang, feed_name, feed_db_name FROM feeds GROUP BY feed_name ASC;"); + if (PEAR :: isError($query)) { + return false; + } + $i = 0; + while ($row = $query->fetchRow()) { + $return[$i]['site_name'] = $row['site_name']; + $return[$i]['site_url'] = $row['site_url']; + $return[$i]['site_lang'] = $row['site_lang']; + $return[$i]['feed_name'] = $row['feed_name']; + $return[$i]['feed_url'] = $row['feed_db_name']; + $i++; + } + return $return; + } + + /** + * Get one specific feed + * @param String $feed The feeds name + * @return Mixed + * @access public + */ + public function getSpecFeed($feed) { + $query = $this->mdb->query("SELECT id, site_name, site_url, site_lang, feed_name, feed_db_name FROM feeds GROUP BY feed_name ASC;"); + if (PEAR :: isError($query)) { + return false; + } + + $row = $query->fetchRow(); + $return['id'] = $row['id']; + $return['site_name'] = $row['site_name']; + $return['site_url'] = $row['site_url']; + $return['site_lang'] = $row['site_lang']; + $return['feed_name'] = $row['feed_name']; + $return['feed_url'] = $row['feed_db_name']; + return $return; + } + + /** * Return the number of pages * @param int $count Feeds per Page * @return int @@ -300,11 +344,11 @@ else return $query; } - + ############# # STATISTIC # ############# - + /** * STATISTIC * Return the Number of feeds we have in our database Modified: trunk/class/Tag_manager.php =================================================================== --- trunk/class/Tag_manager.php 2006-12-20 21:46:24 UTC (rev 78) +++ trunk/class/Tag_manager.php 2006-12-27 10:56:35 UTC (rev 79) @@ -43,16 +43,16 @@ */ public function addTag($tag, $by, $feed) { $select = $this->db->queryOne("SELECT `tag` FROM `tags` WHERE tag = '$tag' AND feed = '$feed';"); - if($select == $tag) { + if ($select == $tag) { return false; } $insert = $this->db->query("INSERT INTO `tags` ( `id` , `setBy` , `tag` , `feed` ) VALUES ( NULL , '$by', '$tag', '$feed');"); - if(PEAR :: isError($insert)) { + if (PEAR :: isError($insert)) { return false; } return true; } - + /** * Remove a tag from a feed * @param String $tag The tag itself @@ -61,9 +61,9 @@ * @access public */ public function removeTag($tag, $feed) { - + } - + /** * Get the tags from a feed * @param String $feed The feed name @@ -71,19 +71,22 @@ * @access public */ public function getTags($feed) { + //if(substr($feed, 0, 2) == "f_!") { + // $feed = "f_".$feed; + //} $query = $this->db->query("SELECT tag FROM tags WHERE feed = '$feed';"); - if(PEAR :: isError($query)) { + if (PEAR :: isError($query)) { return false; } - while($row = $query->fetchRow()) { - if(!isset($row['tag'])) { + while ($row = $query->fetchRow()) { + if (!isset ($row['tag'])) { return false; } $return[] = $row['tag']; } return $return; } - + /** * Return all feeds that have a given tag * @param String $tag The tag to search for @@ -92,15 +95,34 @@ */ public function getFeedsByTag($tag) { $query = $this->db->query("SELECT feed FROM tags WHERE tag = '$tag';"); - if(PEAR :: isError($query)) { + if (PEAR :: isError($query)) { return false; } - while($row = $query->fetchRow()) { - + while ($row = $query->fetchRow()) { + $return[] = $row['feed']; } + return $return; } /** + * Checks if a feed has tags + * @param String $feed The name of the feed + * @return boolean + * @access public + */ + public function hasTags($feed) { + $query = $this->db->queryOne("SELECT tag FROM tags WHERE feed='$feed';"); + if (PEAR :: isError($query)) { + return false; + } + if (empty ($query)) { + return false; + } + return true; + + } + + /** * Random number generator * @param Int $max upper end * @param Int $min lower end, default 0 Modified: trunk/page_add_tag.php =================================================================== --- trunk/page_add_tag.php 2006-12-20 21:46:24 UTC (rev 78) +++ trunk/page_add_tag.php 2006-12-27 10:56:35 UTC (rev 79) @@ -34,7 +34,7 @@ ); $db = & MDB2 :: factory($dsn, $options); if (PEAR :: isError($db)) { - + } $db->setFetchMode(MDB2_FETCHMODE_ASSOC); @@ -64,18 +64,49 @@ ############## require_once "HTTP.php"; +############### +# Tag-Manager # +############### +require_once "class/Tag_manager.php"; +$tag_manager = new Tag_Manager($db); + ################ # 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"); } -*/ +$main = ""; + if (!$tag_manager->hasTags($_GET['feed'])) { + $main .= sprintf("hi"); + // there are no tags yet, please add one... + } 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"; + } +if (isset ($_POST['tag'])) { + $tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']); +} +$main .= displayAddForm(); + ##################### # BUILD THE CONTENT # ##################### @@ -114,6 +145,24 @@ echo $design; +function displayAddForm() { + $form = sprintf(" <div id=\"addTags_form\">\n" . + " <form action=\"%s\" method=\"post\" accept-charset=\"UTF-8\">\n" . + " <div id=\"formtitle\">%s</div>\n" . + " <div class=\"left\">\n" . + " <div class=\"formElem\">%s</div>\n" . + " </div>\n" . + " <div class=\"right\">\n" . + " <div class=\"formField\" ><input type=\"text\" name=\"tag\" size=\"30\" maxlength=\"30\" /></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']."?feed=".$_GET['feed'], _("Add Tag"), _("tag name"), _("Submit!")); + return $form; +} + function filterInput($input, $type) { $inhalt = trim($inhalt); $inhalt = htmlspecialchars($inhalt); Modified: trunk/page_show_all_feeds.php =================================================================== --- trunk/page_show_all_feeds.php 2006-12-20 21:46:24 UTC (rev 78) +++ trunk/page_show_all_feeds.php 2006-12-27 10:56:35 UTC (rev 79) @@ -65,7 +65,7 @@ # LANGUAGE # ############ require_once "HTTP.php"; -$language = HTTP::negotiateLanguage($langs, "en_EN"); +$language = HTTP :: negotiateLanguage($langs, "en_EN"); ################ # User-Manager # @@ -73,8 +73,14 @@ require_once "class/User_manager.php"; $user = new User_manager($db); -$maxpages = $feed->getFeedsMaxPages(10); +############### +# Tag-Manager # +############### +require_once "class/Tag_manager.php"; +$tag_manager = new Tag_Manager($db); +//$maxpages = $feed->getFeedsMaxPages(10); + $page = "main"; // // Now we're going to replace the placeholders in the template with the important content @@ -102,7 +108,7 @@ $midHeader_title_right = sprintf(" <form action=\"./page_login.php\" method=\"post\"><span>%s</span> <input type=\"submit\" name=\"submit\" value=\"%s\" /><br />\n" . " <input type=\"text\" name=\"username\" value=\"%s\" size=\"20\" /><br />\n" . " <input type=\"password\" name=\"password\" value=\"%s\" /><br />\n" . - " <input type=\"hidden\" name=\"cameFrom\" value=\"%s\" />" . + " <input type=\"hidden\" name=\"cameFrom\" value=\"%s\" />\n" . " </form>\n" . " </div>", _("Login:"), _("Submit!"), _("Username"), _("Password"), basename($_SERVER['PHP_SELF'])); } else { @@ -122,16 +128,17 @@ # Main copy // main -if(true === HTTP_Session :: get("logged_in")) { +if (true === HTTP_Session :: get("logged_in")) { $main = createSelectionForm(); } else { - $main = createSelectionTable($feed, 30, detectActualPage($maxpages)); + $main = createSelectionTable($feed, /*30, detectActualPage($maxpages),*/ + $tag_manager); } $design = str_replace("<!-- main -->", $main, $design); // page-navigation -$page_navigation = displayPageNavi($maxpages, detectActualPage($maxpages)); -$design = str_replace("<!-- page-navigation -->", $page_navigation, $design); +//$page_navigation = displayPageNavi($maxpages, detectActualPage($maxpages)); +//$design = str_replace("<!-- page-navigation -->", $page_navigation, $design); # footer // footer @@ -140,61 +147,117 @@ echo $design; -function createSelectionForm($feed) { - +function createSelectionForm($feed, $tag_manager) { + $items = $feed->getFeeds(); + if (false === $items) { + return "error!!!"; + } + $return = sprintf(" <form action=\"$PHP_SELF\" method=\"post\">"); + $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")); + 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]); + } else { + $return .= " <td>\n"; + foreach ($tags as $id => $tag) { + $return .= " <a href=\"./page_show_feed_tag.php?tag=$tag\">$tag</a>"; + if ($id !== (count($tags) - 1)) { + $return .= ", "; + } + //$main .= "\n"; + } + $return .= " </td>\n"; + } + } + $return .= sprintf(" <td><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . + " </tr>\n", $list['site_lang'], $list['site_lang']); + } + + $return .= " </table>"; + return $return; } -function createSelectionTable($feed, $count, $page) { -$items = $feed->getFeedsPerPage($count, $page); -if(false === $items) { - return "error!!!"; -} - $return = sprintf( -" <table summary=\"\">\n" . -" <tr>\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"), _("Languages")); -foreach($items as $list) { - $return .= sprintf( +function createSelectionTable($feed, $tag_manager) { + $items = $feed->getFeeds(); + if (false === $items) { + return "error!!!"; + } + $return = sprintf(" <table summary=\"\">\n" . " <tr>\n" . - " <td><a href=\"%s\">%s</a></td>\n" . - " <td><a href=\"./page_show_feeds?feed=%s\">%s</a></td>\n" . - " <td><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . - " </tr>\n", $list['site_url'], $list['site_name'], $list['feed_url'], $list['feed_name'], $list['site_lang'], $list['site_lang']); -} + " <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")); + 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]); + } else { + $return .= " <td>\n"; + foreach ($tags as $id => $tag) { + $return .= " <a href=\"./page_show_feed_tag.php?tag=$tag\">$tag</a>"; + if ($id !== (count($tags) - 1)) { + $return .= ", "; + } + //$main .= "\n"; + } + $return .= " </td>\n"; + } + } + $return .= sprintf(" <td><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . + " </tr>\n", $list['site_lang'], $list['site_lang']); + } -$return .= " </table>"; -return $return; + $return .= " </table>"; + return $return; } function displayPageNavi($maxpages, $page) { echo 1; $return = _("Page: "); - for($i = 1; $i <= $maxpages; $i++) { + for ($i = 1; $i <= $maxpages; $i++) { echo 2; - if($i !== 1) { + if ($i !== 1) { echo 3; $return .= " | "; } - if($i !== $page) { + if ($i !== $page) { echo 4; - $return .= sprintf(" [<a href=\"./page_show_all_feeds.php?page=%d\">%d</a>]", $i,$i); + $return .= sprintf(" [<a href=\"./page_show_all_feeds.php?page=%d\">%d</a>]", $i, $i); } else { echo 5; $return .= sprintf(" [%d]", $i); } } - + return $return; } function detectActualPage($maxpages) { - if(!isset($_GET['page'])) { + if (!isset ($_GET['page'])) { return 1; } - if($maxpages < $_GET['page']) { + if ($maxpages < $_GET['page']) { return 1; } $page = $_GET['page']; Modified: trunk/page_show_feed.php =================================================================== --- trunk/page_show_feed.php 2006-12-20 21:46:24 UTC (rev 78) +++ trunk/page_show_feed.php 2006-12-27 10:56:35 UTC (rev 79) @@ -191,7 +191,7 @@ $return .= " | "; } if ($i !== $page) { - $return .= sprintf(" [<a href=\"./page_show_feed.php?feed=%s&page=%d\">%d</a>]", $feedname, $i, $i); + $return .= sprintf(" [<a href=\"./page_show_feed.php?feed=%s&page=%d\">%d</a>]", $feedname, $i, $i); } else { $return .= sprintf(" [%d]", $i); } Added: trunk/page_show_feed_tag.php =================================================================== --- trunk/page_show_feed_tag.php (rev 0) +++ trunk/page_show_feed_tag.php 2006-12-27 10:56:35 UTC (rev 79) @@ -0,0 +1,205 @@ +<?php + + +/** + * 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 + */ + +require_once "inc/functions.php"; + +require_once "inc/config.php"; +require_once "inc/definitions.php"; +error_reporting(E_ALL); +############ +# DATABASE # +############ +require_once "MDB2.php"; +$dsn = array ( + 'phptype' => DB_TYPE, + 'username' => DB_LOGIN, + '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); + +########### +# 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']); + +################ +# Feed-Manager # +################ +require_once "class/Feed_manager.php"; +$feed = new Feed_manager($db); + +################ +# User-Manager # +################ +require_once "class/User_manager.php"; +$user = new User_manager($db); + +############### +# Tag-Manager # +############### +require_once "class/Tag_manager.php"; +$tag_manager = new Tag_Manager($db); + +require_once "HTTP.php"; +// +// Now we're going to replace the placeholders in the template with the important content +// +$_GET['tag'] = "heise"; +if (!isset ($_GET['tag'])) { + //HTTP :: redirect("./page_show_all_feeds.php"); +} else { + $main = createFeedsTable($_GET['tag'], $tag_manager, $feed); +} + +$design = file_get_contents("styles/default/page_show_feed_tag.tpl", "r"); + +# Header +// title +$title = "Feed-Collector"; +$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:")); +$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", _("Feed-Collector"), _("{ stay up to date with all your news feeds! }")); +$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(" <form action=\"./page_login.php\" method=\"post\"><span>%s</span> <input type=\"submit\" name=\"submit\" value=\"%s\" /><br />\n" . + " <input type=\"text\" name=\"username\" value=\"%s\" size=\"20\" /><br />\n" . + " <input type=\"text\" name=\"password\" value=\"%s\" /><br />\n" . + " <input type=\"hidden\" name=\"cameFrom\" value=\"%s\" />" . + " </form>\n" . + " </div>", _("Login:"), _("Submit!"), _("Username"), _("Password"), basename($_SERVER['PHP_SELF'])); +} else { + $midHeader_title_right = sprintf(" <span>%s %s</span><br />\n" . + " <p id=\"userinfo\">%s %s</p>", _("Hello"), HTTP_Session :: get("username"), _("Your last login was at"), date("H:m:i", HTTP_Session :: get("lastLogin"))); +} +$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); + +// navigation +$navigation = sprintf(" <span class=\"doNotDisplay\">Navigation:</span>\n <a href=\"./page_main.php\">%s</a> |\n <a href=\"./page_show_feeds.php\" class=\"highlight\">%s</a> |\n <a href=\"./page_search.php\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n <a href=\"./index.html\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Search"), _("Show TAGs"), _("About")); +if (false === HTTP_Session :: get("logged_in", false)) { + $navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register")); +} else { + $navigation .= sprintf(" <a href=\"./page_profile.php\">%s</a>", _("Profile")); +} +$design = str_replace("<!-- navigation -->", $navigation, $design); + +/* + * At this point we have to decide wether we display only one Feed or some more, perhaps loaded and movable by AJAX... + */ +# Main copy +// main +$design = str_replace("<!-- main -->", $main, $design); + +// page-navigation +//$page_navigation = displayPageNavi($maxpages, detectActualPage($maxpages), $_GET['feed']); +//$design = str_replace("<!-- page-navigation -->", $page_navigation, $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")); +$design = str_replace("<!-- footer -->", $footer, $design); + +echo $design; + +function createFeedsTable($tag, $tag_manager, $feed_manager) { + $feeds = $tag_manager->getFeedsByTag($tag); + if (false === $feeds) { + return "error!!!"; + } + $return = sprintf(" <table summary=\"%s\">\n", $tag); + foreach($feeds as $feed) { + $return .= sprintf(" <tr>\n" . + " <td><a id=\"n%d\" href=\"%s\">%s</a></td>\n" . + " </tr>\n", $feed['id'], $feed['feed_url'], $feeds['feed_name']); + + } + /* + for ($i = count($feeds) - 1; $i >= 0; $i--) { + //foreach ($items as $list) { + $return .= sprintf(" <tr>\n" . + " <td><a id=\"n%d\" href=\"%s\">%s</a></td>\n" . + " </tr>\n", $feeds[$i]['id'], $feeds[$i]['url'], $feeds[$i]['title'], $feeds[$i]['summary']); + } +*/ + $return .= " </table>"; + return $return; +} + +function findBiggestArray($a1, $a2, $a3) { + $a1 = count($a1); + $a2 = count($a2); + $a3 = count($a3); + $number = 0; + if ($a1 > $number) + $number = $a1; + if ($a2 > $number) + $number = $a2; + if ($a3 > $number) + $number = $a3; + return $number; +} + +function displayPageNavi($maxpages, $page, $feedname) { + $return = _("Page: "); + for ($i = 1; $i <= $maxpages; $i++) { + if ($i !== 1) { + $return .= " | "; + } + if ($i !== $page) { + $return .= sprintf(" [<a href=\"./page_show_feed.php?feed=%s&page=%d\">%d</a>]", $feedname, $i, $i); + } else { + $return .= sprintf(" [%d]", $i); + } + } + return $return; +} + +function detectActualPage($maxpages) { + if (!isset ($_GET['page'])) { + return 1; + } + if ($maxpages < $_GET['page']) { + return $maxpages; + } + $page = $_GET['page']; + settype($page, 'int'); + return $page; +} +?> \ No newline at end of file Added: trunk/styles/default/page_show_feed_tag-screen.css =================================================================== --- trunk/styles/default/page_show_feed_tag-screen.css (rev 0) +++ trunk/styles/default/page_show_feed_tag-screen.css 2006-12-27 10:56:35 UTC (rev 79) @@ -0,0 +1,371 @@ +/***************************************************** + * TITLE: Show Feeds Screen Stylesheet * + * URI: styles/default/page_show_feed_tag-screen.css * + * MODIF: 2006-Nov-16 18:06 +0100 * + *****************************************************/ + + +/* ##### Common Styles ##### */ + +body { + font-family: verdana, helvetica, arial, sans-serif; + font-size: 73%; /* Enables font size scaling in MSIE */ + margin: 0; + padding: 0; +} + +html > body { + font-size: 9pt; +} + +acronym, .titleTip { + border-bottom: 1px dotted rgb(61,92,122); + cursor: help; + margin: 0; + padding: 0 0 0.4px 0; +} + +a { + color: rgb(61,92,122); + background-color: transparent; + text-decoration: underline; + margin: 0; + padding: 0 1px 2px 1px; +} + +a:hover { + color: rgb(117,144,174); + text-decoration: none; +} + +ol { + margin: 1em 0 1.5em 0; + padding: 0; +} + +ul { + list-style-type: square; + margin: 1em 0 1.5em 0; + padding: 0; +} + +dl { + margin: 1em 0 0.5em 0; + padding: 0; +} + +ul li { + line-height: 1.5em; + margin: 1.25ex 0 0 1.5em; + padding: 0; +} + +ol li { + line-height: 1.5em; + margin: 1.25ex 0 0 2em; + padding: 0; +} + +dt { + font-weight: bold; + margin: 0; + padding: 0 0 1ex 0; +} + +dd { + line-height: 1.75em; + margin: 0 0 1.5em 1.5em; + padding: 0; +} + +.doNotDisplay { + display: none !important; +} + + +.smallCaps { + font-size: 117%; + font-variant: small-caps; +} + + +/* ##### Header ##### */ + +.superHeader { + color: rgb(130,128,154); + background-color: rgb(33,50,66); + text-align: right; + margin: 0; + padding: 0.5ex 10px; +} + +.superHeader span { + color: rgb(195,196,210); + background-color: transparent; + font-weight: bold; + text-transform: uppercase; +} + +.superHeader a { + color: rgb(195,196,210); + background-color: transparent; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.superHeader a:hover { + color: rgb(193,102,90); + background-color: transparent; + text-decoration: none; +} + +.midHeader { + color: white; + background-color: rgb(61,92,122); + margin: 0; + padding: 0.26ex 10px; +} + +.headerTitle { + font-size: 300%; + margin: 0; + padding: 0; +} + +.headerSubTitle { + font-size: 151%; + font-weight: normal; + font-style: italic; + margin: 0 0 1ex 0; + padding: 0; +} + +.headerLinks { + text-align: right; + margin: 0; + padding: 0 0 2ex 0; + position: absolute; + right: 1.5em; + top: 3.5em; +} + +.headerLinks a { + color: white; + background-color: transparent; + text-decoration: none; + margin: 0; + padding: 0 0 0.5ex 0; + display: block; +} + +.headerLinks a:hover { + color: rgb(195,196,210); + background-color: transparent; + text-decoration: underline; +} + +.subHeader { + color: white; + background-color: rgb(117,144,174); + margin: 0; + padding: 0.5ex 10px; +} + +.subHeader a, .subHeader .highlight { + color: white; + background-color: transparent; + font-size: 110%; + font-weight: bold; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.subHeader a:hover, .subHeader .highlight { + color: rgb(255,204,0); + background-color: transparent; + text-decoration: none; +} + +/* ##### Main Copy ##### */ + +#main-copy { + margin: 0; + padding: 0.5em 10px; + clear: left; +} + +#main-copy h1 { + color: rgb(117,144,174); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 200%; + margin: 0; + padding: 0; +} + +#main-copy h2 { + color: rgb(61,92,122); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-weight: normal; + font-size: 151%; + margin: 0; + padding: 1ex 0 0 0; +} + +#main-copy p { + line-height: 1.75em; + margin: 1em 0 1.5em 0; + padding: 0; +} + +.newsHeading { + color: rgb(61,92,122); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 145%; + text-decoration: none; + margin: 0; + padding: 1ex 0 0 0; + display: block; +} + +.column1, .column2, .column3 { + margin: 1em 0; + padding: 0 2.5%; + float: left; + width: 28%; +} + +.column2 { /* Renders the column dividers */ + border-left: 1px solid rgb(204,204,204); + border-right: 1px solid rgb(204,204,204); +} + +.column1 .feed_headline { + border-left: 1px solid yellow; + border-right: 1px solid yellow; + border-top: 1px solid yellow; + padding-bottom: 1em; +} + +.column1 ul { + margin-top: 0em; + border: 1px solid yellow; + +} + +.column2 .feed_headline { + border-left: 1px solid red; + border-right: 1px solid red; + border-top: 1px solid red; + padding-bottom: 1em; +} + +.column2 ul { + border: 1px solid red; + margin-top: 0; + +} + +.column3 .feed_headline { + border-left: 1px solid green; + border-right: 1px solid green; + border-top: 1px solid green; + padding-bottom: 1em; +} + +.column3 ul { + border: 1px solid green; + margin-top: 0; +} + +.rowOfBoxes { + clear: both; +} + +.quarter, .oneThird, .half, .twoThirds, .fullWidth { + margin: 1em 0; + float: left; + border-left: 1px solid rgb(204,204,204); +} + +.quarter { + width: 21%; + padding: 0 1.9%; +} + +.oneThird { + width: 28%; + padding: 0 1.9%; +} + +.half { + text-align: justify; + width: 46%; + padding: 0 1.9%; +} + +.twoThirds { + text-align: justify; + width: 63%; + padding: 0 1.9%; +} + +.fullWidth { + text-align: justify; + width: 96%; + padding: 0 1.2em; + border-left: none; +} + +.filler { /* use with an empty <p> element to add padding to the end of a text box */ + border: 1px solid white; +} + +.noBorderOnLeft { + border-left: none; +} + +.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); + * } + */ + + +/* ##### Footer ##### */ + +#footer { + color: rgb(51,51,102); + background-color: rgb(239,239,239); + font-size: 87%; + text-align: center; + line-height: 1.25em; + margin: 2em 0 0 0; + padding: 1ex 10px; + clear: left; +} + +#footer a { + color: rgb(0,68,204); + background-color: transparent; + text-decoration: underline; +} + +#footer a:hover { + text-decoration: none; +} \ No newline at end of file Added: trunk/styles/default/page_show_feed_tag.tpl =================================================================== --- trunk/styles/default/page_show_feed_tag.tpl (rev 0) +++ trunk/styles/default/page_show_feed_tag.tpl 2006-12-27 10:56:35 UTC (rev 79) @@ -0,0 +1,62 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 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" /> + <meta name="generator" content="haran" /> + + <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feed_tag-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_show_feed_tag-print.css" media="screen" title="Print Preview" /> + <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feed_tag-print.css" media="print" /> + + <script type="text/javascript" src="js.js" /> + <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 --> + </div> + + <br class="doNotDisplay doNotPrint" /> + + <div class="headerLinks"> +<!-- midHeader title right --> + </div> + </div> + + <div class="subHeader"> +<!-- navigation --> + </div> + + <!-- ##### Main Copy ##### --> + + <div id="main-copy"> +<!-- main --> + + <div id="page-navigation"> +<!-- page-navigation --> + </div> + </div> + + + + <!-- ##### Footer ##### --> + + <div id="footer"> +<!-- footer --> + </div> + </body> +</html> \ 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...> - 2006-12-20 21:46:26
|
Revision: 78 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=78&view=rev Author: c167 Date: 2006-12-20 13:46:24 -0800 (Wed, 20 Dec 2006) Log Message: ----------- Modified Paths: -------------- trunk/styles/default/page_login-screen.css trunk/styles/default/page_personal-screen.css trunk/styles/default/page_personal.tpl trunk/styles/default/page_show_feed-screen.css trunk/styles/default/page_show_feed.tpl Added Paths: ----------- trunk/styles/default/page_add_tag-screen.css trunk/styles/default/page_add_tag.tpl Added: trunk/styles/default/page_add_tag-screen.css =================================================================== --- trunk/styles/default/page_add_tag-screen.css (rev 0) +++ trunk/styles/default/page_add_tag-screen.css 2006-12-20 21:46:24 UTC (rev 78) @@ -0,0 +1,369 @@ +/************************************************** + * TITLE: Show Feeds Screen Stylesheet * + * URI: styles/default/page_login-screen.css * + * MODIF: 2006-Nov-16 18:06 +0100 * + **************************************************/ + /* ##### Common Styles ##### */ +body { + font-family: verdana, helvetica, arial, sans-serif; + font-size: 73%; /* Enables font size scaling in MSIE */ + margin: 0; + padding: 0; +} + +html>body { + font-size: 9pt; +} + +acronym,.titleTip { + border-bottom: 1px dotted rgb(61, 92, 122); + cursor: help; + margin: 0; + padding: 0 0 0.4px 0; +} + +a { + color: rgb(61, 92, 122); + background-color: transparent; + text-decoration: underline; + margin: 0; + padding: 0 1px 2px 1px; +} + +a:hover { + color: rgb(117, 144, 174); + text-decoration: none; +} + +ol { + margin: 1em 0 1.5em 0; + padding: 0; +} + +ul { + list-style-type: square; + margin: 1em 0 1.5em 0; + padding: 0; +} + +dl { + margin: 1em 0 0.5em 0; + padding: 0; +} + +ul li { + line-height: 1.5em; + margin: 1.25ex 0 0 1.5em; + padding: 0; +} + +ol li { + line-height: 1.5em; + margin: 1.25ex 0 0 2em; + padding: 0; +} + +dt { + font-weight: bold; + margin: 0; + padding: 0 0 1ex 0; +} + +dd { + line-height: 1.75em; + margin: 0 0 1.5em 1.5em; + padding: 0; +} + +.doNotDisplay { + display: none !important; +} + +.smallCaps { + font-size: 117%; + font-variant: small-caps; +} + +/* ##### Header ##### */ +.superHeader { + color: rgb(130, 128, 154); + background-color: rgb(33, 50, 66); + text-align: right; + margin: 0; + padding: 0.5ex 10px; +} + +.superHeader span { + color: rgb(195, 196, 210); + background-color: transparent; + font-weight: bold; + text-transform: uppercase; +} + +.superHeader a { + color: rgb(195, 196, 210); + background-color: transparent; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.superHeader a:hover { + color: rgb(193, 102, 90); + background-color: transparent; + text-decoration: none; +} + +.midHeader { + color: white; + background-color: rgb(61, 92, 122); + margin: 0; + padding: 0.26ex 10px; +} + +.headerTitle { + font-size: 300%; + margin: 0; + padding: 0; +} + +.headerSubTitle { + font-size: 151%; + font-weight: normal; + font-style: italic; + margin: 0 0 1ex 0; + padding: 0; +} + +.headerLinks { + text-align: right; + margin: 0; + padding: 0 0 2ex 0; + position: absolute; + right: 1.5em; + top: 3.5em; +} + +.headerLinks a { + color: white; + background-color: transparent; + text-decoration: none; + margin: 0; + padding: 0 0 0.5ex 0; + display: block; +} + +.headerLinks a:hover { + color: rgb(195, 196, 210); + background-color: transparent; + text-decoration: underline; +} + +.subHeader { + color: white; + background-color: rgb(117, 144, 174); + margin: 0; + padding: 0.5ex 10px; +} + +.subHeader a,.subHeader .highlight { + color: white; + background-color: transparent; + font-size: 110%; + font-weight: bold; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.subHeader a:hover,.subHeader .highlight { + color: rgb(255, 204, 0); + background-color: transparent; + text-decoration: none; +} + +/* ##### Main Copy ##### */ +#main-copy { + margin: 0; + padding: 0.5em 10px; + clear: left; +} + +#main-copy h1 { + color: rgb(117, 144, 174); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 200%; + margin: 0; + padding: 0; +} + +#main-copy h2 { + color: rgb(61, 92, 122); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-weight: normal; + font-size: 151%; + margin: 0; + padding: 1ex 0 0 0; +} + +#main-copy p { + line-height: 1.75em; + margin: 1em 0 1.5em 0; + padding: 0; +} + +#registration_form { + float: left; + border: 1px solid rgb(204, 204, 204); + width: 80%; + margin-top: 1em; + margin-left: 9%; + margin-right: 9%; +} + +#formtitle { + text-align: center; + color: white; + background-color: rgb(117, 144, 174); + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 200%; +/* margin: 0;*/ + padding: 0.5ex 10px; + border-bottom: 1px solid rgb(204, 204, 204); +} + +.left,.right { + float: left; +} + +.left { + border-right: 1px solid rgb(204, 204, 204); + margin-left: 20%; + padding-right: 20%; + margin-right: 20%; +} + +.right { + padding-left: 1em; + margin-left: 1em; +} + +.formElem_ok,.formElem_error,.formField_ok,.formElem_error { + +} + +.formElem_ok,.formElem_error { + +} + +.formElem_ok input { + background-color: yellow; +} + +.formElem_error input { + background-color: red; +} + +.formField_ok input { + background-color: yellow; +} + +.formField_error input { + background-color: red; +} + +#formButtons { + 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); +} + +#required { + width: 80%; +} + +.quarter,.oneThird,.half,.twoThirds,.fullWidth { + margin: 1em 0; + float: left; + border-left: 1px solid rgb(204, 204, 204); +} + +.quarter { + width: 21%; + padding: 0 1.9%; +} + +.oneThird { + width: 28%; + padding: 0 1.9%; +} + +.half { + text-align: justify; + width: 46%; + padding: 0 1.9%; +} + +.twoThirds { + text-align: justify; + width: 63%; + padding: 0 1.9%; +} + +.fullWidth { + text-align: justify; + width: 96%; + padding: 0 1.2em; + border-left: none; +} + +.filler { + /* use with an empty <p> element to add padding to the end of a text box */ + border: 1px solid white; +} + +.noBorderOnLeft { + border-left: none; +} + +.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); + * } + */ /* ##### Footer ##### */ +#footer { + color: rgb(51, 51, 102); + background-color: rgb(239, 239, 239); + font-size: 87%; + text-align: center; + line-height: 1.25em; + margin: 2em 0 0 0; + padding: 1ex 10px; + clear: left; +} + +#footer a { + color: rgb(0, 68, 204); + background-color: transparent; + text-decoration: underline; +} + +#footer a:hover { + text-decoration: none; +} \ No newline at end of file Added: trunk/styles/default/page_add_tag.tpl =================================================================== --- trunk/styles/default/page_add_tag.tpl (rev 0) +++ trunk/styles/default/page_add_tag.tpl 2006-12-20 21:46:24 UTC (rev 78) @@ -0,0 +1,55 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 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" /> + <meta name="generator" content="haran" /> + + <link rel="stylesheet" type="text/css" href="./styles/default/page_add_tag-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_add_tag-print.css" media="screen" title="Print Preview" /> + <link rel="stylesheet" type="text/css" href="./styles/default/page_add_tag-print.css" media="print" /> + + <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 --> + </div> + + <br class="doNotDisplay doNotPrint" /> + + <div class="headerLinks"> +<!-- midHeader title right --> + </div> + + <div class="subHeader"> +<!-- navigation --> + </div> + </div> + + <!-- ##### Main Copy ##### --> + + <div id="main-copy"> +<!-- main --> + </div> + + <!-- ##### Footer ##### --> + + <div id="footer"> +<!-- footer --> + </div> + </body> +</html> \ No newline at end of file Modified: trunk/styles/default/page_login-screen.css =================================================================== --- trunk/styles/default/page_login-screen.css 2006-12-20 21:45:17 UTC (rev 77) +++ trunk/styles/default/page_login-screen.css 2006-12-20 21:46:24 UTC (rev 78) @@ -215,9 +215,12 @@ } #registration_form { - margin: 1em 0; float: left; border: 1px solid rgb(204, 204, 204); + width: 80%; + margin-top: 1em; + margin-left: 9%; + margin-right: 9%; } #formtitle { @@ -226,25 +229,25 @@ background-color: rgb(117, 144, 174); font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; font-size: 200%; - margin: 0; +/* margin: 0;*/ padding: 0.5ex 10px; border-bottom: 1px solid rgb(204, 204, 204); } .left,.right { - + float: left; } -.left { /*border-right: 1px solid rgb(204, 204, 204);*/ - float: left; - padding-right: 50%; +.left { + border-right: 1px solid rgb(204, 204, 204); + margin-left: 20%; + padding-right: 20%; + margin-right: 20%; } -.right { - float: right; - /* margin-left: 40%; - margin-right: 10%; - padding-top: 2em;*/ +.right { + padding-left: 1em; + margin-left: 1em; } .formElem_ok,.formElem_error,.formField_ok,.formElem_error { @@ -252,7 +255,7 @@ } .formElem_ok,.formElem_error { - border-right: 1px solid red; + } .formElem_ok input { @@ -277,7 +280,7 @@ margin-top: 6em; padding-top: 1em; padding-bottom: 1em; - border-top: 2px solid rgb(204,204,204); + border-top: 2px solid rgb(204, 204, 204); } #required { Modified: trunk/styles/default/page_personal-screen.css =================================================================== --- trunk/styles/default/page_personal-screen.css 2006-12-20 21:45:17 UTC (rev 77) +++ trunk/styles/default/page_personal-screen.css 2006-12-20 21:46:24 UTC (rev 78) @@ -2,337 +2,322 @@ * TITLE: Show Feeds Screen Stylesheet * * URI: styles/default/page_show_feeds-screen.css * * MODIF: 2006-Nov-16 18:06 +0100 * - **************************************************/ - - -/* ##### Common Styles ##### */ - -body { - font-family: verdana, helvetica, arial, sans-serif; - font-size: 73%; /* Enables font size scaling in MSIE */ - margin: 0; - padding: 0; -} - -html > body { - font-size: 9pt; -} - -acronym, .titleTip { - border-bottom: 1px dotted rgb(61,92,122); - cursor: help; - margin: 0; - padding: 0 0 0.4px 0; -} - -a { - color: rgb(61,92,122); - background-color: transparent; - text-decoration: underline; - margin: 0; - padding: 0 1px 2px 1px; -} - -a:hover { - color: rgb(117,144,174); - text-decoration: none; -} - -ol { - margin: 1em 0 1.5em 0; - padding: 0; -} - -ul { - list-style-type: square; - margin: 1em 0 1.5em 0; - padding: 0; -} - -dl { - margin: 1em 0 0.5em 0; - padding: 0; -} - -ul li { - line-height: 1.5em; - margin: 1.25ex 0 0 1.5em; - padding: 0; -} - -ol li { - line-height: 1.5em; - margin: 1.25ex 0 0 2em; - padding: 0; -} - -dt { - font-weight: bold; - margin: 0; - padding: 0 0 1ex 0; -} - -dd { - line-height: 1.75em; - margin: 0 0 1.5em 1.5em; - padding: 0; -} - -.doNotDisplay { - display: none !important; -} - - -.smallCaps { - font-size: 117%; - font-variant: small-caps; -} - - -/* ##### Header ##### */ - -.superHeader { - color: rgb(130,128,154); - background-color: rgb(33,50,66); - text-align: right; - margin: 0; - padding: 0.5ex 10px; -} - -.superHeader span { - color: rgb(195,196,210); - background-color: transparent; - font-weight: bold; - text-transform: uppercase; -} - -.superHeader a { - color: rgb(195,196,210); - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.superHeader a:hover { - color: rgb(193,102,90); - background-color: transparent; - text-decoration: none; -} - -.midHeader { - color: white; - background-color: rgb(61,92,122); - margin: 0; - padding: 0.26ex 10px; -} - -.headerTitle { - font-size: 300%; - margin: 0; - padding: 0; -} - -.headerSubTitle { - font-size: 151%; - font-weight: normal; - font-style: italic; - margin: 0 0 1ex 0; - padding: 0; -} - -.headerLinks { - text-align: right; - margin: 0; - padding: 0 0 2ex 0; - position: absolute; - right: 1.5em; - top: 3.5em; -} - -.headerLinks a { - color: white; - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0 0.5ex 0; - display: block; -} - -.headerLinks a:hover { - color: rgb(195,196,210); - background-color: transparent; - text-decoration: underline; -} - -.subHeader { - color: white; - background-color: rgb(117,144,174); - margin: 0; - padding: 0.5ex 10px; -} - -.subHeader a, .subHeader .highlight { - color: white; - background-color: transparent; - font-size: 110%; - font-weight: bold; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.subHeader a:hover, .subHeader .highlight { - color: rgb(255,204,0); - background-color: transparent; - text-decoration: none; + **************************************************/ + /* ##### Common Styles ##### */ +body { + font-family: verdana, helvetica, arial, sans-serif; + font-size: 73%; /* Enables font size scaling in MSIE */ + margin: 0; + padding: 0; } - -/* ##### Main Copy ##### */ - -#main-copy { - margin: 0; - padding: 0.5em 10px; - clear: left; -} - -#main-copy h1 { - color: rgb(117,144,174); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - margin: 0; - padding: 0; -} - -#main-copy h2 { - color: rgb(61,92,122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-weight: normal; - font-size: 151%; - margin: 0; - padding: 1ex 0 0 0; -} - -#main-copy p { - line-height: 1.75em; - margin: 1em 0 1.5em 0; - padding: 0; -} - -.newsHeading { - color: rgb(61,92,122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 145%; - text-decoration: none; - margin: 0; - padding: 1ex 0 0 0; - display: block; -} -.column1, .column2, .column3 { - margin: 1em 0; - padding: 0 2.5%; - float: left; - width: 28%; +html>body { + font-size: 9pt; } -.column2 { /* Renders the column dividers */ - border-left: 1px solid rgb(204,204,204); - border-right: 1px solid rgb(204,204,204); +acronym,.titleTip { + border-bottom: 1px dotted rgb(61, 92, 122); + cursor: help; + margin: 0; + padding: 0 0 0.4px 0; } -.column1 .feed_headline { - border-left: 1px solid yellow; - border-right: 1px solid yellow; - border-top: 1px solid yellow; +a { + color: rgb(61, 92, 122); + background-color: transparent; + text-decoration: underline; + margin: 0; + padding: 0 1px 2px 1px; +} + +a:hover { + color: rgb(117, 144, 174); + text-decoration: none; +} + +ol { + margin: 1em 0 1.5em 0; + padding: 0; +} + +ul { + list-style-type: square; + margin: 1em 0 1.5em 0; + padding: 0; +} + +dl { + margin: 1em 0 0.5em 0; + padding: 0; +} + +ul li { + line-height: 1.5em; + margin: 1.25ex 0 0 1.5em; + padding: 0; +} + +ol li { + line-height: 1.5em; + margin: 1.25ex 0 0 2em; + padding: 0; +} + +dt { + font-weight: bold; + margin: 0; + padding: 0 0 1ex 0; +} + +dd { + line-height: 1.75em; + margin: 0 0 1.5em 1.5em; + padding: 0; +} + +.doNotDisplay { + display: none !important; +} + +.smallCaps { + font-size: 117%; + font-variant: small-caps; +} + +/* ##### Header ##### */ +.superHeader { + color: rgb(130, 128, 154); + background-color: rgb(33, 50, 66); + text-align: right; + margin: 0; + padding: 0.5ex 10px; +} + +.superHeader span { + color: rgb(195, 196, 210); + background-color: transparent; + font-weight: bold; + text-transform: uppercase; +} + +.superHeader a { + color: rgb(195, 196, 210); + background-color: transparent; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.superHeader a:hover { + color: rgb(193, 102, 90); + background-color: transparent; + text-decoration: none; +} + +.midHeader { + color: white; + background-color: rgb(61, 92, 122); + margin: 0; + padding: 0.26ex 10px; +} + +.headerTitle { + font-size: 300%; + margin: 0; + padding: 0; +} + +.headerSubTitle { + font-size: 151%; + font-weight: normal; + font-style: italic; + margin: 0 0 1ex 0; + padding: 0; +} + +.headerLinks { + text-align: right; + margin: 0; + padding: 0 0 2ex 0; + position: absolute; + right: 1.5em; + top: 3.5em; +} + +.headerLinks a { + color: white; + background-color: transparent; + text-decoration: none; + margin: 0; + padding: 0 0 0.5ex 0; + display: block; +} + +.headerLinks a:hover { + color: rgb(195, 196, 210); + background-color: transparent; + text-decoration: underline; +} + +.subHeader { + color: white; + background-color: rgb(117, 144, 174); + margin: 0; + padding: 0.5ex 10px; +} + +.subHeader a,.subHeader .highlight { + color: white; + background-color: transparent; + font-size: 110%; + font-weight: bold; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.subHeader a:hover,.subHeader .highlight { + color: rgb(255, 204, 0); + background-color: transparent; + text-decoration: none; +} + +/* ##### Main Copy ##### */ +#main-copy { + margin: 0; + padding: 0.5em 10px; + clear: left; +} + +#main-copy h1 { + color: rgb(117, 144, 174); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 200%; + margin: 0; + padding: 0; +} + +#main-copy h2 { + color: rgb(61, 92, 122); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-weight: normal; + font-size: 151%; + margin: 0; + padding: 1ex 0 0 0; +} + +#main-copy p { + line-height: 1.75em; + margin: 1em 0 1.5em 0; + padding: 0; +} + +.column1,.column2,.column3 { + margin: 1em 0; + padding: 0 2.5%; + float: left; + width: 28%; +} + +.column2 { /* Renders the column dividers */ + border-left: 1px solid rgb(204, 204, 204); + border-right: 1px solid rgb(204, 204, 204); +} + +.feed_headline { padding-bottom: 1em; + text-align: center; + font-weight: bold; + font-size: 120%; + border-left: 1px solid; + border-right: 1px solid; + border-top: 1px solid; } +.column1 .feed_headline { + border-color: yellow; + background-color: yellow; +} + .column1 ul { margin-top: 0em; border: 1px solid yellow; - } .column2 .feed_headline { - border-left: 1px solid red; - border-right: 1px solid red; - border-top: 1px solid red; - padding-bottom: 1em; + border-color: red; + background-color: red; } .column2 ul { border: 1px solid red; margin-top: 0; - } .column3 .feed_headline { - border-left: 1px solid green; - border-right: 1px solid green; - border-top: 1px solid green; - padding-bottom: 1em; + border-color: green; + background-color: green; } .column3 ul { border: 1px solid green; margin-top: 0; } - -.rowOfBoxes { - clear: both; -} - -.quarter, .oneThird, .half, .twoThirds, .fullWidth { - margin: 1em 0; - float: left; - border-left: 1px solid rgb(204,204,204); -} - -.quarter { - width: 21%; - padding: 0 1.9%; -} - -.oneThird { - width: 28%; - padding: 0 1.9%; -} - -.half { - text-align: justify; - width: 46%; - padding: 0 1.9%; -} - -.twoThirds { - text-align: justify; - width: 63%; - padding: 0 1.9%; -} - -.fullWidth { - text-align: justify; - width: 96%; - padding: 0 1.2em; - border-left: none; -} - -.filler { /* use with an empty <p> element to add padding to the end of a text box */ - border: 1px solid white; -} - -.noBorderOnLeft { - border-left: none; -} - -.dividingBorderAbove { - border-top: 1px solid rgb(204,204,204); -} - + +.rowOfBoxes { + clear: both; +} + +.quarter,.oneThird,.half,.twoThirds,.fullWidth { + margin: 1em 0; + float: left; + border-left: 1px solid rgb(204, 204, 204); +} + +.quarter { + width: 21%; + padding: 0 1.9%; +} + +.oneThird { + width: 28%; + padding: 0 1.9%; +} + +.half { + text-align: justify; + width: 46%; + padding: 0 1.9%; +} + +.twoThirds { + text-align: justify; + width: 63%; + padding: 0 1.9%; +} + +.fullWidth { + text-align: justify; + width: 96%; + padding: 0 1.2em; + border-left: none; +} + +.filler { + /* use with an empty <p> element to add padding to the end of a text box */ + border: 1px solid white; +} + +.noBorderOnLeft { + border-left: none; +} + +.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: @@ -344,28 +329,24 @@ * .rowOfBoxes + .rowOfBoxes { * border-top: 1px solid rgb(204,204,204); * } - */ - - -/* ##### Footer ##### */ - -#footer { - color: rgb(51,51,102); - background-color: rgb(239,239,239); - font-size: 87%; - text-align: center; - line-height: 1.25em; - margin: 2em 0 0 0; - padding: 1ex 10px; - clear: left; -} - -#footer a { - color: rgb(0,68,204); - background-color: transparent; - text-decoration: underline; -} - -#footer a:hover { - text-decoration: none; + */ /* ##### Footer ##### */ +#footer { + color: rgb(51, 51, 102); + background-color: rgb(239, 239, 239); + font-size: 87%; + text-align: center; + line-height: 1.25em; + margin: 2em 0 0 0; + padding: 1ex 10px; + clear: left; +} + +#footer a { + color: rgb(0, 68, 204); + background-color: transparent; + text-decoration: underline; +} + +#footer a:hover { + text-decoration: none; } \ No newline at end of file Modified: trunk/styles/default/page_personal.tpl =================================================================== --- trunk/styles/default/page_personal.tpl 2006-12-20 21:45:17 UTC (rev 77) +++ trunk/styles/default/page_personal.tpl 2006-12-20 21:46:24 UTC (rev 78) @@ -7,9 +7,9 @@ <meta name="author" content="haran" /> <meta name="generator" content="haran" /> - <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feeds-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_show_feeds-print.css" media="screen" title="Print Preview" /> - <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feeds-print.css" media="print" /> + <link rel="stylesheet" type="text/css" href="./styles/default/page_personal-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet alternative" type="text/css" href="./styles/default/page_personal-print.css" media="screen" title="Print Preview" /> + <link rel="stylesheet" type="text/css" href="./styles/default/page_personal-print.css" media="print" /> <script type="text/javascript" src="js.js" /> <title><!-- title --></title> Modified: trunk/styles/default/page_show_feed-screen.css =================================================================== --- trunk/styles/default/page_show_feed-screen.css 2006-12-20 21:45:17 UTC (rev 77) +++ trunk/styles/default/page_show_feed-screen.css 2006-12-20 21:46:24 UTC (rev 78) @@ -187,6 +187,57 @@ background-color: transparent; text-decoration: none; } +/* ##### Right Side Bar ##### */ + +.rightSideBar { + width: 13em; + margin: 2ex 0.75ex 0 0; + padding: 0; + float: right; + clear: right; + border: 1px solid rgb(216,210,195); +} + +[class~="rightSideBar"] { + margin-right: 1.5ex; +} + +.rightSideBar .sideBarTitle { + color: black; + background-color: rgb(230,223,207); + font-weight: bold; + margin: 1.25ex 1ex; + padding: 0.9ex 1ex; +} + +.rightSideBar a { + color: rgb(166,140,83); + background-color: transparent; + text-decoration: underline; + font-weight: bold; +} + +.rightSideBar a:hover { + text-decoration: none; +} + +.rightSideBar .sideBarText { + line-height: 1.5em; + margin: 0; + padding: 0 2ex 1em 2ex; +} + +.rightSideBar .more { + text-decoration: none; + text-align: right; + margin: 0; + padding: 0 2ex 1em 2ex; + display: block; +} + +.rightSideBar .more:hover { + text-decoration: underline; +} /* ##### Main Copy ##### */ Modified: trunk/styles/default/page_show_feed.tpl =================================================================== --- trunk/styles/default/page_show_feed.tpl 2006-12-20 21:45:17 UTC (rev 77) +++ trunk/styles/default/page_show_feed.tpl 2006-12-20 21:46:24 UTC (rev 78) @@ -44,8 +44,17 @@ <!-- ##### Main Copy ##### --> <div id="main-copy"> + <div class="rightSideBar"> +<!-- rightSideBar --> + </div> <!-- main --> + + <div id="page-navigation"> +<!-- page-navigation --> + </div> </div> + + <!-- ##### Footer ##### --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |