Fixes Bug 782 Dä Chnopf updated # Lost Posts nicht

Author: oliveratgithub

www/actions/comments_readall.php

@@ -11,16 +11,24 @@
 
 if($user->id > 0)
 {	
-	$sql = 'DELETE from comments_unread WHERE user_id = '.$user->id;
-	$rs = $db->query($sql, __FILE__, __LINE__);
-	$num = $db->num($rs);
-	
-	$sql = 'UPDATE user SET button_use = button_use+1, posts_lost = posts_lost+'.$num.' WHERE id = '.$user->id;
-	$db->query($sql,__FILE__,__LINE__);
+	/** Get current # unread comments */
+	$currNumUnreads = Forum::getNumunreadposts($user->id);
+	if (false !== $currNumUnreads && $currNumUnreads > 0)
+	{
+		if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> To delete comments_unread for user #%d : %d', __FILE__, __LINE__, $user->id, $currNumUnreads));
 
-	header("Location: /forum.php?".session_name()."=".session_id());
+		/** Delete all unread posts */
+		$sqlDel = 'DELETE FROM comments_unread WHERE user_id = '.$user->id;
+		$rsDel = $db->query($sqlDel, __FILE__, __LINE__, 'DELETE comments_unread for user '.$user->id);
+
+		/** Updated user's total number of button-of-shame and lost posts */
+		$sqlUpd = sprintf('UPDATE user SET button_use=button_use+1, posts_lost=posts_lost+%d WHERE id=%d', $currNumUnreads, $user->id);
+		$rsUpd = $db->query($sqlUpd,__FILE__,__LINE__, 'UPDATE user SET button_use + posts_lost for user '.$user->id);
+	}
+
+	header('Location: /forum.php');
 	exit;
-	
+
 } else {
 	echo 'Du bist nicht eingeloggt.';
 }

www/includes/mysql.inc.php

@@ -115,12 +115,12 @@ function query($sql, $file='', $line=0, $funktion='') {
 		}
 
 		try {
-			$result = mysqli_query($this->conn, $sql); // DEPRECATED - PHP5 only
+			$result = mysqli_query($this->conn, $sql);
 			$sql_query_type = strtolower(substr($sql,0,6)); // first 6 chars of $sql = e.g. INSERT or UPDATE
-			if ($sql_query_type == 'insert') {
+			if ($sql_query_type === 'insert') {
 				$sql_insert_id = mysqli_insert_id($this->conn);
 				return (is_numeric($sql_insert_id) && $sql_insert_id !== 0 ? $sql_insert_id : ($sql_insert_id !== false ? true : false));
-			} elseif ($sql_query_type == 'update') {
+			} elseif ($sql_query_type === 'update' || $sql_query_type === 'delete') {
 				$sql_affected_rows = mysqli_affected_rows($this->conn);
 				return (is_numeric($sql_affected_rows) && $sql_affected_rows !== 0 ? $sql_affected_rows : ($sql_affected_rows !== false ? true : false));
 			} elseif ($result === false && $this->display_error == 1) {

www/includes/sunrise.inc.php

@@ -104,10 +104,10 @@ class Astro_Sunrise
 	 * @var array Array containing sunrise/sunset, civil twilight, nautical twilight, astronomical twilight
 	 */
 	var $twilight = array(
-		'effective' => -.0145439,		// sunrise/sunset
+		'effective' => -.0145439,	// sunrise/sunset
 		'civil' => -.104528,		// civil twilight
 		'nautical' => -.207912,		// nautical twilight
-		'astronomical' => -.309017		// astronomical twilight
+		'astronomical' => -.309017	// astronomical twilight
 	);
 
 	/**
@@ -243,7 +243,7 @@ function calcSunrise($isRise) {
 
 		// multiples of pi
 		$A = 0.5 * M_PI; // Quarter circle
-		$B =			 M_PI; // Half circle
+		$B = 	   M_PI; // Half circle
 		$C = 1.5 * M_PI; // 3/4 circle
 		$D = 2	 * M_PI; // Full circle
 
@@ -281,7 +281,7 @@ function calcSunrise($isRise) {
 		$S /= cos($Q) * cos($E);
 
 		if (abs($S) > 1)
-			return "(Mitternachtssonne/Dauernacht)";
+			return '(Mitternachtssonne/Dauernacht)';
 
 		$S /= sqrt(-$S * $S + 1);
 		$S = $A - atan2($S, 1);
@@ -302,15 +302,15 @@ function calcSunrise($isRise) {
 		$V *= 24 / $D;
 
 		// Universal time
-		$hour = intval($U);
+		$hour	= intval($U);
 		$U		= ($U - $hour) * 60;
 		$min	= intval($U);
 		$U		= ($U - $min) * 60;
 		$sec	= intval($U);
 		$this->last_utc = gmmktime($hour, $min, $sec, $this->month, $this->mday, $this->year);
 
 		// Local time
-		$hour = intval($V);
+		$hour	= intval($V);
 		$min	= intval(($V - $hour) * 60 + 0.5);
 
 		return sprintf('%02d:%02d', $hour, $min);
@@ -346,8 +346,8 @@ function norm($a, $b) { // normalize $a to be in [0, $b)
 				ON co.country_code = ci.country_code
 			WHERE
 				ci.ip_from >= '.$user_ip.' AND ci.ip_to <= '.$user_ip.' 
-        OR ci.ip_from >= '.$user_ip.' AND ci.ip_to <= '.($user_ip+200000000).'
-      LIMIT 1'; // little trick to have more often a match
+	        OR ci.ip_from >= '.$user_ip.' AND ci.ip_to <= '.($user_ip+200000000).'
+	        LIMIT 1'; // little trick to have more often a match
 	$result = $db->query($sql,__FILE__,__LINE__);
 	$rs = $db->fetch($result);
 
@@ -362,7 +362,7 @@ function norm($a, $b) { // normalize $a to be in [0, $b)
 
 		$suncalc = new Astro_Sunrise();
 		$suncalc->setCoords($lat, $lon);
-		$suncalc->setTimezone(round($lon/15.0)+date("I"));
+		$suncalc->setTimezone(round($lon/15.0)+date('I'));
 		$suncalc->setTimestamp(time()+(3600*round($lon/15.0)+date('I')));
 		$sunrise = $suncalc->getSunrise();
 		$sunset = $suncalc->getSunset();