[ros-diffs] [frik85] 19758: RosCMS Update:

RosCMS Update:

admin_dyncontent_edit.php: "update bug" fixed
generate_page.php: page generation by translations works now the correct
way
Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php
  _____

Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php
2005-11-29 22:07:10 UTC (rev 19757)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php
2005-11-29 22:11:54 UTC (rev 19758)
@@ -451,11 +451,8 @@

`dyn_content_text1` = '".
mysql_escape_string($content_text1) ."',
    			`dyn_content_text2` = '".
mysql_escape_string($content_text2) ."',
    			`dyn_content_text3` = '".
mysql_escape_string($content_text3) ."',
-				`dyn_content_text4` = '".
addslashes($content_data) ."',
-				`dyn_content_date` = CURDATE( ) ,
-				`dyn_content_time` = CURTIME( )
+				`dyn_content_text4` = '".
addslashes($content_data) ."'
    			WHERE `dyn_id` = '$rpm_db_id' LIMIT 1
;";
-				//`dyn_content_usrname_id` = '".
$roscms_intern_account_id ."' ,
    		$content_post_lista=mysql_query($content_posta);
    		
    		$query_content = mysql_query("SELECT
dyn_content_text4, dyn_content_id, dyn_content_name
  _____

Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php
--- trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php
2005-11-29 22:07:10 UTC (rev 19757)
+++ trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php
2005-11-29 22:11:54 UTC (rev 19758)
@@ -129,7 +129,7 @@

else if ($rpm_site != "" &&
$rpm_sec2=="genpage") {
    			$sql_lang="SELECT * 
    						FROM languages
-							WHERE lang_level
!= '0' AND lang_id = '$rpm_lang'
+							WHERE lang_level
!= '0'
    						ORDER BY
'lang_level' DESC";
    		}
    		else {
@@ -208,12 +208,22 @@
    				$gentimea = $gentimea[1] +
$gentimea[0]; 
    				$pg_starta = $gentimea; 
    	
+		
+		
    				// Content:
+					
+					// Known Bug: language names
that begin with "a" will not work; reason -> ORDER BY `content_lang`
DESC" <=> content_lang = 'all'
    				$query_content =
mysql_query("SELECT * 
    						FROM content
    						WHERE
content_visible != 0 AND content_active = '1' AND (content_lang =
'$myrow_lang[0]' OR content_lang = '$w3cformat' OR content_lang = 'all')
-							ORDER BY
'content_id' ASC");
+							ORDER BY
`content_lang` DESC");
    				while($result_content =
mysql_fetch_array($query_content)) { // Content
+						/*if
($result_content['content_lang'] == "") {
+							continue;
+						}
+						if
($result_content['content_lang'] != $myrow_lang[0] ||
$result_content['content_lang'] != $w3cformat) {
+							if ()continue;
+						}*/

$data_content=$result_content['content_text'];
    					$data_page =
str_replace("[#cont_".$result_content['content_name']."]",$data_content,
$data_page);