[Feed-collector-svn] SF.net SVN: feed-collector: [102] trunk
Status: Beta
Brought to you by:
c167
Menu
▾
▴
[Feed-collector-svn] SF.net SVN: feed-collector: [102] trunk
|
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.
|
