Only in ./: 1044.patch
Common subdirectories: ../gnuheter/CVS and ./CVS
diff -u ../gnuheter/article.php ./article.php
--- ../gnuheter/article.php	Sat Aug 10 21:46:08 2002
+++ ./article.php	Wed Oct 30 03:31:11 2002
@@ -79,6 +79,8 @@
 echo "<table width=\"100%\" border=\"0\"><tr><td valign=\"top\">\n";
 themearticle($aid, $informant, $datetime, $title,
 	     $bodytext, $topic, $topicname, $topicimage, $topictext);
+echo "<br>";
+if ($anompost==1 OR $admin OR $user) { echo "<div align=\"center\"><a href=\"comments.php?op=Reply&amp;pid=0&amp;sid=$sid\"><img src=\"$uimages/comment.png\" border=\"0\" alt=\"Kommentera\"></a></div>\n";}
 echo "</td>\n<td>&nbsp;</td><td valign=\"top\" width=\"200\">";
 
 # the related links box (remake?)
@@ -98,10 +100,6 @@
 list($topstory, $ttitle) = mysql_fetch_row($result2);
 $boxstuff .= "<a href=\"article.php?sid=$topstory\">$ttitle</a></div><br><br>\n";
 $boxstuff .= "<table border=\"0\" width=\"100%\"><tr><td align=\"left\">\n";
-if ($anompost==1 OR $admin OR $user) {
-	$boxstuff .= "<a href=\"comments.php?op=Reply&amp;pid=0&amp;sid=$sid\">"
-	   . "<img src=\"$uimages/comment.png\" border=\"0\" alt=\"Kommentera\"></a>\n";
-}
 $boxstuff .= "</td><td align=\"right\">";
 $boxstuff .= "<a href=\"print.php?sid=$sid\">"
           .  "<img src=\"images/print.png\" width=\"16\" height=\"16\" "
diff -u ../gnuheter/comments.php ./comments.php
--- ../gnuheter/comments.php	Tue Oct 29 08:40:58 2002
+++ ./comments.php	Wed Oct 30 03:31:11 2002
@@ -300,6 +300,7 @@
 		list($subject) = mysql_fetch_row(mysql_query("SELECT subject FROM comments WHERE tid='$pid'"));
 	}
 
+
 	echo "<form method=\"POST\" action=\"$REQUEST_URI\">\n";
 	echo "<p><font color=\"$bgcolor2\"><b>Ditt namn:</b></font>\n";
 	if ($user) {
@@ -307,7 +308,7 @@
 		echo "<a href=\"user.php\">$cookie[1]</a> <font size=2>[ <a href=\"user.php?op=logout\">Logga ut</a> ]</font>";
 	} else {
 		echo "<font color=\"Red\">$anonymous</font><font color=\"Black\">\n";
-		echo "[ <a href=\"user.php\">Ny användare</a> ]</font>\n";
+		echo "[ <a href=\"user.php\">Ny användare</a> | <a href=\"user.php?op=commentsLogin&passOn=".urlencode($REQUEST_URI)."\">Logga in</a> ]</font>\n";
 	}
 	echo "<p><font color=\"$bgcolor2\"><b>Ärende</b></font><br>\n";
 	if (!eregi("Re:",$subject)) $subject = "Re: $subject";
Only in ./: config.php.orig
Only in ./: config.php.rej
Only in ./: config.php~
Common subdirectories: ../gnuheter/images and ./images
diff -u ../gnuheter/mainfile.php ./mainfile.php
--- ../gnuheter/mainfile.php	Tue Oct 29 08:40:58 2002
+++ ./mainfile.php	Wed Oct 30 03:31:11 2002
@@ -415,6 +415,7 @@
 	$boxstuff .= "<input class=\"textbox\" type=\"text\" name=\"uname\" size=\"12\" maxlength=\"25\"><br>\n";
 	$boxstuff .= "Lösenord<br>\n";
 	$boxstuff .= "<input class=\"textbox\" type=\"password\" name=\"pass\" size=\"12\" maxlength=\"20\"><br>\n";
+	$boxstuff .= "<input type=\"checkbox\" name=\"passOn\" value=\"".urlencode("index.php")."\" checked>Tillbaka till startsidan.<br>\n";
 	$boxstuff .= "<input type=\"hidden\" name=\"op\" value=\"login\">";
 	$boxstuff .= "<input type=\"submit\" value=\"Logga in\" class=\"button\"><br><br>\n";
 	$boxstuff .= "Har du inget konto ännu?\n";
diff -u ../gnuheter/pollcomments.php ./pollcomments.php
--- ../gnuheter/pollcomments.php	Tue Oct 29 08:40:58 2002
+++ ./pollcomments.php	Wed Oct 30 03:31:11 2002
@@ -308,7 +308,7 @@
 		echo "<a href=\"user.php\">$cookie[1]</a> <font size=2>[ <a href=\"user.php?op=logout\">Logga ut</a> ]</font>";
 	} else {
 		echo "<font color=\"Red\">$anonymous</font><font color=\"Black\">\n";
-		echo "[ <a href=\"user.php\">Ny användare</a> ]</font>\n";
+		echo "[ <a href=\"user.php\">Ny användare</a> | <a href=\"user.php?op=commentsLogin&passOn=".urlencode($REQUEST_URI)."\">Logga in</a> ]</font>\n";
 	}
 	echo "<p><font color=\"$bgcolor2\"><b>Ärende</b></font><br>\n";
 	if (!eregi("Re:",$subject)) $subject = "Re: $subject";
Common subdirectories: ../gnuheter/tables and ./tables
Common subdirectories: ../gnuheter/themes and ./themes
diff -u ../gnuheter/user.php ./user.php
--- ../gnuheter/user.php	Mon Oct 28 21:44:51 2002
+++ ./user.php	Wed Oct 30 03:31:11 2002
@@ -260,6 +260,23 @@
 	include('footer.php');
 }
 
+function commentsLogin($vidare)
+{
+	if (!isset($config)) { include("config.php"); }
+	include('header.php');
+	html_page_head(); ?>
+	<form action="user.php" method="POST">
+	<b>Logga in</b><br><br>
+	Användarnamn: <input class="textbox" type="text" name="uname" size="26" maxlength="25"><br>
+	Lösenord: <input class="textbox" type="password" name="pass" size="21" maxlength="20"><br>
+	<input type="hidden" name="op" value="login"><br>
+	<input type="hidden" name="passOn" value="<? echo $vidare; ?>">
+	<input type="submit" value="Logga in" class="button">
+	<? html_page_foot(); ?>
+	</form> <?
+	include('footer.php');
+}
+
 function main($user) {
 	global $stop;
 	if(!isset($user)) {
@@ -352,7 +369,7 @@
 
 		$areyou = substr($pass, 0, 5);
 		if ($areyou == $code) {
-		
+
 		$newpass = makePass();
 		$message = "Användarkontot '$uname' på $nuke_url "
 		         . "har den här e-postadressen kopplat till sig. "
@@ -368,7 +385,7 @@
 		mail($email, $subject, $message, "From: $adminmail\nX-Mailer: PHP/" . phpversion());
 
 	// Next step: add the new password to the database
-	
+
 		if (!$system) {
 		    $cryptpass = crypt($newpass);
 		} else {
@@ -413,7 +430,7 @@
 		include ('header.php');
 		echo "<div align=\"center\">Konfirmationskod för $uname skickad</div>\n";
 		include ('footer.php');
-    	    }		
+    	    }
 	}
     }
 }
@@ -436,8 +453,10 @@
 	setcookie("user","$info",time()+15552000); // 6 mo is 15552000
 }
 
-function login($uname, $pass) {
+function login($uname, $pass, $vidare="") {
 	global $setinfo,$system;
+	if ($vidare =="")
+		$vidare = urlencode("user.php?op=userinfo&bypass=1&uname=$uname");
 	dbconnect();
 	$sql = "SELECT pass, uid, storynum, umode, uorder, thold, noscore, "
 	     . "ublockon, theme, commentmax, sig FROM users WHERE uname='$uname'";
@@ -460,7 +479,7 @@
 			 $setinfo[umode], $setinfo[uorder], $setinfo[thold],
 			 $setinfo[noscore], $setinfo[ublockon], $setinfo[theme],
 			 $setinfo[commentmax], $setinfo[sig]);
-		Header("Location: user.php?op=userinfo&bypass=1&uname=$uname");
+		Header("Location: ".urldecode($vidare));
 	} else {
 		Header("Location: user.php?stop=1");
 	}
@@ -770,7 +789,10 @@
 		userinfo($uname, $bypass);
 		break;
 	case "login":
-		login($uname, $pass);
+		if (isset($passOn))
+			login($uname, $pass, $passOn);
+		else
+			login($uname, $pass);
 		break;
 	case "dummy":
 	// this is needed to give the cookie a chance to digest
@@ -801,6 +823,9 @@
 	case "savecomm":
 		savecomm($uid, $uname, $umode, $uorder, $thold, $noscore, $commentmax, $sig);
 		break;
+	case "commentsLogin":
+		commentsLogin($passOn);
+		break;
 	default:
 		main($user);
 		break;