[frik85] 19915: RosCMS Update: - Ros-diffs

5 Dec 2005

RosCMS Update:

* improve "Translation Interface", it's now usable!
* Website status page (latest updates, translation overview)
* start with the challenge to move the RosCMS colors to a separate file
* improve user account interface pages
Added: trunk/web/reactos.org/htdocs/roscms/colors.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php
Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_inctext.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_languages.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_seclog.php
Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php
Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php
Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php
Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/login.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/translator_help.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_accounts.php
Added: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php
Modified: trunk/web/reactos.org/htdocs/roscms/index.php
  _____  

Added: trunk/web/reactos.org/htdocs/roscms/colors.php

--- trunk/web/reactos.org/htdocs/roscms/colors.php	2005-12-05
18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/colors.php	2005-12-05
20:12:32 UTC (rev 19915)
@@ -0,0 +1,27 @@

+<?php
+    /*
+    RosCMS - ReactOS Content Management System
+    Copyright (C) 2005  Klemens Friedl &lt;frik85(a)reactos.org&gt;
+
+    This program is free software; you can redistribute it and/or
modify
+    it under the terms of the GNU General Public License as published
by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    */
+
+
+	// RosCMS Colors:
+	$roscms_intern_color0="#5984C3"; // table head line
+	$roscms_intern_color1="#E2E2E2"; // table color1
+	$roscms_intern_color2="#EEEEEE"; // table color2
+
+?>
\ No newline at end of file
Property changes on: trunk/web/reactos.org/htdocs/roscms/colors.php
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -38,7 +38,23 @@

 
 ?>
  
-<div class="contentSmall"> <span
class="contentSmallTitle">Admin
Interface - Content</span> 
+<div class="contentSmall"> <span
class="contentSmallTitle"><?php
+	if ($rpm_page == "admin") {
+		echo "Admin Interface - Content";
+	}
+	elseif ($rpm_page == "dev") {
+		echo "Dev Interface - Content";
+	}
+	elseif ($rpm_page == "trans") {
+		echo "Translator Interface - Content";
+	}
+	elseif ($rpm_page == "team") {
+		echo "Team Interface - Content";
+	}
+	else {
+		echo $rpm_page." Interface - Content";
+	}
+  ?></span> 
   <ul>
     <li><strong>Content</strong></li>
   </ul>
@@ -47,14 +63,14 @@
     sort</a></p>
     
   <?php
-	if($roscms_intern_account_level>50) {
+	if($roscms_intern_usrgrp_admin == true) {
 		$rpm_content_active="";
 		$rpm_content_active_set="";
 		if(array_key_exists("content_active", $_GET))
$rpm_content_active=$_GET["content_active"];
 		if(array_key_exists("content_active_set", $_GET))
$rpm_content_active_set=$_GET["content_active_set"];
 	
 		if ($rpm_content_active != "" AND
$rpm_content_active_set != "") {
-			$content_postc="UPDATE `content` SET
`content_active` = '$rpm_content_active' WHERE `content_id` =
'$rpm_content_active_set' LIMIT 1 ;";
+			$content_postc="UPDATE `content` SET
`content_active` = '$rpm_content_active' WHERE `content_id` = '".
$rpm_content_active_set ."' LIMIT 1 ;";
 			$content_post_listc=mysql_query($content_postc);
 		}
 	}
@@ -62,7 +78,7 @@
 
 	if ($rpm_lang_id == "") {
 		if (($roscms_intern_usrgrp_trans == true ||
$roscms_intern_usrgrp_team == true) && ($rpm_page == "trans" ||
$rpm_page == "team")) {
-			$rpm_lang_id="en";
+			$rpm_lang_id="nolang";
 		}
 		else {
 			$rpm_lang_id="all";
@@ -78,17 +94,23 @@
 			echo '<a
href="?page='.$rpm_page.'&amp;sec=content&amp;sec2=view&amp;sort='.$rpm_
sort.'&amp;filt='.$rpm_filt.'&amp;opt='.$rpm_opt.'&amp;langid=all">All</
a>';
 		}
 		echo ' | ';
+	}
+
 		if ($rpm_lang_id == "nolang") {	
 			echo '<b>International</b>';
-			$ros_cms_intern_content_lang = "AND content_lang
= 'all'";
+			if ($roscms_intern_usrgrp_admin == true) {
+				$ros_cms_intern_content_lang = "AND
content_lang = 'all'";
+			}
+			if ($roscms_intern_usrgrp_dev == true &&
$rpm_page == "dev") {
+				$ros_cms_intern_content_lang = "AND
content_lang = 'all'";
+			}
+			if (($roscms_intern_usrgrp_team == true &&
$rpm_page == "team") || ($roscms_intern_usrgrp_trans == true &&
$rpm_page == "trans")) {
+				$ros_cms_intern_content_lang = "AND
content_lang = 'all' AND content_type = 'default'";
+			}
 		}
 		else {
 			echo '<a
href="?page='.$rpm_page.'&amp;sec=content&amp;sec2=view&amp;sort='.$rpm_
sort.'&amp;filt='.$rpm_filt.'&amp;opt='.$rpm_opt.'&amp;langid=nolang">In
ternational</a>';
 		}
-	}
-	else {
-		echo '->';
-	}
 	// Languages
 	$sql_lang="SELECT * 
 				FROM languages
@@ -96,6 +118,11 @@
 				ORDER BY 'lang_level' DESC";
 	$sql_query_lang=mysql_query($sql_lang);
 	while($myrow_lang=mysql_fetch_row($sql_query_lang)) {
+		if ($roscms_intern_usrgrp_dev != true ||
$roscms_intern_usrgrp_admin != true) {
+			if ($myrow_lang[0] == "en") {
+				continue;
+			}
+		}
 		$roscms_sel_lang = $myrow_lang[0];
 		echo ' | ';
 		if ($rpm_lang_id == $roscms_sel_lang) {	
@@ -285,8 +312,8 @@
 		die("");
 	}
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
@@ -308,7 +335,7 @@
         <div align="center"> 
           <a name="<?php echo $result_content['content_id'];
?>"></a>
 		  <?php
-		  if (($roscms_intern_usrgrp_trans == true ||
$roscms_intern_usrgrp_team == true) && ($rpm_page == "trans" ||
$rpm_page == "team") && $rpm_lang_id == "en") { ?>
+		  if (($roscms_intern_usrgrp_trans == true ||
$roscms_intern_usrgrp_team == true) && ($rpm_page == "trans" ||
$rpm_page == "team") && $rpm_lang_id == "nolang") { ?>
           <a href="?page=<?php echo $rpm_page;
?>&amp;sec=content&amp;sec2=edit&amp;opt=translate&amp;<?php echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;langid='.$rpm_lang_id.'&a
mp;db_id='.$result_content['content_id']; ?>"><img
src="images/tool.gif"
alt="Translate" width="19" height="18"
border="0"></a> 
           <?php } else { ?>
           <a href="?page=<?php echo $rpm_page;
?>&amp;sec=content&amp;sec2=edit&amp;<?php echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;langid='.$rpm_lang_id.'&a
mp;db_id='.$result_content['content_id']; ?>"><img
src="images/view.gif"
alt="View" width="19" height="18"
border="0"></a> 
@@ -327,8 +354,10 @@
 			-->
 			</script>
           <a href="javascript:DeleteContent()"><img
src="images/delete.gif" alt="Delete" width="19"
height="18"
border="0"></a> 
+          <?php } 
+		  if($roscms_intern_usrgrp_admin == true ||
$roscms_intern_usrgrp_team == true) {?>
+			  <a href="<?php echo
"?page=".$rpm_page."&amp;sec=content&amp;sec2=view&amp;sort=version&amp;
filt=history&amp;opt=".$result_content['content_name']."&amp;langid=".$r
esult_content['content_lang']; ?>"><img
src="images/history.gif"
alt="Filter: history" width="19" height="18"
border="0"></a> 
           <?php } ?>
-          <a href="<?php echo
"?page=".$rpm_page."&amp;sec=content&amp;sec2=view&amp;sort=version&amp;
filt=history&amp;opt=".$result_content['content_name']."&amp;langid=".$r
esult_content['content_lang']; ?>"><img
src="images/history.gif"
alt="Filter: history" width="19" height="18"
border="0"></a> 
         </div></td>
       <td width="3%" valign="middle" bgcolor="<?php echo
$farbe;
?>"><div align="center"> 
           <?php
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -18,7 +18,23 @@

     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     */
 ?>
-<div class="contentSmall"> <span
class="contentSmallTitle">Admin
Interface - Content</span> 
+<div class="contentSmall"> <span
class="contentSmallTitle"><?php
+	if ($rpm_page == "admin") {
+		echo "Admin Interface - Content";
+	}
+	elseif ($rpm_page == "dev") {
+		echo "Dev Interface - Content";
+	}
+	elseif ($rpm_page == "trans") {
+		echo "Translator Interface - Content";
+	}
+	elseif ($rpm_page == "team") {
+		echo "Team Interface - Content";
+	}
+	else {
+		echo $rpm_page." Interface - Content";
+	}
+  ?></span> 
   <?php if(!isset($_POST['content_rad_opt']) ||
$_POST['content_rad_opt'] == "preview") { ?>
   <ul>
     <li><strong><a href="?page=<?php echo $rpm_page;
?>&sec=content&sec2=view&amp;<?php echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;langid='.$rpm_lang_id."#"
.$rpm_db_id ; ?>">Content</a></strong> 
@@ -34,7 +50,7 @@
 			WHERE content_id = '$rpm_db_id'
 			ORDER BY 'content_lang' ASC") ;
 
-	$farbe="#E2E2E2";
+	$farbe=$roscms_intern_color1;
 	
 	$result_content = mysql_fetch_array($query_content);
 	$roscms_intern_editor_content = "";
@@ -182,10 +198,6 @@
 		?>
           </font></td>
       </tr>
-      <tr> 
-        <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Action</strong></font></div></td>
-        <td valign="top" bgcolor="#EEEEEE"></td>
-      </tr>
     </table>
     <p> 
       <?php
@@ -232,12 +244,12 @@
     <p>&nbsp;</p>
     <?php
 	  } else { ?>
-    <input name="content_rad_opt" type="radio"
value="insert" <?php
if($roscms_intern_usrgrp_admin != true OR $roscms_intern_content_name ==
"") { echo "checked"; } ?>>
+    <input name="content_rad_opt" type="radio"
value="insert" <?php
if($roscms_intern_account_id != $result_content['content_usrname_id'] ||
date("Y-m-d") != $result_content['content_date']) { echo
"checked"; }
?>>
     Save (new version) &nbsp; 
     <?php 
-				if(($roscms_intern_usrgrp_admin == true
|| $roscms_intern_account_id == $result_content['content_usrname_id'])
AND $roscms_intern_content_name != ""  ) {
-			?>
-    <input name="content_rad_opt" type="radio"
value="update" <?php
if($result_content['content_editor'] != "bbcode") { echo
"checked"; }
?>>
+		if(($roscms_intern_usrgrp_admin == true ||
($roscms_intern_account_id == $result_content['content_usrname_id'] &&
date("Y-m-d") == $result_content['content_date'])) AND
$roscms_intern_content_name != "" ) {
+	?>
+    <input name="content_rad_opt" type="radio"
value="update" <?php
if($roscms_intern_account_id == $result_content['content_usrname_id'] &&
date("Y-m-d") == $result_content['content_date']) { echo
"checked"; }
?>>
     Update 
     <?php } ?>
     <?php 
@@ -299,7 +311,7 @@
 		if (array_key_exists("txt_extra", $_POST))
$content_extra=$_POST['txt_extra'];
 		if (array_key_exists("content_rad_opt", $_POST))
$content_savemode=$_POST['content_rad_opt'];
 
-		echo "<br>aa".$content_act;
+		//echo "<br>".$content_act;
 		if ($content_langa == "") {
 			$content_langa = "all";
 		}
@@ -351,20 +363,24 @@
 
 
 		if ($content_savemode == "update") {
+			$content_description = date("Y-m-d H:i:s")."
[".$roscms_intern_account_id."] ";
+			
 			$content_posta="UPDATE `content` SET
`content_name` = '". mysql_escape_string($content_contentid) ."',
 				`content_lang` = '".
mysql_escape_string($content_langa) ."',
 				`content_editor` = '".
mysql_escape_string($content_extra) ."',
 				`content_text` = '".
mysql_real_escape_string($content_data)  ."',
 				`content_visible` = '".
mysql_escape_string($content_vis) ."',
 				`content_active` = '".
mysql_escape_string($content_act) ."',
-				`content_date` = CURDATE( ) ,
-				`content_time` = CURTIME( )
+				`content_description` = '".
mysql_escape_string($content_description) ."'
 				WHERE `content_id` = '$rpm_db_id' LIMIT
1 ;";
 				//`content_active` = '1',
 				//`content_usrname_id` =
'$roscms_intern_account_id',
+				//`content_date` = CURDATE( ) ,
+				//`content_time` = CURTIME( )
 			$content_post_lista=mysql_query($content_posta);
 		}
 		elseif ($content_savemode == "translate") {
+			$content_version="1";
 			$content_postb="INSERT INTO `content` (
`content_id` , `content_name` , `content_lang` , `content_editor` ,
`content_text` , `content_version` , `content_active` ,
`content_visible` , `content_date` , `content_time` ,
`content_usrname_id`)
 				VALUES ('', '".
mysql_escape_string($content_contentid) ."', '".
mysql_escape_string($content_langa) ."', '".
mysql_escape_string($content_extra) ."', '".
mysql_real_escape_string($content_data) ."', '1', '".
mysql_escape_string($content_act) ."', '".
mysql_escape_string($content_vis) ."', CURDATE( ), CURTIME( ), '".
mysql_escape_string($roscms_intern_account_id) ."');";
 			$content_post_listb=mysql_query($content_postb);
@@ -402,9 +418,24 @@
 				WHERE content_id = '$rpm_db_id'") ;
 		$result_content = mysql_fetch_array($query_content);
 
-		echo "<p>The content
'".$result_content['content_name']."'
(id='".$rpm_db_id."') has been
saved!</p>";
-		echo "<p><a href=".$_SERVER['HTTP_REFERER'].">Back
to
the 'content edit' page</a></p>";
 
+		if ($content_savemode == "update") {
+			echo "<p>The content
'".$result_content['content_name']."'
(id='".$rpm_db_id."') has been
saved!</p>";
+			echo "<p><a
href=".$_SERVER['HTTP_REFERER'].">Back to the 'content edit'
page</a></p>";
+		}
+		else {		
+			$query_content_new_revision_preview =
mysql_query("SELECT * 
+
FROM `content` 
+
WHERE `content_name` LIKE '$content_contentid'
+
AND `content_lang` = '$content_langa'
+
AND `content_version` = ". $content_version ."
+
LIMIT 1;");
+			$result_content_new_revision_preview =
mysql_fetch_array($query_content_new_revision_preview);
+			
+			echo "<p>A new version of content
'".$result_content_new_revision_preview['content_name']."' (old
id='".$rpm_db_id."', new id='".
$result_content_new_revision_preview["content_id"] ."') has been
saved!</p>";		
+			echo "<p><a href='?page=". $rpm_page
."&amp;sec=content&amp;sec2=edit&amp;sort=". $rpm_sort
."&amp;filt=".
$rpm_filt ."&amp;langid=". $rpm_lang_id ."&amp;db_id=".
$result_content_new_revision_preview['content_id'] ."'>Go to the
'content edit' page (revision ".
$result_content_new_revision_preview["content_id"]
.")</a></p>";
+			echo "<p><a
href='".$_SERVER['HTTP_REFERER']."'>Back to the 'content
edit' page
(revision ". $result_content['content_id']
.")</a></p>";
+		}
 		echo
"<p>&nbsp;</p><p><fieldset><legend>Preview</legend><br>".$result_content
['content_text']."</fieldset></p>";
 
 }
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -296,8 +296,8 @@

 				ORDER BY
'$ros_cms_intern_content_sortby' $ros_cms_intern_content_sort") ;
 	}
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
@@ -315,7 +315,7 @@
 
echo $farbe2;
 
$farbe = $farbe2;
 								}
-							 ?>"
title="RosCMS action buttons:&#10;&#10;* View content&#10;* Delete
content&#10;* Locked"> 
+							 ?>"> 
         <div align="center"><a
href="?page=admin&amp;sec=dyncontent&amp;sec2=edit&amp;<?php echo
'sec3='.$result_content['dyn_content_name'].'&amp;sort='.$rpm_sort.'&amp
;filt='.$rpm_filt.'&amp;filt2='.$rpm_filt2.'&amp;langid='.$rpm_lang_id.'
&amp;db_id='.$result_content['dyn_id']; ?>"><img
src="images/view.gif"
alt="View" width="19" height="18"
border="0"></a> 
           <a href="<?php echo
"?page=admin&amp;sec=dyncontent&amp;sec2=view&amp;sort=version&amp;filt=
history&amp;opt=".$result_content['dyn_content_id']."&amp;filt2=".$rpm_f
ilt2."&amp;langid=".$result_content['dyn_content_lang'];
?>"><img
src="images/history.gif" alt="Filter: history" width="19"
height="18"
border="0"></a> 
         </div></td>
  _____  

Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -38,7 +38,7 @@

 			WHERE dyn_id = '$rpm_db_id'
 			ORDER BY 'dyn_content_lang' ASC") ;
 
-	$farbe="#E2E2E2";
+	$farbe=$roscms_intern_color1;
 	
 	$result_content = mysql_fetch_array($query_content);
 	$roscms_intern_editor_content =
$result_content['dyn_content_text4'];
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -263,8 +263,8 @@

 				ORDER BY '$ros_cms_intern_pages_sortby'
$ros_cms_intern_pages_sort") ;
 	}
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_inctext.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_inctext.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_inctext.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -209,8 +209,8 @@

 				ORDER BY
'$ros_cms_intern_inctext_sortby' $ros_cms_intern_inctext_sort") ;
 	}
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_languages.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_languages.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_languages.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -37,8 +37,8 @@

 			FROM languages
 			ORDER BY 'lang_name' ASC") ;
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_pages.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_pages.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -252,8 +252,8 @@

 				ORDER BY '$ros_cms_intern_pages_sortby'
$ros_cms_intern_pages_sort") ;
 	}
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -32,7 +32,7 @@

 			WHERE page_id = '$rpm_db_id'
 			ORDER BY 'page_language' ASC") ;
 
-	$farbe="#E2E2E2";
+	$farbe=$roscms_intern_color1;
 	
 	$result_page = mysql_fetch_array($query_page);
 ?>
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_seclog.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_seclog.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_seclog.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -62,8 +62,8 @@

 			FROM roscms_security_log
 			ORDER BY 'roscms_sec_log_id' DESC") ;
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
  _____  

Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -201,8 +201,8 @@

 				ORDER BY '$ros_cms_intern_users_sortby'
$ros_cms_intern_users_sort") ;
 	}
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
  _____  

Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php
---
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php
2005-12-05 18:45:09 UTC (rev 19914)
+++
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -113,8 +113,8 @@

 				ORDER BY '$ros_cms_intern_users_sortby'
$ros_cms_intern_users_sort") ;
 	}
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_groups.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -41,8 +41,8 @@

 			FROM usergroups
 			ORDER BY 'usrgroup_securitylevel' ASC ;") ;
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
  _____  

Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_sessions.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -53,8 +53,8 @@

 			FROM user_sessions
 			ORDER BY 'usersession_timestamp_touch2' DESC ;")
;
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$farbe1=$roscms_intern_color1;
+	$farbe2=$roscms_intern_color2;
 	$zaehler="0";
 	//$farbe="#CCCCC";
 	
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php
--- trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -349,7 +349,12 @@

 
$data_page = str_replace("[#link_".$roscms_pagename."]",
$roscms_intern_path_server.$roscms_intern_path_gererator."?page=$rpm_pag
e&amp;sec=generator&amp;sec2=view&amp;site=".$roscms_pagename."&amp;lang
=".$myrow_lang[0]."&amp;forma=".$w3cformat."&amp;skin=".$rpm_skin,$data_
page); // correct link
 
}
 
else {
-
$data_page = str_replace("[#link_".$roscms_pagename."]",
$roscms_intern_path_server.$roscms_intern_path_html.$myrow_lang[0]."/".$
roscms_pagename.".".$fileformat,$data_page); // correct link
+
if ($result_page_link['pages_extention'] == "default") {
+
$data_page = str_replace("[#link_".$roscms_pagename."]",
$roscms_intern_path_server.$roscms_intern_path_html.$myrow_lang[0]."/".$
roscms_pagename.".".$fileformat,$data_page); // correct link
+
}
+
else {
+
$data_page = str_replace("[#link_".$roscms_pagename."]",
$roscms_intern_path_server.$roscms_intern_path_html.$myrow_lang[0]."/".$
roscms_pagename.".".$result_page_link['pages_extention'],$data_page);
//
correct link
+
}
 
}
 
//echo " HTML:
[#link_".$result_page_link['page_name']."]<br>";
 								}
@@ -363,7 +368,12 @@
 
$data_page = str_replace("[#link_".$roscms_pagename."]",
$roscms_intern_path_server.$roscms_intern_path_gererator."?page=$rpm_pag
e&amp;sec=generator&amp;sec2=view&amp;site=".$roscms_pagename."&amp;lang
=".$myrow_lang[0]."&amp;forma=".$w3cformat."&amp;skin=".$rpm_skin,$data_
page); // correct link
 
}
 
else {
-
$data_page = str_replace("[#link_".$roscms_pagename."]",
$roscms_intern_path_server.$roscms_intern_path_xhtml.$myrow_lang[0]."/".
$roscms_pagename.".".$fileformat,$data_page); // correct link
+
if ($result_page_link['pages_extention'] == "default") {
+
$data_page = str_replace("[#link_".$roscms_pagename."]",
$roscms_intern_path_server.$roscms_intern_path_xhtml.$myrow_lang[0]."/".
$roscms_pagename.".".$fileformat,$data_page); // correct link
+
}
+
else {
+
$data_page = str_replace("[#link_".$roscms_pagename."]",
$roscms_intern_path_server.$roscms_intern_path_xhtml.$myrow_lang[0]."/".
$roscms_pagename.".".$result_page_link['pages_extention'],$data_page);
// correct link
+
}
 
}
 
//echo " XHTML:
[#link_".$result_page_link['page_name']."]<br>";
 								}
@@ -378,15 +388,21 @@
 					switch ($rpm_sec2) {
 						case "genpage": //
generate a single page
 						case "output":
-							// create HTML
file:
-
$filename_page_html =
$roscms_path_formatfile.$myrow_lang[0]."/".$roscms_pagename_file.".".$fi
leformat; // create HTML file
+							// create HTML
file:					
+							if
($result_page['pages_extention'] == "default") {
+
$output_fileformat = $fileformat;
+							}
+							else {
+
$output_fileformat = $result_page['pages_extention'];
+							}
+
$filename_page_html =
$roscms_path_formatfile.$myrow_lang[0]."/".$roscms_pagename_file.".".$ou
tput_fileformat; // create HTML file
 							$fp =
fopen($filename_page_html,"w");
 							flock($fp,2);
 
fputs($fp,$data_page); // write content
 
fputs($fp,"\n\n<!-- Generated with ".$roscms_intern_version."
-->");
 							flock($fp,3);
 							fclose($fp);
-							echo
"<br>&nbsp;&nbsp;&nbsp;&nbsp;* &nbsp;
\"".$roscms_path_formatfile.$myrow_lang[0]."/".$roscms_pagename_file."."
.$fileformat."\" generated";
+							echo
"<br>&nbsp;&nbsp;&nbsp;&nbsp;* &nbsp;
\"".$roscms_path_formatfile.$myrow_lang[0]."/".$roscms_pagename_file."."
.$output_fileformat."\" generated";
 
$page_gen_id=$result_page['page_id'];
 
$page_gen_timestamp=time();
 
$page_gen_timestamp_query="UPDATE `pages` SET `page_generate_usrid` =
'$roscms_intern_account_id', `page_generate_timestamp` =
'$page_gen_timestamp' WHERE `page_id` = '$page_gen_id' LIMIT 1 ;";
@@ -400,7 +416,7 @@
 								echo("
&nbsp; (" . $showtimea . " sec;
#".$roscms_intern_page_counter.")");
 
$roscms_intern_page_counter++;
 							break;
-						default:
+						default:
 						case "view":
 							echo $data_page;
 							echo "\n\n<!--
Generated with ".$roscms_intern_version." -->";
  _____  

Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php
--- trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php	2005-12-05
18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php	2005-12-05
20:12:32 UTC (rev 19915)
@@ -0,0 +1,72 @@

+<?php
+    /*
+    RosCMS - ReactOS Content Management System
+    Copyright (C) 2005  Klemens Friedl &lt;frik85(a)reactos.org&gt;
+
+    This program is free software; you can redistribute it and/or
modify
+    it under the terms of the GNU General Public License as published
by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    */
+	
+
+//
+// The format of this file is ---> $roscms_langres['message'] =
'text';
+//
+
+
+// Language settings
+$roscms_langres['charset'] = 'iso-8859-1';
+$roscms_langres['lang_code'] = 'ES';
+
+			   
+// main menu
+$roscms_langres['Navigation'] = 'Navigation';
+$roscms_langres['Home'] = 'Home';
+$roscms_langres['Dev'] = 'Development';
+$roscms_langres['Community'] = 'Community';
+$roscms_langres['Support'] = 'Support';
+$roscms_langres['myReactOS'] = 'myReactOS';
+
+// Login bar:
+$roscms_langres['Account'] = 'Account';
+$roscms_langres['Login'] = 'Login';
+$roscms_langres['Logout'] = 'Logout';
+$roscms_langres['Global_Login_System'] = 'Global Login System';
+$roscms_langres['Register_Account'] = 'Register Account';
+$roscms_langres['Login_Nick'] = '&nbsp;Nick:&nbsp;';
+$roscms_langres['LoginPwd'] = '&nbsp;Pwd:&nbsp;';
+
+
+// myReactOS menu
+$roscms_langres['User_Profil_Overview'] = 'User Profile Overview';
+$roscms_langres['User_Profil'] = 'User Profile';
+$roscms_langres['Overview'] = 'Overview';
+$roscms_langres['Login_System'] = 'Login System';
+$roscms_langres['Messages'] = 'Messages';
+$roscms_langres['Contacts'] = 'Contacts';
+$roscms_langres['Favorites'] = 'Favorites';
+$roscms_langres['Documentation'] = 'Documentation';
+$roscms_langres['Account_Edit'] = 'Settings';
+$roscms_langres['Accountlist'] = 'User List';
+
+
+// myReactOS Content
+$roscms_langres['myReactOS_description'] = 'A powerful and easy to use
interface to manage your ReactOS homepage account.';
+$roscms_langres['Account_Information'] = 'Account Information';
+$roscms_langres['Account_Information_description'] = 'A sum up of the
account data ... &lt;placeholder&gt;';
+
+// Right side bar:
+$roscms_langres['Latest_Release'] = 'Latest Release';
+$roscms_langres['myReactOS_Developer_Quotes'] = 'Developer Quotes';
+
+?>
Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/lang/es.php
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/login.php
--- trunk/web/reactos.org/htdocs/roscms/inc/login.php	2005-12-05
18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/login.php	2005-12-05
20:12:32 UTC (rev 19915)
@@ -157,6 +157,30 @@

 	}
 }
 
+// Account level:
+
+if ($roscms_intern_usrgrp_sadmin == true) {
+	$roscms_intern_account_level = 100;
+}
+else {
+	if ($roscms_intern_usrgrp_admin == true) {
+		$roscms_intern_account_level = 75;
+	}
+	else {
+		if ($roscms_intern_usrgrp_dev == true) {
+			$roscms_intern_account_level = 50;
+		}
+		else {
+			if ($roscms_intern_usrgrp_team == true ||
$roscms_intern_usrgrp_trans == true) {
+				$roscms_intern_account_level = 25;
+			}
+			else {
+				$roscms_intern_account_level = 0;
+			}
+		}
+	}
+}
+
 // user id
 $roscms_intern_account_id = $roscms_currentuser_id;
 $roscms_intern_login_check_username=$result_usr['user_name'];
@@ -164,7 +188,6 @@
 // quick hack to test RosCMS; the following vars will change soon
 $roscms_intern_login_check_usrgroup = "ros_sadmin";
 $roscms_intern_account_group = "ros_sadmin";
-$roscms_intern_account_level = 100;
 $roscms_intern_login_check = "valid"; // valid login sequenze
 
 ?>
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/translator_help.php
--- trunk/web/reactos.org/htdocs/roscms/inc/translator_help.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/translator_help.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -23,7 +23,7 @@

 <h2>Intro</h2>
 <p>Welcome to the Translator Interface!</p>
 <p>If you use the RosCMS the first time, please take some time and read
this documentation. 
-  If you have any question about RosCMS, join the #reactos-hp irc
channel and/or 
+  If you have any question about RosCMS, join the #reactos-web irc
channel and/or 
   ask one of the admins.</p>
 <h3>About RosCMS</h3>
 <p>The RosCMS has been written from scratch by Klemens Friedl (frik85).
Some parts 
@@ -43,7 +43,7 @@
   <li><em>To be continued! [...]</em></li>
 </ul>
 <p>If you do NOT follow the rules, a member of the admin group will
delete your 
-  translator group memebership and/or ban/kick your account!</p>
+  translator group membership and/or ban/kick your account!</p>
 
 <h2>General</h2>
   <p align="left">Use the &quot;filter &amp; sort&quot;
function to
browse through 
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php
--- trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/user_account_edit.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -32,7 +32,7 @@

 
 	$query_contenta = mysql_query("SELECT * FROM users WHERE user_id
= '".$roscms_intern_account_id."'") ;
 
-	$farbe="#E2E2E2";
+	$farbe=$roscms_intern_color1;
 	
 	$result_contenta = mysql_fetch_array($query_contenta);
 	
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_accounts.php
--- trunk/web/reactos.org/htdocs/roscms/inc/user_accounts.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/user_accounts.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -36,6 +36,7 @@

 	
 ?> 
 <h1>myReactOS - User Accounts </h1>
+<p>myReactOS user accounts sorted by account name</p>
   
 <?php
 
@@ -49,7 +50,7 @@
 	$roscms_SET_curpos = 0;
 }
 
-$query_count_cat=mysql_query("SELECT * 
+$query_count_cat=mysql_query("SELECT COUNT('user_id') 
 								FROM
`users` 
 								WHERE
`user_account_enabled` = 'yes'
 								AND
`user_account_hidden` = 'no'
@@ -60,7 +61,12 @@
 	$j=0;
 	for ($i=0; $i < $result_count_cat[0]; $i +=
$roscms_intern_items_per_page) {
 		$j++;
-		echo "<a
href='?page=user&amp;sec=accountlist&amp;curpos=".$i."'>".$j."</a>
";
+		if ($roscms_SET_curpos == $i) {
+			echo "<b>".$j."</b> ";
+		}
+		else {
+			echo "<a
href='?page=user&amp;sec=accountlist&amp;curpos=".$i."'>".$j."</a>
";
+		}
 	}
 	$j=0;
 	echo "</p>";
@@ -68,16 +74,16 @@
 ?> 
 <table width="100%" border="0" cellpadding="1"
cellspacing="1">
   <tr bgcolor="#5984C3"> 
-    <td> <div align="center"></div>
-      <div align="center"><font color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Nick</strong></font></div></td>
-    <td> <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica, sans-serif"></font></div>
-      <div align="center"><font color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Fullname</strong></font></div></td>
-    <td bgcolor="#5984C3"> <div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Occupation</strong></font></div>
-      <div align="center"><font color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"></font></div>
+    <td bgcolor="#5984C3"> <div
align="center"></div>
+    <div align="center"><font color="<?php echo
$roscms_intern_color0;
?>" face="Arial, Helvetica,
sans-serif"><strong>Nick</strong></font></div></td>
+    <td> <div align="center"><font color="<?php echo
$roscms_intern_color0; ?>" face="Arial, Helvetica,
sans-serif"></font></div>
+      <div align="center"><font color="<?php echo
$roscms_intern_color0; ?>" face="Arial, Helvetica,
sans-serif"><strong>Fullname</strong></font></div></td>
+    <td bgcolor="#5984C3"> <div align="center"><font
color="<?php echo
$roscms_intern_color0; ?>" face="Arial, Helvetica,
sans-serif"><strong>Occupation</strong></font></div>
+      <div align="center"><font color="<?php echo
$roscms_intern_color0; ?>" face="Arial, Helvetica,
sans-serif"></font></div>
       <div align="center"></div></td>
-    <td width="13%"> <div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica, sans-serif"><strong> 
+    <td width="13%"> <div align="center"><font
color="<?php echo
$roscms_intern_color0; ?>" face="Arial, Helvetica,
sans-serif"><strong> 
         Country</strong></font></div></td>
-    <td width="10%"> <div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Lang</strong></font></div></td>
+    <td width="10%"> <div align="center"><font
color="<?php echo
$roscms_intern_color0; ?>" face="Arial, Helvetica,
sans-serif"><strong>Lang</strong></font></div></td>
   </tr>
   <?php
 
@@ -88,10 +94,10 @@
 
ORDER BY `user_name` ASC
 
LIMIT " . $roscms_SET_curpos . " , " . $roscms_intern_items_per_page .
"
;") ;
 
-	$farbe1="#E2E2E2";
-	$farbe2="#EEEEEE";
+	$color1=$roscms_intern_color1;
+	$color2=$roscms_intern_color2;
 	$zaehler="0";
-	//$farbe="#CCCCC";
+	//$color="#CCCCC";
 	
 	while($result_page = mysql_fetch_array($query_page)) { // users
 ?>
@@ -99,13 +105,13 @@
     <td valign="middle" bgcolor="<?php
 
$zaehler++;
 								if
($zaehler == "1") {
-
echo $farbe1;
-
$farbe = $farbe1;
+
echo $color1;
+
$color = $color1;
 								}
 								elseif
($zaehler == "2") {
 
$zaehler="0";
-
echo $farbe2;
-
$farbe = $farbe2;
+
echo $color2;
+
$color = $color2;
 								}
 							 ?>"> 
       <div align="center"></div>
@@ -115,25 +121,25 @@
 			echo "<a
href='?page=user&sec=profil&sec2=".$result_page['user_id']."'>".$result_
page['user_name']."</a>";
 		?>
       </font></td>
-    <td valign="middle" bgcolor="<?php echo $farbe; ?>">

+    <td valign="middle" bgcolor="<?php echo $color; ?>">

       <div align="center"></div>
       <font face="Arial, Helvetica, sans-serif"> 
       <?php 
 			echo $result_page['user_fullname'];
 		?>
       </font></td>
-    <td valign="middle" bgcolor="<?php echo $farbe;
?>"><font
face="Arial, Helvetica, sans-serif"> 
+    <td valign="middle" bgcolor="<?php echo $color;
?>"><font
face="Arial, Helvetica, sans-serif"> 
       <?php 
 			echo
substr(htmlentities($result_page['user_occupation'], ENT_QUOTES), 0,
10);
 		?>
       </font> <div align="right"><font face="Arial,
Helvetica,
sans-serif"> </font></div>
       <div align="center"><font face="Arial, Helvetica,
sans-serif">
</font></div></td>
-    <td width="13%" valign="middle" bgcolor="<?php echo
$farbe; ?>">
<div align="center"><font face="Arial, Helvetica,
sans-serif"> 
+    <td width="13%" valign="middle" bgcolor="<?php echo
$color; ?>">
<div align="center"><font face="Arial, Helvetica,
sans-serif"> 
         <?php 
 			echo $result_page['user_country'];;
 		?>
         </font></div></td>
-    <td width="10%" valign="middle" bgcolor="<?php echo
$farbe; ?>">
<div align="center"><font face="Arial, Helvetica,
sans-serif"> 
+    <td width="10%" valign="middle" bgcolor="<?php echo
$color; ?>">
<div align="center"><font face="Arial, Helvetica,
sans-serif"> 
         <?php 
 			echo $result_page['user_language'];
 		?>
  _____  

Added: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php
--- trunk/web/reactos.org/htdocs/roscms/inc/website_status.php
2005-12-05 18:45:09 UTC (rev 19914)
+++ trunk/web/reactos.org/htdocs/roscms/inc/website_status.php
2005-12-05 20:12:32 UTC (rev 19915)
@@ -0,0 +1,284 @@

+<?php
+    /*
+    RosCMS - ReactOS Content Management System
+    Copyright (C) 2005  Klemens Friedl &lt;frik85(a)reactos.org&gt;
+
+    This program is free software; you can redistribute it and/or
modify
+    it under the terms of the GNU General Public License as published
by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    */
+
+// To prevent hacking activity:
+if ( !defined('ROSCMS_SYSTEM') )
+{
+	if ( !defined('ROSCMS_SYSTEM_LOG') ) {
+		define ("ROSCMS_SYSTEM_LOG", "Hacking attempt");
+	}
+	$seclog_section="roscms_interface";
+	$seclog_level="50";
+	$seclog_reason="Hacking attempt: webtransstatus";
+	define ("ROSCMS_SYSTEM", "Hacking attempt");
+	include('securitylog.php'); // open security log
+	die("Hacking attempt");
+}
+?>
+<h1><a href="http://www.reactos.org/?page=dev">ReactOS
Development</a>
&gt; Website  Status</h1>
+<h2>Website Status</h2>
+<h3>Website Content Updates</h3>
+<table cellpadding="1" cellspacing="1">
+  <tr bgcolor="#5984C3">
+    <td width="200">
+    <div align="center"><font color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Title</strong></font></div></td>
+    <td width="250"><div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Description</strong></font></div></td>
+    <td width="150"><div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Filename</strong></font></div></td>
+    <td width="150">
+    <div align="center"><font color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Language</strong></font></div></td>
+    <td width="150"><div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica, sans-serif"><strong>Date &amp; Time
</strong></font></div></td>
+  </tr>
+  <?php
+
+	$query_updates = mysql_query("SELECT * 
+
FROM `content` 
+
WHERE `content_active` = 1
+
AND `content_visible` = 1
+
AND `content_type` = 'default'
+
ORDER BY `content_id` DESC 
+
LIMIT 0 , 10 ;") ;
+	$color="";
+	$color1=$roscms_intern_color1;
+	$color2=$roscms_intern_color2;
+	$colorcounter="0";
+	//$farbe="#CCCCC";
+	
+	while($result_updates = mysql_fetch_array($query_updates)) {
+?>
+  <tr>
+    <td valign="middle" bgcolor="<?php
+
$colorcounter++;
+								if
($colorcounter == "1") {
+
echo $color1;
+
$color = $color1;
+								}
+								elseif
($colorcounter == "2") {
+
$colorcounter="0";
+
echo $color2;
+
$color = $color2;
+								}
+							 ?>"><font
face="Arial, Helvetica, sans-serif" size="2"><b>
+      <?php 
+							 
+			$query_count_title=mysql_query("SELECT
COUNT('page_id')
+
FROM `pages` 
+
WHERE `page_name` LIKE '".$result_updates['content_name']."'
;");	
+			$result_count_title =
mysql_fetch_row($query_count_title);
+			
+			if ($result_updates['content_lang']=="all") {
+				$updates_lang = "en";
+			}
+			else {
+				$updates_lang =
$result_updates['content_lang'];
+			}
+			
+			
+			if ($result_count_title[0] == "0" ||
$result_count_title[0] == "") {
+				echo $result_updates['content_name'];
+			}
+			else { 
+				$query_lang_page_name_update =
mysql_query("SELECT * 
+
FROM `pages` 
+
WHERE `page_name` = '". $result_updates['content_name'] ."'
+
AND (`page_language` = 'all' OR `page_language` = 'en')
+
AND `page_active` = 1
+
AND `page_visible` = 1 ;") ;
+				$result_lang_page_name_update =
mysql_fetch_array($query_lang_page_name_update);
+		
+				echo
$result_lang_page_name_update['page_title'];
+			
+			}
+		?>
+    </b></font></td>
+    <td valign="middle" bgcolor="<?php echo $color;
?>"><font
face="Arial, Helvetica, sans-serif" size="2">
+      <?php 
+							 
+			if ($result_count_title[0] == "0" ||
$result_count_title[0] == "") {
+				// temp
+			}
+			else { 
+
+		
+				echo
$result_lang_page_name_update['page_description'];
+			}
+		?>
+    </font></td>
+    <td valign="middle" bgcolor="<?php echo $color;
?>"><font
face="Arial, Helvetica, sans-serif" size="2"><b>
+      <?php 
+							 
+			if ($result_count_title[0] == "0" ||
$result_count_title[0] == "") {
+				echo $result_updates['content_name'];
+			}
+			else { 
+				echo '<a
href="../?page='.$result_updates['content_name'].'&amp;lang='.$updates_l
ang.'">'.$result_updates['content_name'].'</a>';
+			}
+		?>
+    </b></font></td>
+    <td valign="middle" bgcolor="<?php echo $color;
?>"><div
align="center"><font face="Arial, Helvetica, sans-serif"
size="2">
+	<?php 
+		$query_lang_name_update = mysql_query("SELECT * 
+								FROM
`languages` 
+								WHERE
`lang_id` = '". $updates_lang ."' ;") ;
+		$result_lang_name_update =
mysql_fetch_array($query_lang_name_update);
+
+		echo $result_lang_name_update['lang_name'];
+	?>
+    </font></div></td>
+    <td valign="middle" bgcolor="<?php echo $color;
?>"><div
align="center"><font face="Arial, Helvetica, sans-serif"
size="2">
+        <?php 
+		echo $result_updates['content_date'].'
'.$result_updates['content_time'];
+	?>
+    </font></div></td>
+  </tr>
+  <?php	
+	}	// end while
+?>
+</table>
+<h3>Website Translation Status</h3>
+<p>This page show the current website translation status.</p>
+<table cellpadding="1" cellspacing="1">
+  <tr bgcolor="#5984C3">
+    <td width="200"><div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica, sans-serif"><strong>Title
</strong></font></div></td>
+    <td width="200">      <div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Filename</strong></font></div></td>
+    <td width="100">      <div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>English</strong></font></div></td>
+	<?php
+		$query_lang_names = mysql_query("SELECT * 
+
FROM `languages` 
+
WHERE `lang_level` <=9
+
ORDER BY `lang_level` DESC ;") ;
+		while($result_lang_names =
mysql_fetch_array($query_lang_names)) {
+	?>
+    <td width="100">
+    <div align="center"><font color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong><?php echo
$result_lang_names["lang_name"];
?></strong></font></div></td>
[truncated at 1000 lines; 167 more skipped] 



    