RosCMS update:

* content edit interface: content type bug fixed
* login function: add a link to the "too many sessions" error message -> this link allow user to delete their old sessions (and reset their password)
* website status page: fix the language detection routine

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/login.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php

--- trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php	2005-12-12 20:30:09 UTC (rev 20114)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php	2005-12-12 20:39:52 UTC (rev 20115)
@@ -405,7 +405,7 @@

 				`content_visible` = '". mysql_escape_string($content_vis) ."',
 				`content_active` = '". mysql_escape_string($content_act) ."',
 				`content_description` = '". mysql_escape_string($content_description) ."',

-				`content_type` = '". mysql_escape_string($content_description) ."'

+				`content_type` = '". mysql_escape_string($content_typea) ."'

 				WHERE `content_id` = '$rpm_db_id' LIMIT 1 ;";
 				//`content_active` = '1',
 				//`content_usrname_id` = '$roscms_intern_account_id',

--- trunk/web/reactos.org/htdocs/roscms/inc/login.php	2005-12-12 20:30:09 UTC (rev 20114)
+++ trunk/web/reactos.org/htdocs/roscms/inc/login.php	2005-12-12 20:39:52 UTC (rev 20115)
@@ -93,7 +93,7 @@

 	$roscms_intern_timeout_option = $result_usr['user_setting_timeout'];
 }
 else { // only hacker/cracker/script kiddy/brute force script/bot/etc. is able to reach this part

-	die("<blink>No valid user session found!<br><br>You are a hacker/cracker/script kiddy/brute force script/bot/etc.<br><br>RosCMS does not like you, anymore! Your ip address, etc. has been saved and you are on the watch list!</blink>");

+	die("<blink>No valid user session found!</blink><p><a href='http://www.reactos.org/roscms/?page=getpwd'>Delete all old sessions and login again!</a> (this function will also allow you to set a new password)</p>");

 	// TODO: add it to the watchlist!
 }
 

--- trunk/web/reactos.org/htdocs/roscms/inc/website_status.php	2005-12-12 20:30:09 UTC (rev 20114)
+++ trunk/web/reactos.org/htdocs/roscms/inc/website_status.php	2005-12-12 20:39:52 UTC (rev 20115)
@@ -214,7 +214,7 @@

 				$query_lang_page_name_trans = mysql_query("SELECT * 
 															FROM `pages` 
 															WHERE `page_name` = '". $result_page['content_name'] ."'

-															AND (`page_language` = 'all' OR `page_language` = 'en') 

+															AND (`page_language` = 'all' OR `page_language` = 'en' OR `page_language` = '". $result_page['content_lang'] ."') 

 															AND `page_active` = 1
 															AND `page_visible` = 1 ;") ;
 				$result_lang_page_name_trans = mysql_fetch_array($query_lang_page_name_trans);
@@ -238,10 +238,10 @@

 		?></font></td>
     <td valign="middle" bgcolor="<?php echo $color; ?>"><div align="center"><font face="Arial, Helvetica, sans-serif" size="2"><?php 
 		if ($link_current_line == "true") {

-			echo '<a href="../?page='.$result_page['content_name'].'&amp;lang=en">done</a>';

+			echo '<a href="../?page='.$result_page['content_name'].'&amp;lang=en">'. $result_page['content_date'] .'</a>';

 		}
 		else {

-			echo "done";

+			echo $result_page['content_date'];

 		}
 	?></font></div></td>
 	<?php
@@ -263,13 +263,12 @@

 			$result_count_lang_item = mysql_fetch_row($query_count_lang_item);
 			if ($result_count_lang_item[0] != "0" && $result_count_lang_item[0] != "") {
 				if ($link_current_line == "true") {

-					echo '<a href="../?page='.$result_page['content_name'].'&amp;lang='.$result_lang_name['lang_id'].'">done</a>';

+					echo '<a href="../?page='.$result_page['content_name'].'&amp;lang='.$result_lang_name['lang_id'].'">'. $result_page['content_date'] .'</a>';

 				}
 				else {

-					echo "done";

+					echo $result_page['content_date'];

 				}
 			}

-	

 	?></font></div></td>
 	<?php	
 		}