Ros-diffs

ros-diffs@reactos.org

81390 discussions

[frik85] 19276: RosCMS (Part 2)
by frik85＠svn.reactos.com 16 Nov '05

16 Nov '05

RosCMS (Part 2) Added: trunk/web/reactos.org/htdocs/roscms/inc/ Added: trunk/web/reactos.org/htdocs/roscms/inc/404.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_generate_menu.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_generate_menu_topframe.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_help.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_inctext.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_languages.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_languages_edit.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_overview.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_delete.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_save.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_seclog.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_seclog_edit.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_check.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_deluser.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_fix.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/404.php --- trunk/web/reactos.org/htdocs/roscms/inc/404.php 2005-11-16 21:17:43 UTC (rev 19275) +++ trunk/web/reactos.org/htdocs/roscms/inc/404.php 2005-11-16 21:19:57 UTC (rev 19276) @@ -0,0 +1,46 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Ge van Geldorp <gvg(a)reactos.org> + Klemens Friedl <frik85(a)reactos.org> + + 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: noaccess.php"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); +} +?> +<h1>404 - Page not found</h1> +<h2>Page not found</h2> +<p>Our Web server cannot find the page or file you asked for.</p> +<p>The link you followed may be broken or expired. </p> +<p>Please use one of the following links to find the information you are looking + for:</p> +<ul> + <li><a href="http://www.reactos.org/">www.reactos.org Homepage</a> </li> + <li><a href="http://www.reactos.org/?page=sitemap">www.reactos.org Sitemap</a> + </li> +</ul> Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/404.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/admin.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin.php 2005-11-16 21:17:43 UTC (rev 19275) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin.php 2005-11-16 21:19:57 UTC (rev 19276) @@ -0,0 +1,181 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + 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_admin_interface"; + $seclog_level="50"; + $seclog_reason="Hacking attempt: admin.php"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); + } + + + if ( !defined('ROSCMS_SYSTEM_ADMIN') ) { + define ("ROSCMS_SYSTEM_ADMIN", "Admin Interface"); // to prevent hacking activity + } + + if ($roscms_intern_usrgrp_admin == true) { // only for (super) admin group member + if ($rpm_site == "") { + create_head($rpm_page_title, $rpm_logo, $roscms_langres); + create_structure($rpm_page); + } + + switch ($rpm_sec) { + case "generator": // static page generator (output/view) + if ($rpm_site == "") { + echo '<div class="contentSmall"> <span class="contentSmallTitle">Admin Interface - Generator</span>'; + include("inc/generate_page.php"); + echo "</div>"; + } + else { + if ($rpm_sec3 == "menu") { + include("admin_generate_menu.php"); + } + if ($rpm_sec3 == "menutop") { + include("admin_generate_menu_topframe.php"); + } + else { + include("inc/generate_page.php"); + } + } + break; + case "generate": // generator menu page + include("inc/admin_generator.php"); + break; + case "pages": + if ($rpm_sec2=="view") { + include("inc/admin_pages.php"); + } + else if ($rpm_sec2=="edit") { + include("inc/admin_pages_edit.php"); + } + else if ($rpm_sec2=="delete") { + include("inc/admin_pages_delete.php"); + } + else if ($rpm_sec2=="save") { + include("inc/admin_pages_save.php"); + } + break; + case "content": + if ($rpm_sec2=="view") { + include("inc/admin_content.php"); + } + else if ($rpm_sec2=="edit") { + include("inc/admin_content_edit.php"); + } + else if ($rpm_sec2=="delete") { + include("inc/admin_content.php"); + //include("inc/admin_content_delete.php"); + } + else if ($rpm_sec2=="save") { + include("inc/admin_content_edit.php"); + //include("inc/admin_content_save.php"); + } + break; + case "dyncontent": + if ($rpm_sec2=="view") { + include("inc/admin_dyncontent.php"); + } + else if ($rpm_sec2=="edit") { + include("inc/admin_dyncontent_edit.php"); + } + /*else if ($rpm_sec2=="delete") { + include("inc/admin_content.php"); + //include("inc/admin_content_delete.php"); + }*/ + else if ($rpm_sec2=="save") { + include("inc/admin_dyncontent_edit.php"); + } + break; + case "inctext": + if ($rpm_sec2=="view") { + include("inc/admin_inctext.php"); + } + else if ($rpm_sec2=="edit") { + include("inc/nopermission.php"); + } + else if ($rpm_sec2=="delete") { + include("inc/nopermission.php"); + } + else if ($rpm_sec2=="save") { + include("inc/nopermission.php"); + } + break; + case "languages": + if ($rpm_sec2=="view") { + include("inc/admin_languages.php"); + } + else if ($rpm_sec2=="edit") { + include("inc/admin_languages_edit.php"); + } + else if ($rpm_sec2=="delete") { + include("inc/admin_languages.php"); + //include("inc/admin_languages_delete.php"); + } + else if ($rpm_sec2=="save") { + include("inc/admin_languages.php"); + //include("inc/admin_languages_save.php"); + } + break; + case "users": + include("inc/admin_user_accounts.php"); + break; + case "usergroups": + include("inc/admin_user_groups.php"); + break; + case "usrgrpmbr": + include("inc/admin_user_group_memebers.php"); + break; + case "sessions": + include("inc/admin_user_sessions.php"); + break; + case "seclog": + if ($rpm_sec2=="view") { + include("inc/admin_seclog.php"); + } + else if ($rpm_sec2=="edit") { + include("inc/admin_seclog_edit.php"); + } + break; + case "stats": + include("../roswebstats/rospage_stats/admin/view_stats.php"); + break; + case "help": + include("inc/admin_help.php"); + break; + case "subsys": + include("inc/admin_subsys.php"); + break; + case "overview": + default: + include("inc/admin_overview.php"); + break; + } + } + else { // for all other user groups + header("location:?page=nopermission"); + } +?> Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/admin.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php 2005-11-16 21:17:43 UTC (rev 19275) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php 2005-11-16 21:19:57 UTC (rev 19276) @@ -0,0 +1,423 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + 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: admin_content.php"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); + } + if ($rpm_page != "admin" && $rpm_page != "dev" && $rpm_page != "team" && $rpm_page != "trans") { + die(""); + } + if ($roscms_intern_usrgrp_admin == true || $roscms_intern_usrgrp_dev == true || $roscms_intern_usrgrp_team == true || $roscms_intern_usrgrp_trans == true) { + +?> + +<div class="contentSmall"> <span class="contentSmallTitle">Admin Interface - Content</span> + <ul> + <li><strong>Content</strong></li> + </ul> + <p>Action: <?php if ($roscms_intern_usrgrp_admin == true && $rpm_page == "admin") { ?><a href="?page=<?php echo $rpm_page; ?>&sec=content&sec2=edit&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&langid='.$rpm_lang_id ; ?>&db_id=new">New + Content</a> | <?php } ?><a href="?page=<?php echo $rpm_page; ?>&sec=content&sec2=view">reset filters & + sort</a></p> + + <?php + if($roscms_intern_account_level>50) { + $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_post_listc=mysql_query($content_postc); + } + } + + + 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"; + } + else { + $rpm_lang_id="all"; + } + } + echo '<p>Language: '; + if ($roscms_intern_usrgrp_dev == true || $roscms_intern_usrgrp_admin == true) { + if ($rpm_lang_id == "all") { + echo '<b>All</b>'; + $ros_cms_intern_content_lang = ""; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_ sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid=all">All</ a>'; + } + echo ' | '; + if ($rpm_lang_id == "nolang") { + echo '<b>International</b>'; + $ros_cms_intern_content_lang = "AND content_lang = 'all'"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_ sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid=nolang">In ternational</a>'; + } + } + else { + echo '->'; + } + // Languages + $sql_lang="SELECT * + FROM languages + WHERE lang_level != '0' + ORDER BY 'lang_level' DESC"; + $sql_query_lang=mysql_query($sql_lang); + while($myrow_lang=mysql_fetch_row($sql_query_lang)) { + $roscms_sel_lang = $myrow_lang[0]; + echo ' | '; + if ($rpm_lang_id == $roscms_sel_lang) { + echo '<b>'.$myrow_lang[1].'</b>'; + $ros_cms_intern_content_lang = "AND content_lang = '".$roscms_sel_lang."'"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_ sort.'&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$roscms_ sel_lang.'">'.$myrow_lang[1].'</a>'; + } + } + + + if ($rpm_filt == "") { + if ($roscms_intern_usrgrp_admin == true) { + $rpm_filt="active"; + } + if ($roscms_intern_usrgrp_dev == true && $rpm_page == "dev") { + $rpm_filt="anvc"; + } + if (($roscms_intern_usrgrp_team == true && $rpm_page == "team") || ($roscms_intern_usrgrp_trans == true && $rpm_page == "trans")) { + $rpm_filt="anvc"; + } + } + echo '<p>Filter: '; + if (($roscms_intern_usrgrp_admin == true && $rpm_page == "admin") || ($roscms_intern_usrgrp_dev == true && $rpm_page == "dev")) { + if ($rpm_filt == "active") { + echo '<b>active content</b>'; + $ros_cms_intern_content_filt = "WHERE content_active = '1'"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_ sort.'&filt=active&langid='.$rpm_lang_id.'">active content</a>'; + } + echo ' | '; + if ($rpm_filt == "all") { + echo '<b>all content</b>'; + $ros_cms_intern_content_filt = "WHERE `content_name` != ''"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_ sort.'&filt=all&langid='.$rpm_lang_id.'">all content</a>'; + } + echo ' | '; + } + if ($rpm_filt == "anvc") { + echo '<b>active and visible content</b>'; + $ros_cms_intern_content_filt = "WHERE content_active = '1' AND content_visible = '1'"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_ sort.'&filt=anvc&langid='.$rpm_lang_id.'">active and visible content</a>'; + } + echo ' | '; + if ($rpm_filt == "user") { + echo '<b>current user</b>'; + $ros_cms_intern_content_filt = "WHERE content_usrname_id = '".$roscms_intern_account_id."'"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_ sort.'&filt=user&langid='.$rpm_lang_id.'">current user</a>'; + } + if ($rpm_filt == "history") { + echo ' | <b>history</b>'; + $ros_cms_intern_content_filt = "WHERE content_name = '".$rpm_opt."'"; + } + echo '</p>'; + + if ($rpm_sort == "") { + $rpm_sort="id"; + } + echo '<p>Sorted by: '; + if ($rpm_sort == "id") { + echo '<b>content id</b>'; + $ros_cms_intern_content_sortby="content_name"; + $ros_cms_intern_content_sort="ASC"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort=id& filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">con tent id</a>'; + } + echo ' | '; + if ($rpm_sort == "date") { + echo '<b>date</b>'; + $ros_cms_intern_content_sortby="content_date"; + $ros_cms_intern_content_sort="DESC"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort=date&am p;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">d ate</a>'; + } + echo ' | '; + if ($rpm_sort == "user") { + echo '<b>user</b>'; + $ros_cms_intern_content_sortby="content_usrname_id"; + $ros_cms_intern_content_sort="ASC"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort=user&am p;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'">u ser</a>'; + } + echo ' | '; + if ($rpm_sort == "active") { + echo '<b>active</b>'; + $ros_cms_intern_content_sortby="content_active"; + $ros_cms_intern_content_sort="DESC"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort=active& amp;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'" >active</a>'; + } + echo ' | '; + if ($rpm_sort == "visible") { + echo '<b>visible</b>'; + $ros_cms_intern_content_sortby="content_visible"; + $ros_cms_intern_content_sort="DESC"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort=visible &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' ">visible</a>'; + } + echo ' | '; + if ($rpm_sort == "version") { + echo '<b>version</b>'; + $ros_cms_intern_content_sortby="content_version"; + $ros_cms_intern_content_sort="DESC"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort=version &filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.' ">version</a>'; + } + echo ' | '; + if ($rpm_sort == "language") { + echo '<b>language</b>'; + $ros_cms_intern_content_sortby="content_lang"; + $ros_cms_intern_content_sort="ASC"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort=languag e&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id. '">language</a>'; + } + echo ' | '; + if ($rpm_sort == "editor") { + echo '<b>editor</b>'; + $ros_cms_intern_content_sortby="content_editor"; + $ros_cms_intern_content_sort="DESC"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=content&sec2=view&sort=editor& amp;filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id.'" >editor</a>'; + } + echo '</p>'; + +?> + <table width="100%" border="0" cellpadding="1" cellspacing="1"> + <tr bgcolor="#5984C3"> + <td width="9%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Action</strong></font></div></td> + <td width="8%" colspan="3" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Info</strong></font></div></td> + <td width="13%" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Content + ID</strong></font></div></td> + <td width="13%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Language</strong></font></div></td> + <td width="26%" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Content</strong></font></div></td> + <td width="7%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Rev.</strong></font></div> + <div align="center"></div></td> + <td width="13%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong> + Date</strong></font></div></td> + <td width="10%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>User</strong></font></div></td> + </tr> + <?php + + if($roscms_intern_usrgrp_sadmin == true) { + $query_content = mysql_query("SELECT * + FROM content + $ros_cms_intern_content_filt $ros_cms_intern_content_lang + ORDER BY '$ros_cms_intern_content_sortby' $ros_cms_intern_content_sort") ; + /*$query_content = mysql_query("SELECT * + FROM content + $ros_cms_intern_content_filt $ros_cms_intern_content_lang + ORDER BY '$ros_cms_intern_content_sortby' $ros_cms_intern_content_sort") ;*/ + } + elseif ($roscms_intern_usrgrp_admin == true) { + $query_content = mysql_query("SELECT * + FROM content + $ros_cms_intern_content_filt AND content_visible != 0 $ros_cms_intern_content_lang + ORDER BY '$ros_cms_intern_content_sortby' $ros_cms_intern_content_sort") ; + } + elseif ($roscms_intern_usrgrp_dev == true) { + $query_content = mysql_query("SELECT * + FROM content + $ros_cms_intern_content_filt AND content_visible != 0 $ros_cms_intern_content_lang + ORDER BY '$ros_cms_intern_content_sortby' $ros_cms_intern_content_sort") ; + } + elseif ($roscms_intern_usrgrp_team == true || $roscms_intern_usrgrp_trans == true) { + $query_content = mysql_query("SELECT * + FROM content + $ros_cms_intern_content_filt AND content_visible != 0 $ros_cms_intern_content_lang + ORDER BY '$ros_cms_intern_content_sortby' $ros_cms_intern_content_sort") ; + } + else { + die(""); + } + + $farbe1="#E2E2E2"; + $farbe2="#EEEEEE"; + $zaehler="0"; + //$farbe="#CCCCC"; + + while($result_content = mysql_fetch_array($query_content)) { // content +?> + <tr> + <td width="9%" valign="middle" bgcolor="<?php + $zaehler++; + if ($zaehler == "1") { + echo $farbe1; + $farbe = $farbe1; + } + elseif ($zaehler == "2") { + $zaehler="0"; + echo $farbe2; + $farbe = $farbe2; + } + ?>"> + <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") { ?> + <a href="?page=<?php echo $rpm_page; ?>&sec=content&sec2=edit&opt=translate&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&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; ?>&sec=content&sec2=edit&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&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> + <?php + } + if($roscms_intern_usrgrp_sadmin == true) { ?> + <script type="text/javascript"> +  + </script> + <a href="javascript:DeleteContent()"><img src="images/delete.gif" alt="Delete" width="19" height="18" border="0"></a> + <?php } ?> + <a href="<?php echo "?page=".$rpm_page."&sec=content&sec2=view&sort=version& filt=history&opt=".$result_content['content_name']."&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 + if($result_content['content_active'] == "1") { ?> + <a href="<?php if($roscms_intern_usrgrp_admin == true) { echo '?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_sort. '&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id. '&content_active=0&content_active_set='.$result_content['content _id'] ; } else { echo '#'; } ?>"><img src="images/active.gif" alt="active" width="19" height="18" border="0"></a> + <?php + } + else { ?> + <a href="<?php if($roscms_intern_usrgrp_admin == true) { echo '?page='.$rpm_page.'&sec=content&sec2=view&sort='.$rpm_sort. '&filt='.$rpm_filt.'&opt='.$rpm_opt.'&langid='.$rpm_lang_id. '&content_active=1&content_active_set='.$result_content['content _id'] ; } else { echo '#'; } ?>"><img src="images/notactive.gif" alt="NOT active" width="19" height="18" border="0"></a> + <?php } ?> + </div></td> + <td width="3%" valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="center"> + <?php + if($result_content['content_visible'] == "1") { ?> + <img src="images/visible.gif" alt="visible" width="19" height="18" border="0"> + <?php + } + else { ?> + <img src="images/notvisible.gif" alt="NOT visible" width="19" height="18" border="0"> + <?php } ?> + </div></td> + <td width="3%" valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="center"> + <?php if($roscms_intern_account_level<=10) { ?> + <img src="images/lock.gif" alt="Locked" width="19" height="18"> + <?php } else if ($result_content['content_editor'] == "richtext") { ?> + <img src="images/richtexteditor.gif" alt="Rich Text Editor" width="19" height="18"> + <?php } else if ($result_content['content_editor'] == "bbcode") { ?> + <img src="images/bbcode.gif" alt="bbcode Editor" width="19" height="18"> + <?php } ?> + </div></td> + <td width="13%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="left"><font face="Arial, Helvetica, sans-serif"><?php echo "[#cont_<b>".$result_content['content_name']."</b>]"; ?></font></div></td> + <td width="13%" valign="middle" bgcolor="<?php if ($result_content['content_lang'] != "") { echo $farbe; } else { echo "#FF0000"; } ?>"> <div align="center"> + <font face="Arial, Helvetica, sans-serif"> + <?php + $cmsros_intern_temp_lang_short=$result_content['content_lang']; + $sql_lang="SELECT * + FROM languages + WHERE lang_level != '0' AND lang_id = '$cmsros_intern_temp_lang_short' + ORDER BY 'lang_level' DESC"; + $sql_query_lang=mysql_query($sql_lang); + $myrow_lang=mysql_fetch_row($sql_query_lang); // Languages + if ($myrow_lang[1] != "") { + echo $myrow_lang[1]; + } + else if ($result_content['content_lang'] != "all") { + echo $result_content['content_lang']; + } + ?> + </font></div></td> + <td width="26%" valign="middle" bgcolor="<?php echo $farbe; ?>" title="<?php + if ($result_content['content_visible'] != 1) { echo "NOT visible!\n\n"; } + echo substr(htmlentities($result_content['content_text'], ENT_QUOTES), 0, 200)."..."; + ?>"> <pre><font face="Arial, Helvetica, sans-serif"><?php + echo substr(htmlentities($result_content['content_text'], ENT_QUOTES), 0, 40)."..." ; + ?></font></pre> </td> + <td width="7%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="right"><font face="Arial, Helvetica, sans-serif"> + <?php + echo $result_content['content_version']; + ?> + </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"> + <?php + echo $result_content['content_date']." ".$result_content['content_time'];; + ?> + </font></div></td> + <td width="10%" valign="middle" bgcolor="<?php echo $farbe; ?>"> <div align="center"><font face="Arial, Helvetica, sans-serif"> + <?php + $accountinfo_query = @mysql_query("SELECT user_name, user_id FROM users WHERE user_id = '".$result_content['content_usrname_id']."'") or die('DB error (admin interface)!'); + $accountinfo_result = @mysql_fetch_array($accountinfo_query); + + $roscms_intern_accountuser = $accountinfo_result['user_name']; + if ($roscms_intern_accountuser && $roscms_intern_accountuser != "") { + echo "<b>".$roscms_intern_accountuser."</b><br><a href='?page=user&sec=profil&sec2=".$result_content['content_usrn ame_id']."' target='_blank'>Profile</a>"; + } + else { + echo "<b>RosCMS</b>"; + } + ?> + </font></div></td> + </tr> + <?php + } // end while +?> + </table> + <?php + include("inc/inc_description_table.php"); +?> +</div> +<?php + } +?> Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php 2005-11-16 21:17:43 UTC (rev 19275) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php 2005-11-16 21:19:57 UTC (rev 19276) @@ -0,0 +1,413 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + 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. + */ +?> +<div class="contentSmall"> <span class="contentSmallTitle">Admin 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&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&langid='.$rpm_lang_id."#" .$rpm_db_id ; ?>">Content</a></strong> + <ul> + <li>View content</li> + </ul> + </li> + </ul> + <?php + + $query_content = mysql_query("SELECT * + FROM content + WHERE content_id = '$rpm_db_id' + ORDER BY 'content_lang' ASC") ; + + $farbe="#E2E2E2"; + + $result_content = mysql_fetch_array($query_content); + $roscms_intern_editor_content = ""; + $roscms_intern_editor_content = $result_content['content_text']; +?> + <form name="cms_content" method="post" action="<?php //echo $_SERVER['PHP_SELF']; + echo '?page='.$rpm_page.'&sec=content&sec2=save&db_id='.$rpm_db_i d; + ?>"> + <table width="600" border="0" cellpadding="1" cellspacing="1"> + <tr bgcolor="#5984C3"> + <td width="15%" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Content + ID </strong></font></div></td> + <td width="85%" bgcolor="#E2E2E2"> <div align="left"><font face="Arial, Helvetica, sans-serif"> + [#cont_ + <input name="txt_contentid" type="text" id="txt_contentid" value="<?php echo $result_content['content_name']; ?>" size="50" maxlength="50"> + ]   (e.g. "media")</font></div></td> + </tr> + <tr> + <td valign="top" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Language</strong></font></div></td> + <td valign="top" bgcolor="#EEEEEE"><div align="left"> + <select id="txt_langa" size="1" name="txt_langa" class="selectbox"> + <?php + //echo $result_page['page_language']; + $cmsros_intern_temp_lang_short=$result_content['content_lang']; + $sql_lang="SELECT * + FROM languages + WHERE lang_level != '0' AND lang_id = '$cmsros_intern_temp_lang_short' + ORDER BY 'lang_level' DESC Limit 1"; + $sql_query_lang=mysql_query($sql_lang); + $myrow_lang=mysql_fetch_row($sql_query_lang); // Languages + ?> + <optgroup label="languages"> + <option value="all"<?php if ($cmsros_intern_temp_lang_short == "all") { echo ' selected="selected"'; } ?>>All</option> + <?php + + // Languages + $sql_langa="SELECT * + FROM languages + WHERE lang_level != '0' + ORDER BY 'lang_level' DESC"; + $sql_query_langa=mysql_query($sql_langa); + while($myrow_langa=mysql_fetch_row($sql_query_langa)) { + echo '<option value="'.$myrow_langa[0].'"'; + if ($myrow_lang[0] == $myrow_langa[0]) { + echo ' selected="selected"'; + } + echo '>'.$myrow_langa[1].'</option>'; + } + ?> + </optgroup> + <optgroup label="other"> + <option value="xhtml"<?php if ($result_content['content_lang'] == "xhtml") { echo ' selected="selected"'; } ?>>XHTML</option> + <option value="html"<?php if ($result_content['content_lang'] == "html") { echo ' selected="selected"'; } ?>>HTML</option> + </optgroup> + </select> + </div></td> + </tr> + <?php + if ($result_content['content_editor'] != "richtext" && $result_content['content_editor'] != "bbcode") { +?> + <tr> + <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Content</strong></font></div></td> + <td valign="top" bgcolor="#E2E2E2"><textarea name="textarea_content" cols="60" rows="20" id="textarea_content"><?php + //echo htmlentities(ereg_replace("&(#[0-9]{4};)", "&\\1", $roscms_intern_editor_content), ENT_QUOTES, 'UTF-8'); + echo ereg_replace("&(#[0-9]{4};)", "&\\1", htmlentities($roscms_intern_editor_content, ENT_QUOTES, 'UTF-8')) + + //echo htmlentities($roscms_intern_editor_content); + + ?></textarea></td> + </tr> + <?php + } +?> + <tr> + <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Revision</strong></font></div></td> + <td valign="top" bgcolor="#EEEEEE"><font face="Arial, Helvetica, sans-serif"> + <?php + echo $result_content['content_version']; + ?> + </font></td> + </tr> + <tr> + <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Visible</strong></font></div></td> + <td valign="top" bgcolor="#E2E2E2"><font face="Arial, Helvetica, sans-serif"> + <?php + if ($result_content['content_visible'] == 1) { + echo ' <input name="content_visible" type="radio" value="yes" checked> yes   <input type="radio" name="content_visible" value="no"> no'; + } + else { + echo ' <input name="content_visible" type="radio" value="yes"> yes   <input type="radio" name="content_visible" value="no" checked> no'; + } + ?> + </font></td> + </tr> + <tr> + <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Active</strong></font></div></td> + <td valign="top" bgcolor="#EEEEEE"><font face="Arial, Helvetica, sans-serif"> + <?php + if ($result_content['content_active'] == 1) { + echo ' <input name="content_active" type="radio" value="yes" checked> yes   <input type="radio" name="content_active" value="no"> no'; + } + else { + echo ' <input name="content_active" type="radio" value="yes"> yes   <input type="radio" name="content_active" value="no" checked> no'; + } + ?> + </font></td> + </tr> + <tr> + <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Editor</strong></font></div></td> + <td valign="top" bgcolor="#E2E2E2"> <select id="txt_extra" size="1" name="txt_extra" class="selectbox"> + <optgroup label="current"> + <?php + echo '<option value="'.$result_content["content_editor"].'"'; + echo ' selected="selected">'; + + if ($result_content["content_editor"]=="") { + echo "plain text"; + } + else { + echo $result_content["content_editor"]; + } + echo '</option>'; + ?> + </optgroup> + <optgroup label="extra option"> + <option value="">plain text</option> + <option value="richtext">richtext</option> + <option value="bbcode">bbcode</option> + </optgroup> + </select> </td> + </tr> + <tr> + <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Date</strong></font></div></td> + <td valign="top" bgcolor="#EEEEEE"><font face="Arial, Helvetica, sans-serif"> + <?php + echo $result_content['content_date']; + ?> + </font></td> + </tr> + <tr> + <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Time</strong></font></div></td> + <td valign="top" bgcolor="#E2E2E2"><font face="Arial, Helvetica, sans-serif"> + <?php + echo $result_content['content_time']; + ?> + </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 + if ($result_content['content_editor']=="richtext") { + + include("../editor/FC/fckeditor.php") ; + // Automatically calculates the editor base path based on the _samples directory. + // This is usefull only for these samples. A real application should use something like this: + // $oFCKeditor->BasePath = '/FCKeditor/' ; // '/FCKeditor/' is the default value. + $sBasePath = $_SERVER['PHP_SELF'] ; + $sBasePath = substr( $sBasePath, 0, strpos( $sBasePath, "_samples" ) ) ; + + $oFCKeditor = new FCKeditor('FCKeditor') ; + //$oFCKeditor->BasePath = $sBasePath ; + //$oFCKeditor->ToolbarSet = "Basic"; + $oFCKeditor->BasePath = '../editor/FC/'; + + $oFCKeditor->Height = 500; + $oFCKeditor->Value = $roscms_intern_editor_content; + $oFCKeditor->Create() ; + } + if ($result_content['content_editor']=="bbcode") { + include("../editor/bbcode/bbcodeeditor.php"); + include("../editor/bbcode/cbparser.php"); + if (isset($_POST['content_rad_opt'])) { + echo "<p><fieldset><legend>Preview</legend>".bb2html(stripslashes(@$_POST['po st']),'')."</fieldset></p>"; + } + else { + echo "<p><fieldset><legend>Preview</legend>".bb2html(stripslashes($roscms_int ern_editor_content),'')."</fieldset></p>"; + //echo "<p><hr>".bb2html(stripslashes($roscms_intern_editor_content),'')."<hr>< /p>"; + } + } + + $roscms_intern_content_name=$result_content['content_name']; + ?> + </p> + <p> + <?php if ($rpm_opt=="translate") { ?> + <input name="content_rad_opt" type="radio" value="translate" checked> + Translate + <p><b><blink>Please check, if you selected the right language, before you + click "submit"!</blink></b></p> + <input type="submit" name="Submit" value="Submit"> + <p> </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"; } ?>> + Save (new version)   + <?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"; } ?>> + Update + <?php } ?> + <?php + if($result_content['content_editor'] == "bbcode") { + ?> + <input name="content_rad_opt" type="radio" value="preview" checked> + Preview + <?php } ?></p> + <p> + <?php + if ($roscms_intern_usrgrp_sadmin == true || + $roscms_intern_usrgrp_admin == true || + $roscms_intern_usrgrp_dev == true || + $roscms_intern_usrgrp_team == true || + $roscms_intern_usrgrp_trans == true) { + ?> + <input type="submit" name="Submit" value="Submit"> + <?php } else { ?> + <img src="images/lock.gif" alt="Locked" width="19" height="18"> (you need + a higher account level to save the content to the database)</p> + <?php + } + } + ?> + <p><strong>Info:</strong> for each [#inc_xyz] tag the RosCMS will include + the code that is linked with this tag from database.<br> + <br> + <strong>Hints:</strong></p> + <ul> + <li>use &amp; instead of "&" in links, e.g. http://www.reactos.org/?page=support&amp;lang=en</li> + <li> "<placeholder>" => &lt;placeholder&gt; </li> + <li>ReactOS Homepage URL: [#roscms_path_homepage]</li> + </ul> + </form> + <?php + } + elseif(isset($_POST['content_rad_opt']) && $_POST['content_rad_opt'] != "preview") { +?> + <ul> + <li><strong><a href="?page=<?php echo $rpm_page; ?>&sec=content&sec2=view&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&langid='.$rpm_lang_id."#" .$rpm_db_id ; ?>">Content</a></strong> + <ul> + <li>Save content</li> + </ul> + </li> + </ul> + <?php + + $content_contentid=""; + $content_langa=""; + $content_vis=""; + $content_act=""; + $content_extra=""; + $content_savemode=""; + + if (array_key_exists("txt_contentid", $_POST)) $content_contentid=$_POST['txt_contentid']; + if (array_key_exists("txt_langa", $_POST)) $content_langa=$_POST['txt_langa']; + if (array_key_exists("content_visible", $_POST)) $content_vis=$_POST['content_visible']; + if (array_key_exists("content_active", $_POST)) $content_act=$_POST['content_active']; + 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; + if ($content_langa == "") { + $content_langa = "all"; + } + + if ($content_vis == "yes") { + $content_vis="1"; + } + else { + $content_vis="0"; + } + + if ($content_act == "yes") { + $content_act="1"; + } + else { + $content_act="0"; [truncated at 1000 lines; 3865 more skipped]

1 0

[frik85] 19275: RosCMS (Part 1)
by frik85＠svn.reactos.com 16 Nov '05

16 Nov '05

RosCMS (Part 1) RosCMS, the abbreviation of ReactOS Content Management System, is an an Open Source effort to develop a Web Content Management System that is simple, fast and can generate static web pages (xhtml 1.1 and html 4.01). The RosCMS project, although currently coded for the ReactOS Website, is a powerful CMS for areas where speed, simplicity and stability are needed. More information is available at: http://www.reactos.org ReactOS Content Management System is available thanks to the work of: Klemens Friedl <frik85(a)reactos.org> Ge van Geldorp <gvg(a)reactos.org> Michael Wirth Design (ReactOS Website): Klemens Friedl License: GNU GENERAL PUBLIC LICENSE Added: trunk/web/reactos.org/htdocs/roscms/ Added: trunk/web/reactos.org/htdocs/roscms/COPYING.txt Added: trunk/web/reactos.org/htdocs/roscms/CREDITS.txt Added: trunk/web/reactos.org/htdocs/roscms/README.txt Added: trunk/web/reactos.org/htdocs/roscms/connect.db.php Added: trunk/web/reactos.org/htdocs/roscms/convert.php Added: trunk/web/reactos.org/htdocs/roscms/index.php Added: trunk/web/reactos.org/htdocs/roscms/js/ Added: trunk/web/reactos.org/htdocs/roscms/js/md5.js Added: trunk/web/reactos.org/htdocs/roscms/mailman.php Added: trunk/web/reactos.org/htdocs/roscms/roscms_config.php Added: trunk/web/reactos.org/htdocs/roscms/style.css Added: trunk/web/reactos.org/htdocs/roscms/style_editor.css _____ Added: trunk/web/reactos.org/htdocs/roscms/COPYING.txt --- trunk/web/reactos.org/htdocs/roscms/COPYING.txt 2005-11-16 21:17:19 UTC (rev 19274) +++ trunk/web/reactos.org/htdocs/roscms/COPYING.txt 2005-11-16 21:17:43 UTC (rev 19275) @@ -0,0 +1,340 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + 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. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Property changes on: trunk/web/reactos.org/htdocs/roscms/COPYING.txt ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/CREDITS.txt --- trunk/web/reactos.org/htdocs/roscms/CREDITS.txt 2005-11-16 21:17:19 UTC (rev 19274) +++ trunk/web/reactos.org/htdocs/roscms/CREDITS.txt 2005-11-16 21:17:43 UTC (rev 19275) @@ -0,0 +1,10 @@ +ReactOS Content Management System is available thanks to the work of + + +Klemens Friedl <frik85(a)reactos.org> +Ge van Geldorp <gvg(a)reactos.org> +Michael Wirth + + +Design (ReactOS Website): +Klemens Friedl Property changes on: trunk/web/reactos.org/htdocs/roscms/CREDITS.txt ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/README.txt --- trunk/web/reactos.org/htdocs/roscms/README.txt 2005-11-16 21:17:19 UTC (rev 19274) +++ trunk/web/reactos.org/htdocs/roscms/README.txt 2005-11-16 21:17:43 UTC (rev 19275) @@ -0,0 +1,38 @@ +================================= +ReactOS Content Management System +Updated November 15th, 2005 +================================= + +1. What is RosCMS? + + RosCMS, the abbreviation of ReactOS Content Management System, +is an an Open Source effort to develop a Web Content Management +System that is simple, fast and can generate static web pages +(xhtml 1.1 and html 4.01). + + The RosCMS project, although currently coded for the ReactOS +Website, is a powerful CMS for areas where speed, simplicity and +stability are needed. + +More information is available at: http://www.reactos.org + + +2. Building ReactOS + +See the INSTALL file for more details. + + +3. More information + +See the ReactOS Wiki at: http://www.reactos.org/wiki/ + + +4. Who is responsible? + +See the CREDITS.txt file + + +5. What is the license? + +See the COPYING.txt file + Property changes on: trunk/web/reactos.org/htdocs/roscms/README.txt ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/connect.db.php --- trunk/web/reactos.org/htdocs/roscms/connect.db.php 2005-11-16 21:17:19 UTC (rev 19274) +++ trunk/web/reactos.org/htdocs/roscms/connect.db.php 2005-11-16 21:17:43 UTC (rev 19275) @@ -0,0 +1,40 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + 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. + */ + + + +// Database: +$dbHost = "localhost"; +$dbUser = "root"; +$dbPass = ""; +$dbName = "roscms"; + + +$connect = @mysql_connect($dbHost, $dbUser, $dbPass) or die("ERROR: Cannot connect to the database!"); +$selectDB = @mysql_select_db($dbName, $connect) or die("Cannot find and select <b>$dbName</b>!"); + +// Delete (set nothing) the vars after usage: +$dbHost = ""; +$dbUser = ""; +$dbPass = ""; +$dbName = ""; + + +?> \ No newline at end of file Property changes on: trunk/web/reactos.org/htdocs/roscms/connect.db.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/convert.php --- trunk/web/reactos.org/htdocs/roscms/convert.php 2005-11-16 21:17:19 UTC (rev 19274) +++ trunk/web/reactos.org/htdocs/roscms/convert.php 2005-11-16 21:17:43 UTC (rev 19275) @@ -0,0 +1,57 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Ge van Geldorp <gvg(a)reactos.org> + + 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. + */ +set_magic_quotes_runtime(0); + +$roscms_intern_editor_content=""; + +if(isset($_POST['textarea_content']) && $_POST['textarea_content'] != "") { + if (array_key_exists("textarea_content", $_POST)) $roscms_intern_editor_content=$_POST['textarea_content']; + echo "<p><b>Converted</b></p>"; + echo $roscms_intern_editor_content; +} + +/*$roscms_intern_editor_content='</div></td> + + <td id=\"rightNav\"> + <img src=\"[#inc_path_homepage_media_pictures]2005/thumb_ooo114calc.jpg\" alt=\"ReactOS Screenshot\" width=\"266\" height=\"200\" /><br /> + <a href=\"#\">More screenshots</a> +<br /> +<h1>Latest Release</h1> +<p><strong>Version [#inc_reactos_version]</strong><br /> + <a href=\"http://www.reactos.org/en/content/view/full/62\">Download Now!</a><br /> + <a href=\"http://www.reactos.org/wiki/index.php/ChangeLog-0.2.6\">Change Log</a> +</p> +[#inc_template_news_latest] + <div class=\"contentSmall\"> + <span class=\"contentSmallTitle\">Developer Quotes</span> + \"This is could be some kinda quote\"<br> + -Dev';*/ + +?> +<form name="cms_content" method="post" action="convert.php"> <p> + <textarea name="textarea_content" cols="60" rows="15" id="textarea_content"><?php + echo stripslashes(stripslashes($roscms_intern_editor_content)); + + ?></textarea> + </p> + <p> + <input type="submit" name="Submit" value="Submit"> + | <a href="convert.php">Restart</a></p> +</form> Property changes on: trunk/web/reactos.org/htdocs/roscms/convert.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/index.php --- trunk/web/reactos.org/htdocs/roscms/index.php 2005-11-16 21:17:19 UTC (rev 19274) +++ trunk/web/reactos.org/htdocs/roscms/index.php 2005-11-16 21:17:43 UTC (rev 19275) @@ -0,0 +1,401 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + Ge van Geldorp <gvg(a)reactos.org> + + 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. + */ + +error_reporting(E_ALL); +ini_set('error_reporting', E_ALL); + +if (get_magic_quotes_gpc()) { + die("ERROR: Disable 'magic quotes' in php.ini (=Off)"); +} + +//global $HTTP_GET_VARS; // set the Get var global + + + //include("./inc/db/connect_db.inc.php"); + include("connect.db.php"); + +/* + * ReactOS CMS System - Version 0.1 + * + * (c) by Klemens Friedl <frik85> + * + */ + + if ( !defined('ROSCMS_SYSTEM') ) { + define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity + } + + // Global Vars: + $rpm_page="user"; + $rpm_sec=""; + $rpm_sec2=""; + $rpm_sec3=""; + $rpm_site=""; + $rpm_opt=""; + $rpm_filt=""; + $rpm_filt2=""; + $rpm_lang=""; + $rpm_langid=""; + $rpm_forma=""; + $rpm_skin=""; + $rpm_debug=""; + $rpm_logo=""; + $rpm_db_id=""; + + $varlang=""; + $varw3cformat=""; + $varformat=""; + $page_active=""; + $page_active_set=""; + $rpm_lang_id=""; + $rpm_sort=""; + $roscms_intern_account_level=""; + $roscms_intern_login_check="false"; + + + $roscms_infotable=""; + + // this vars will be removed soon + $roscms_intern_login_check_username=""; + + session_start(); + + //if (array_key_exists("page", $HTTP_GET_VARS)) $rpm_page=$HTTP_GET_VARS["page"]; + if (array_key_exists("page", $_GET)) $rpm_page=htmlspecialchars($_GET["page"]); + if (array_key_exists("sec", $_GET)) $rpm_sec=htmlspecialchars($_GET["sec"]); + if (array_key_exists("sec2", $_GET)) $rpm_sec2=htmlspecialchars($_GET["sec2"]); + if (array_key_exists("sec3", $_GET)) $rpm_sec3=htmlspecialchars($_GET["sec3"]); + if (array_key_exists("site", $_GET)) $rpm_site=htmlspecialchars($_GET["site"]); + if (array_key_exists("opt", $_GET)) $rpm_opt=htmlspecialchars($_GET["opt"]); + if (array_key_exists("sort", $_GET)) $rpm_sort=htmlspecialchars($_GET["sort"]); + if (array_key_exists("filt", $_GET)) $rpm_filt=htmlspecialchars($_GET["filt"]); + if (array_key_exists("filt2", $_GET)) $rpm_filt2=htmlspecialchars($_GET["filt2"]); + if (array_key_exists("lang", $_GET)) $rpm_lang=htmlspecialchars($_GET["lang"]); + if (array_key_exists("langid", $_GET)) $rpm_lang_id=htmlspecialchars($_GET["langid"]); + if (array_key_exists("forma", $_GET)) $rpm_forma=htmlspecialchars($_GET["forma"]); + if (array_key_exists("skin", $_GET)) $rpm_skin=htmlspecialchars($_GET["skin"]); + if (array_key_exists("debug", $_GET)) $rpm_debug=htmlspecialchars($_GET["debug"]); + if (array_key_exists("logo", $_GET)) $rpm_logo=htmlspecialchars($_GET["logo"]); + if (array_key_exists("db_id", $_GET)) $rpm_db_id=htmlspecialchars($_GET["db_id"]); + + if (array_key_exists('HTTP_REFERER', $_SERVER)) $roscms_referrer=htmlspecialchars($_SERVER['HTTP_REFERER']); + + if(isset($_COOKIE['roscms_usrset_lang'])) { + $roscms_usrsetting_lang=$_COOKIE["roscms_usrset_lang"]; + } + else { + $roscms_usrsetting_lang=""; + } + + + $roscms_intern_dynamic="true"; + + + +// Language detection +function check_lang($lang) +{ + if (preg_match('/^([a-zA-Z]+)(-[a-zA-Z]+)?$/', $lang, $matches)) { + $checked_lang = strtolower($matches[1]); + switch($checked_lang) { + case 'de': + case 'en': + case 'fr': + case 'ru': + break; + default: + $checked_lang = ''; + } + } + else if ($lang == '*') { + $checked_lang = 'en'; + } + else { + $checked_lang = ''; + } + + return $checked_lang; +} + +if ($rpm_lang == '' && isset($_COOKIE['roscms_usrset_lang'])) { + $rpm_lang = $_COOKIE['roscms_usrset_lang']; + if (substr($rpm_lang, -1) == '/') { + $rpm_lang = substr($rpm_lang, strlen($rpm_lang) - 1); + } + $rpm_lang = check_lang($rpm_lang); +} + +if ($rpm_lang == '') { + /* After parameter and cookie processing, we still don't have a valid + language. So check whether the HTTP Accept-language header can + help us. */ + $accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE']; + $best_q = 0; + while (preg_match('/^\s*([^,]+)((,(.*))|$)/', + $accept_language, $matches)) { + $lang_range = @$matches[1]; + $accept_language = @$matches[4]; + if (preg_match('/^(([a-zA-Z]+)(-[a-zA-Z]+)?)(;q=([0-1](\.[0-9]{1,3})?))?/', + $lang_range, $matches)) { + $lang = check_lang($matches[1]); + if ($lang != '') { + $q = @$matches[5]; + if ($q == "") { + $q = 1; + } + else { + settype($q, 'float'); + } + if ($best_q < $q) { + $rpm_lang = $lang; + $best_q = $q; + } + } + } + } +} +if ($rpm_lang == '') { + /* If all else fails, use the default language */ + $rpm_lang = check_lang('*'); +} + +$roscms_page_lang = $rpm_lang . '/'; +$rpm_lang_session = $rpm_lang . '/'; + + +if (isset($_COOKIE['roscms_usrset_lang']) || isset($_REQUEST['lang'])) { + /* Delete an existing cookie (if any) which uses the full hostname */ + setcookie('roscms_usrset_lang', '', -3600); + /* Add cookie using just the domain name */ + require_once('inc/utils.php'); + setcookie('roscms_usrset_lang', $rpm_lang, time() + 5 * 30 * 24 * 3600, + '/', cookie_domain()); +} + +/* // Language detection: + if ($rpm_lang == "") { + if ($roscms_usrsetting_lang != "") { + $rpm_lang = substr($roscms_usrsetting_lang, 0, 2); + $rpm_lang_session= $roscms_usrsetting_lang; + } + else { + if (isset($roscms_referrer) && $roscms_referrer != "") { + $var = ""; + $var = strchr($roscms_referrer, "/en/"); + if ($var != "" AND $rpm_lang == "") { + $rpm_lang_session="en/"; + $rpm_lang="en"; + } + $var = ""; + $var = strchr($roscms_referrer, "/de/"); + if ($var != "" AND $rpm_lang == "") { + $rpm_lang_session="de/"; + $rpm_lang="de"; + } + $var = ""; + $var = strchr($roscms_referrer, "/fr/"); + if ($var != "" AND $rpm_lang == "") { + $rpm_lang_session="fr/"; + $rpm_lang="fr"; + } + $var = ""; + $var = strchr($roscms_referrer, "/ru/"); + if ($var != "" AND $rpm_lang == "") { + $rpm_lang_session="ru/"; + $rpm_lang="ru"; + } + if ($rpm_lang == "") { + $rpm_lang_session="en/"; + $rpm_lang="en"; + } + setcookie("roscms_usrset_lang", $rpm_lang_session, time() + 60*60*24*30*12, "/"); + } + else { + $rpm_lang_session="en/"; + $rpm_lang="en"; + $varlang = $rpm_lang_session; + setcookie("roscms_usrset_lang", $rpm_lang_session, time() + 60*60*24*30*12, "/"); + } + } + }*/ + + require("inc/lang/".$rpm_lang.".php"); // load the language text for 'myReactOS' + + /* + // Format detection: + if ($rpm_forma == "") { + if ($_COOKIE['varw3cformat'] == "") { + $var = ""; + $var = strchr($HTTP_REFERER, "/xhtml/"); + if ($var != "") { + $rpm_lang="xhtml"; + $varw3cformat = "xhtml/"; + $varformat = "html"; + session_register("varw3cformat"); + session_register("varformat"); + } + } + else { + $rpm_forma = $_COOKIE['varw3cformat']; + } + }*/ + + + + + ini_set ('session.name', 'roscms'); + + + switch ($rpm_page) { + case "home": + default: // Frontpage + require("inc/login.php"); + $rpm_page_title="RosCMS - Home"; + include("inc/head.php"); // Head + create_head($rpm_page_title, $rpm_logo, $roscms_langres); + include("inc/structure.php"); // Layout-Structure + create_structure($rpm_page); + include("inc/home.php"); // Content + include("inc/body.php"); // Body + break; + case "admin": // Admin interface + require("inc/login.php"); + if ($rpm_site == "") { + $rpm_page_title="RosCMS - Admin Interface"; + include("inc/head.php"); + include("inc/structure.php"); + include("inc/admin.php"); + include("inc/body.php"); + } + else { + include("inc/admin.php"); + } + break; + case "user": // myReactOS + require("inc/login.php"); + $rpm_page_title="myReactOS"; + $rpm_logo="myreactos"; + include("inc/head.php"); + include("inc/structure.php"); + include("inc/user.php"); + include("inc/body.php"); + break; + case "dev": // developer interface + require("inc/login.php"); + $rpm_page_title="Developer Inteface"; + include("inc/head.php"); + include("inc/structure.php"); + include("inc/dev.php"); + include("inc/body.php"); + break; + case "team": // team interface (UI-Team, etc.) + require("inc/login.php"); + $rpm_page_title="Team Inteface"; + include("inc/head.php"); + include("inc/structure.php"); + include("inc/team.php"); + include("inc/body.php"); + break; + case "trans": // translator interface (UI-Team, etc.) + require("inc/login.php"); + $rpm_page_title="Translator Inteface"; + include("inc/head.php"); + include("inc/structure.php"); + include("inc/translator.php"); + include("inc/body.php"); + break; + case "login": // Login Page + $rpm_page_title="Login"; + $rpm_logo="normal"; + include("inc/head.php"); + include("inc/structure.php"); + include("inc/user_login.php"); + include("inc/body.php"); + break; + case "register": // Register Account Page + $rpm_page_title="Register Account"; + $rpm_logo="normal"; + include("inc/head.php"); + create_head($rpm_page_title, $rpm_logo, $roscms_langres); + include("inc/structure.php"); + create_structure($rpm_page); + include("inc/user_register.php"); + include("inc/body.php"); + break; + case "getpwd": // Did you forget your password? -> request -> email + $rpm_page_title="Did you forget your password?"; + $rpm_logo="normal"; + include("inc/head.php"); + create_head($rpm_page_title, $rpm_logo, $roscms_langres); + include("inc/structure.php"); + create_structure($rpm_page); + include("inc/user_getpwd.php"); + include("inc/body.php"); + break; + case "getpwd2": // -> link (email) -> new password + $rpm_page_title="Activate new Password"; + $rpm_logo="normal"; + include("inc/head.php"); + create_head($rpm_page_title, $rpm_logo, $roscms_langres); + include("inc/structure.php"); + create_structure($rpm_page); + include("inc/user_getpwd2.php"); + include("inc/body.php"); + break; + case "logout": // Logout function + include("inc/logout.php"); + break; + case "noaccess": + $rpm_page_title="No Access"; + $rpm_logo="normal"; + include("inc/head.php"); + create_head($rpm_page_title, $rpm_logo, $roscms_langres); + include("inc/structure.php"); + create_structure($rpm_page); + include("inc/noaccess.php"); + include("inc/body.php"); + break; + case "nopermission": + require("inc/login.php"); + $rpm_page_title="No Permission"; + include("inc/head.php"); + create_head($rpm_page_title, $rpm_logo, $roscms_langres); + include("inc/structure.php"); + create_structure($rpm_page); + include("inc/nopermission.php"); + include("inc/body.php"); + break; + + case "generate": // Generate the static HTML pages (for direct link, e.g. http://www.reactos.org/roscms/?page=generate"); TODO check why this link doesn't work -> errors, etc.? + require("inc/login.php"); + include("inc/generate_page.php"); // static page generator + break; + case "404": + $rpm_page_title="Page not found"; + include("inc/head.php"); + create_head($rpm_page_title, $rpm_logo, $roscms_langres); + include("inc/structure.php"); + create_structure($rpm_page); + include("inc/404.php"); + include("inc/body.php"); + break; + } +?> Property changes on: trunk/web/reactos.org/htdocs/roscms/index.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/htdocs/roscms/js/md5.js --- trunk/web/reactos.org/htdocs/roscms/js/md5.js 2005-11-16 21:17:19 UTC (rev 19274) +++ trunk/web/reactos.org/htdocs/roscms/js/md5.js 2005-11-16 21:17:43 UTC (rev 19275) @@ -0,0 +1,176 @@ +/* + * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message + * Digest Algorithm, as defined in RFC 1321. + * Copyright (C) Paul Johnston 1999 - 2000. + * Updated by Greg Holt 2000 - 2001. + * See http://pajhome.org.uk/site/legal.html for details. + */ + +/* + * Convert a 32-bit number to a hex string with ls-byte first + */ +var hex_chr = "0123456789abcdef"; +function rhex(num) +{ + str = ""; + for(j = 0; j <= 3; j++) + str += hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) + + hex_chr.charAt((num >> (j * 8)) & 0x0F); + return str; +} + +/* + * Convert a string to a sequence of 16-word blocks, stored as an array. + * Append padding bits and the length, as described in the MD5 standard. + */ +function str2blks_MD5(str) +{ + nblk = ((str.length + 8) >> 6) + 1; + blks = new Array(nblk * 16); + for(i = 0; i < nblk * 16; i++) blks[i] = 0; + for(i = 0; i < str.length; i++) + blks[i >> 2] |= str.charCodeAt(i) << ((i % 4) * 8); + blks[i >> 2] |= 0x80 << ((i % 4) * 8); + blks[nblk * 16 - 2] = str.length * 8; + return blks; +} + +/* + * Add integers, wrapping at 2^32. This uses 16-bit operations internally + * to work around bugs in some JS interpreters. + */ +function add(x, y) +{ + var lsw = (x & 0xFFFF) + (y & 0xFFFF); + var msw = (x >> 16) + (y >> 16) + (lsw >> 16); + return (msw << 16) | (lsw & 0xFFFF); +} + +/* + * Bitwise rotate a 32-bit number to the left + */ +function rol(num, cnt) +{ + return (num << cnt) | (num >>> (32 - cnt)); [truncated at 1000 lines; 630 more skipped]

1 0

[gvg] 19274: Update status
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-11-16 21:16:35 UTC (rev 19273) +++ trunk/reactos/media/doc/README.WINE 2005-11-16 21:17:19 UTC (rev 19274) @@ -26,49 +26,49 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-20050930 -reactos/tools/wpp # Synced to Wine-20050930 +reactos/tools/unicode # Synced to Wine-0_9 +reactos/tools/wpp # Synced to Wine-0_9 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050930 +reactos/tools/winebuild # Synced to Wine-0_9 reactos/tools/wmc # Wine Message Compiler reactos/tools/wrc # Synced to Wine-20050930 -reactos/tools/widl # Forked at Wine-20050628 +reactos/tools/widl # Forked at Wine-0_9 The following libraries are shared with Wine. -reactos/lib/cabinet # Synced to Wine-20050930 -reactos/lib/comctl32 # Synced to Wine-20050930 -reactos/lib/comdlg32 # Synced to Wine-20050930 +reactos/lib/cabinet # Synced to Wine-0_9 +reactos/lib/comctl32 # Synced to Wine-0_9 +reactos/lib/comdlg32 # Synced to Wine-0_9 reactos/lib/dbghelp # -reactos/lib/dinput # Forked at Wine-20050930 -reactos/lib/dinput8 # Synced to Wine-20050930 -reactos/lib/icmp # Synced to Wine-20050930 +reactos/lib/dinput # Synced to Wine-0_9 +reactos/lib/dinput8 # Synced to Wine-0_9 +reactos/lib/icmp # Synced to Wine-0_9 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050930 +reactos/lib/mpr # Synced to Wine-0_9 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050930 -reactos/lib/msi # Synced to Wine-20050930 +reactos/lib/msimg32 # Synced to Wine-0_9 +reactos/lib/msi # Synced to Wine-0_9 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync -reactos/lib/objsel # Synced to Wine-20050930 +reactos/lib/objsel # Synced to Wine-0_9 reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. reactos/lib/ole32 # Synced to Wine-20050830 -reactos/lib/oleaut32 # Synced to Wine-20050930 -reactos/lib/oledlg # Synced to Wine-20050930 -reactos/lib/olepro32 # Synced to Wine-20050930 -reactos/lib/riched20 # Synced to Wine-20050930 -reactos/lib/richedit # Synced to Wine-20050930 -reactos/lib/rpcrt4 # Synced to Wine-20050930 +reactos/lib/oleaut32 # Synced to Wine-0_9 +reactos/lib/oledlg # Synced to Wine-0_9 +reactos/lib/olepro32 # Synced to Wine-0_9 +reactos/lib/riched20 # Synced to Wine-0_9 +reactos/lib/richedit # Synced to Wine-0_9 +reactos/lib/rpcrt4 # Synced to Wine-0_9 reactos/lib/setupapi # Forked at Wine-20050524 -reactos/lib/shell32 # Synced to Wine-20050930 -reactos/lib/shdocvw # Synced to Wine-20050930 -reactos/lib/shfolder # Synced to Wine-20050930 -reactos/lib/shlwapi # Synced to Wine-20050930 +reactos/lib/shell32 # Synced to Wine-0_9 +reactos/lib/shdocvw # Synced to Wine-0_9 +reactos/lib/shfolder # Synced to Wine-0_9 +reactos/lib/shlwapi # Synced to Wine-0_9 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-20050930 -reactos/lib/uxtheme # Synced to Wine-20050930 +reactos/lib/urlmon # Synced to Wine-0_9 +reactos/lib/uxtheme # Synced to Wine-0_9 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync reactos/lib/winmm # Forked at Wine-20050628 @@ -78,7 +78,7 @@ ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-20050930 +reactos/subsys/system/msiexec # Synced to Wine-0_9 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

1 0

[gvg] 19273: Tag Wine-0_9
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Tag Wine-0_9 Added: vendor/wine/dlls/cabinet/Wine-0_9/ Deleted: vendor/wine/dlls/cabinet/Wine-20050930/ Added: vendor/wine/dlls/comctl32/Wine-0_9/ Deleted: vendor/wine/dlls/comctl32/Wine-20050930/ Added: vendor/wine/dlls/commdlg/Wine-0_9/ Deleted: vendor/wine/dlls/commdlg/Wine-20050930/ Added: vendor/wine/dlls/dinput/Wine-0_9/ Deleted: vendor/wine/dlls/dinput/Wine-20050930/ Added: vendor/wine/dlls/dinput8/Wine-0_9/ Deleted: vendor/wine/dlls/dinput8/Wine-20050930/ Added: vendor/wine/dlls/dsound/Wine-0_9/ Deleted: vendor/wine/dlls/dsound/Wine-20050930/ Added: vendor/wine/dlls/icmp/Wine-0_9/ Deleted: vendor/wine/dlls/icmp/Wine-20050930/ Added: vendor/wine/dlls/midimap/Wine-0_9/ Deleted: vendor/wine/dlls/midimap/Wine-20050930/ Added: vendor/wine/dlls/mpr/Wine-0_9/ Deleted: vendor/wine/dlls/mpr/Wine-20050930/ Added: vendor/wine/dlls/msi/Wine-0_9/ Deleted: vendor/wine/dlls/msi/Wine-20050930/ Added: vendor/wine/dlls/msimg32/Wine-0_9/ Deleted: vendor/wine/dlls/msimg32/Wine-20050930/ Added: vendor/wine/dlls/objsel/Wine-0_9/ Deleted: vendor/wine/dlls/objsel/Wine-20050930/ Added: vendor/wine/dlls/ole32/Wine-0_9/ Deleted: vendor/wine/dlls/ole32/Wine-20050930/ Added: vendor/wine/dlls/oleaut32/Wine-0_9/ Deleted: vendor/wine/dlls/oleaut32/Wine-20050930/ Added: vendor/wine/dlls/oledlg/Wine-0_9/ Deleted: vendor/wine/dlls/oledlg/Wine-20050930/ Added: vendor/wine/dlls/olepro32/Wine-0_9/ Deleted: vendor/wine/dlls/olepro32/Wine-20050930/ Added: vendor/wine/dlls/riched20/Wine-0_9/ Deleted: vendor/wine/dlls/riched20/Wine-20050930/ Added: vendor/wine/dlls/richedit/Wine-0_9/ Deleted: vendor/wine/dlls/richedit/Wine-20050930/ Added: vendor/wine/dlls/rpcrt4/Wine-0_9/ Deleted: vendor/wine/dlls/rpcrt4/Wine-20050930/ Added: vendor/wine/dlls/shdocvw/Wine-0_9/ Deleted: vendor/wine/dlls/shdocvw/Wine-20050930/ Added: vendor/wine/dlls/shell32/Wine-0_9/ Deleted: vendor/wine/dlls/shell32/Wine-20050930/ Added: vendor/wine/dlls/shfolder/Wine-0_9/ Deleted: vendor/wine/dlls/shfolder/Wine-20050930/ Added: vendor/wine/dlls/shlwapi/Wine-0_9/ Deleted: vendor/wine/dlls/shlwapi/Wine-20050930/ Added: vendor/wine/dlls/urlmon/Wine-0_9/ Deleted: vendor/wine/dlls/urlmon/Wine-20050930/ Added: vendor/wine/dlls/uxtheme/Wine-0_9/ Deleted: vendor/wine/dlls/uxtheme/Wine-20050930/ Added: vendor/wine/libs/unicode/Wine-0_9/ Deleted: vendor/wine/libs/unicode/Wine-20050930/ Added: vendor/wine/libs/wpp/Wine-0_9/ Deleted: vendor/wine/libs/wpp/Wine-20050930/ Added: vendor/wine/programs/msiexec/Wine-0_9/ Deleted: vendor/wine/programs/msiexec/Wine-20050930/ Added: vendor/wine/tools/winebuild/Wine-0_9/ Deleted: vendor/wine/tools/winebuild/Wine-20050930/ Added: vendor/wine/tools/wrc/Wine-0_9/ Deleted: vendor/wine/tools/wrc/Wine-20050930/ _____ Copied: vendor/wine/dlls/cabinet/Wine-0_9 (from rev 19272, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-0_9 (from rev 19272, vendor/wine/dlls/comctl32/current) _____ Copied: vendor/wine/dlls/commdlg/Wine-0_9 (from rev 19272, vendor/wine/dlls/commdlg/current) _____ Copied: vendor/wine/dlls/dinput/Wine-0_9 (from rev 19272, vendor/wine/dlls/dinput/current) _____ Copied: vendor/wine/dlls/dinput8/Wine-0_9 (from rev 19272, vendor/wine/dlls/dinput8/current) _____ Copied: vendor/wine/dlls/dsound/Wine-0_9 (from rev 19272, vendor/wine/dlls/dsound/current) _____ Copied: vendor/wine/dlls/icmp/Wine-0_9 (from rev 19272, vendor/wine/dlls/icmp/current) _____ Copied: vendor/wine/dlls/midimap/Wine-0_9 (from rev 19272, vendor/wine/dlls/midimap/current) _____ Copied: vendor/wine/dlls/mpr/Wine-0_9 (from rev 19272, vendor/wine/dlls/mpr/current) _____ Copied: vendor/wine/dlls/msi/Wine-0_9 (from rev 19272, vendor/wine/dlls/msi/current) _____ Copied: vendor/wine/dlls/msimg32/Wine-0_9 (from rev 19272, vendor/wine/dlls/msimg32/current) _____ Copied: vendor/wine/dlls/objsel/Wine-0_9 (from rev 19272, vendor/wine/dlls/objsel/current) _____ Copied: vendor/wine/dlls/ole32/Wine-0_9 (from rev 19272, vendor/wine/dlls/ole32/current) _____ Copied: vendor/wine/dlls/oleaut32/Wine-0_9 (from rev 19272, vendor/wine/dlls/oleaut32/current) _____ Copied: vendor/wine/dlls/oledlg/Wine-0_9 (from rev 19272, vendor/wine/dlls/oledlg/current) _____ Copied: vendor/wine/dlls/olepro32/Wine-0_9 (from rev 19272, vendor/wine/dlls/olepro32/current) _____ Copied: vendor/wine/dlls/riched20/Wine-0_9 (from rev 19272, vendor/wine/dlls/riched20/current) _____ Copied: vendor/wine/dlls/richedit/Wine-0_9 (from rev 19272, vendor/wine/dlls/richedit/current) _____ Copied: vendor/wine/dlls/rpcrt4/Wine-0_9 (from rev 19272, vendor/wine/dlls/rpcrt4/current) _____ Copied: vendor/wine/dlls/shdocvw/Wine-0_9 (from rev 19272, vendor/wine/dlls/shdocvw/current) _____ Copied: vendor/wine/dlls/shell32/Wine-0_9 (from rev 19272, vendor/wine/dlls/shell32/current) _____ Copied: vendor/wine/dlls/shfolder/Wine-0_9 (from rev 19272, vendor/wine/dlls/shfolder/current) _____ Copied: vendor/wine/dlls/shlwapi/Wine-0_9 (from rev 19272, vendor/wine/dlls/shlwapi/current) _____ Copied: vendor/wine/dlls/urlmon/Wine-0_9 (from rev 19272, vendor/wine/dlls/urlmon/current) _____ Copied: vendor/wine/dlls/uxtheme/Wine-0_9 (from rev 19272, vendor/wine/dlls/uxtheme/current) _____ Copied: vendor/wine/libs/unicode/Wine-0_9 (from rev 19272, vendor/wine/libs/unicode/current) _____ Copied: vendor/wine/libs/wpp/Wine-0_9 (from rev 19272, vendor/wine/libs/wpp/current) _____ Copied: vendor/wine/programs/msiexec/Wine-0_9 (from rev 19272, vendor/wine/programs/msiexec/current) _____ Copied: vendor/wine/tools/winebuild/Wine-0_9 (from rev 19272, vendor/wine/tools/winebuild/current) _____ Copied: vendor/wine/tools/wrc/Wine-0_9 (from rev 19272, vendor/wine/tools/wrc/current)

1 0

[gvg] 19272: Add some SEH protection (not complete yet)
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Add some SEH protection (not complete yet) Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-11-16 20:38:31 UTC (rev 19271) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-11-16 20:52:07 UTC (rev 19272) @@ -396,37 +396,33 @@ return Ret; } -HBITMAP STDCALL -NtGdiCreateBitmap( - INT Width, - INT Height, - UINT Planes, - UINT BitsPerPel, - CONST VOID *Bits) +static FASTCALL HBITMAP +IntCreateBitmapIndirect(CONST BITMAP *BM) { PBITMAPOBJ bmp; HBITMAP hBitmap; SIZEL Size; + UINT BitsPixel; /* NOTE: Windows also doesn't store nr. of planes separately! */ - BitsPerPel = (BYTE)BitsPerPel * (BYTE)Planes; + BitsPixel = BM->bmBitsPixel * BM->bmPlanes; /* Check parameters */ - if (!Height || !Width) + if (0 == BM->bmHeight || 0 == BM->bmWidth) { Size.cx = Size.cy = 1; } else { - Size.cx = abs(Width); - Size.cy = abs(Height); + Size.cx = abs(BM->bmWidth); + Size.cy = abs(BM->bmHeight); } /* Create the bitmap object. */ - hBitmap = IntCreateBitmap(Size, BITMAPOBJ_GetWidthBytes(Width, BitsPerPel), - BitmapFormat(BitsPerPel, BI_RGB), - (Height < 0 ? BMF_TOPDOWN : 0) | - (Bits == NULL ? 0 : BMF_NOZEROINIT), NULL); + hBitmap = IntCreateBitmap(Size, BM->bmWidthBytes, + BitmapFormat(BitsPixel, BI_RGB), + (BM->bmHeight < 0 ? BMF_TOPDOWN : 0) | + (NULL == BM->bmBits ? 0 : BMF_NOZEROINIT), NULL); if (!hBitmap) { DPRINT("NtGdiCreateBitmap: IntCreateBitmap returned 0\n"); @@ -434,7 +430,7 @@ } DPRINT("NtGdiCreateBitmap:%dx%d, %d BPP colors returning %08x\n", - Size.cx, Size.cy, BitsPerPel, hBitmap); + Size.cx, Size.cy, BitsPixel, hBitmap); bmp = BITMAPOBJ_LockBitmap( hBitmap ); /* FIXME - bmp can be NULL!!!!!! */ @@ -447,14 +443,35 @@ * to us it should be safe. */ - if (Bits != NULL) + if (NULL != BM->bmBits) { - NtGdiSetBitmapBits(hBitmap, bmp->SurfObj.cjBits, Bits); + NtGdiSetBitmapBits(hBitmap, bmp->SurfObj.cjBits, BM->bmBits); } return hBitmap; } +HBITMAP STDCALL +NtGdiCreateBitmap( + INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, + CONST VOID *Bits) +{ + BITMAP BM; + + BM.bmType = 0; + BM.bmWidth = Width; + BM.bmHeight = Height; + BM.bmWidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel); + BM.bmPlanes = Planes; + BM.bmBitsPixel = BitsPixel; + BM.bmBits = (LPVOID) Bits; + + return IntCreateBitmapIndirect(&BM); +} + BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody) { @@ -542,13 +559,32 @@ } HBITMAP STDCALL -NtGdiCreateBitmapIndirect(CONST BITMAP *BM) +NtGdiCreateBitmapIndirect(CONST BITMAP *UnsafeBM) { - return NtGdiCreateBitmap (BM->bmWidth, - BM->bmHeight, - BM->bmPlanes, - BM->bmBitsPixel, - BM->bmBits); + BITMAP BM; + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY + { + ProbeForRead(UnsafeBM, sizeof(BITMAP), 1); + BM = *UnsafeBM; + if (NULL != BM.bmBits) + { + ProbeForRead(BM.bmBits, BM.bmWidthBytes * abs(BM.bmHeight), 2); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } + + return IntCreateBitmapIndirect(&BM); } HBITMAP STDCALL @@ -1478,7 +1514,7 @@ if (Bitmap->SurfObj.lDelta >= 0) bm.bmHeight = -bm.bmHeight; - res = NtGdiCreateBitmapIndirect(&bm); + res = IntCreateBitmapIndirect(&bm); if(res) { char *buf;

1 0

[fireball] 19271: Fix IoIsWdmVersionAvailable() to confirm we're compatible with Win2k (someone forgot 0x before 10) and also added brief comments on which version corresponds to what.
by fireball＠svn.reactos.com 16 Nov '05

16 Nov '05

Fix IoIsWdmVersionAvailable() to confirm we're compatible with Win2k (someone forgot 0x before 10) and also added brief comments on which version corresponds to what. Modified: trunk/reactos/ntoskrnl/io/iomgr.c _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-11-16 17:34:50 UTC (rev 19270) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-11-16 20:38:31 UTC (rev 19271) @@ -483,7 +483,14 @@ IoIsWdmVersionAvailable(IN UCHAR MajorVersion, IN UCHAR MinorVersion) { - if (MajorVersion <= 1 && MinorVersion <= 10) + /* MinorVersion = 0x20 : WinXP + 0x10 : Win2k + 0x5 : WinMe + <0x5 : Win98 + + We report Win2k now + */ + if (MajorVersion <= 1 && MinorVersion <= 0x10) return TRUE; return FALSE; }

1 0

[hpoussin] 19270: Export _vsnwprintf
by hpoussin＠svn.reactos.com 16 Nov '05

16 Nov '05

Export _vsnwprintf Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-11-16 16:12:59 UTC (rev 19269) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-11-16 17:34:50 UTC (rev 19270) @@ -1436,6 +1436,7 @@ _strset _strupr _vsnprintf +_vsnwprintf _wcsicmp _wcslwr _wcsnicmp

1 0

[gvg] 19269: StartScan is always in BOTTOM_UP sense for GetDIBits
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

StartScan is always in BOTTOM_UP sense for GetDIBits Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 16:10:57 UTC (rev 19268) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 16:12:59 UTC (rev 19269) @@ -498,7 +498,8 @@ DestPaletteType, SourcePaletteType, hDestPalette, hSourcePalette); SourcePoint.x = 0; - SourcePoint.y = StartScan; + SourcePoint.y = BitmapObj->SurfObj.sizlBitmap.cy - + (StartScan + ScanLines); /* Determine destination rectangle */ DestRect.top = 0;

1 0

[gvg] 19268: Always pad scanlines to multiples of 4 bytes for DIBs
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Always pad scanlines to multiples of 4 bytes for DIBs Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 16:05:55 UTC (rev 19267) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 16:10:57 UTC (rev 19268) @@ -449,7 +449,8 @@ DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; DestSize.cy = ScanLines; DestBitmap = EngCreateBitmap( - DestSize, BitmapObj->SurfObj.lDelta, + DestSize, DIB_GetDIBWidthBytes(DestSize.cx, + Info->bmiHeader.biBitCount), BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, Bits); @@ -667,6 +668,7 @@ int height; WORD bpp; WORD compr; + SIZEL size; if (DIB_GetBitmapInfo( header, &width, &height, &bpp, &compr ) == -1) return 0; @@ -721,7 +723,12 @@ } else { - handle = NtGdiCreateBitmap( width, height, 1, 1, NULL); + size.cx = width; + size.cy = abs(height); + + handle = IntCreateBitmap(size, DIB_GetDIBWidthBytes(width, 1), BMF_1BPP, + (height < 0 ? BMF_TOPDOWN : 0) | BMF_NOZEROINIT, + NULL); } if (height < 0) @@ -986,24 +993,7 @@ */ INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth) { - int words; - - switch(depth) - { - case 1: words = (width + 31) >> 5; break; - case 4: words = (width + 7) >> 3; break; - case 8: words = (width + 3) >> 2; break; - case 15: - case 16: words = (width + 1) >> 1; break; - case 24: words = (width * 3 + 3) >> 2; break; - - default: - DPRINT("(%d): Unsupported depth\n", depth ); - /* fall through */ - case 32: - words = width; - } - return words << 2; + return ((width * depth + 31) & ~31) >> 3; } /***********************************************************************

1 0

[gvg] 19267: Pass correct masks when creating bitfield palette
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Pass correct masks when creating bitfield palette Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 15:53:16 UTC (rev 19266) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 16:05:55 UTC (rev 19267) @@ -1149,6 +1149,7 @@ ULONG ColorCount; PALETTEENTRY *palEntries = NULL; HPALETTE hPal; + ULONG RedMask, GreenMask, BlueMask; // Determine Bits Per Pixel bits = bmi->bmiHeader.biBitCount; @@ -1161,10 +1162,16 @@ else if(bits < 24) { *paletteType = PAL_BITFIELDS; + RedMask = 0xf800; + GreenMask = 0x07e0; + BlueMask = 0x001f; } else { *paletteType = PAL_BGR; + RedMask = 0xff0000; + GreenMask = 0x00ff00; + BlueMask = 0x0000ff; } if (bmi->bmiHeader.biClrUsed == 0) @@ -1182,7 +1189,9 @@ } else { - hPal = PALETTE_AllocPalette( *paletteType, ColorCount, (ULONG*)palEntries, 0, 0, 0 ); + hPal = PALETTE_AllocPalette(*paletteType, ColorCount, + (ULONG*) palEntries, + RedMask, GreenMask, BlueMask ); } return hPal;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs