Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[cfinck] 36545: Fix the Forum for the new ROSCMS_PATH define and the directory of "subsys_login.php"
by cfinck＠svn.reactos.org 27 Sep '08

27 Sep '08

Author: cfinck Date: Sat Sep 27 11:43:24 2008 New Revision: 36545 URL: http://svn.reactos.org/svn/reactos?rev=36545&view=rev Log: Fix the Forum for the new ROSCMS_PATH define and the directory of "subsys_login.php" Modified: trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php Modified: trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php [iso-8859-1] Sat Sep 27 11:43:24 2008 @@ -12,7 +12,8 @@ exit; } -require_once("$phpbb_root_path/../roscms/inc/subsys_login.php"); +define("ROSCMS_PATH", "$phpbb_root_path/../roscms/"); +require_once(ROSCMS_PATH . "logon/subsys_login.php"); /** * Login function

1 0

[cfinck] 36544: Fix the People Map for the new user name links
by cfinck＠svn.reactos.org 27 Sep '08

27 Sep '08

Author: cfinck Date: Sat Sep 27 11:43:12 2008 New Revision: 36544 URL: http://svn.reactos.org/svn/reactos?rev=36544&view=rev Log: Fix the People Map for the new user name links Modified: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php Modified: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/p… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php [iso-8859-1] Sat Sep 27 11:43:12 2008 @@ -56,7 +56,7 @@ var Marker = new GMarker( new GLatLng(Latitude, Longitude), CurrentIcon ); var html; - html = "<strong><a href=\"http://reactos.org/roscms/?page=user&sec=profil&sec2=" + UserId + "\" target=\"_blank\">" + UserName + "<\/a><\/strong><br>"; + html = "<strong><a href=\"http://reactos.org/roscms/index.php/user/" + UserId + "\" target=\"_blank\">" + UserName + "<\/a><\/strong><br>"; html += FullName + "<br><br>"; // parseFloat strips off trailing zeros

1 0

[sginsberg] 36542: - Add PsGetThreadTeb prototype
by sginsberg＠svn.reactos.org 27 Sep '08

27 Sep '08

Author: sginsberg Date: Sat Sep 27 11:24:50 2008 New Revision: 36542 URL: http://svn.reactos.org/svn/reactos?rev=36542&view=rev Log: - Add PsGetThreadTeb prototype Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Sat Sep 27 11:24:50 2008 @@ -76,6 +76,13 @@ NTAPI PsGetThreadWin32Thread( PETHREAD Thread +); + +NTKERNELAPI +PTEB +NTAPI +PsGetThreadTeb( + IN PETHREAD Thread ); NTKERNELAPI

1 0

[sginsberg] 36541: - Fix a couple of bugcodes with incorrect MessageId - Add SYSTEM_THREAD_EXCEPTION_NOT_HANDLED make use of it
by sginsberg＠svn.reactos.org 26 Sep '08

26 Sep '08

Author: sginsberg Date: Fri Sep 26 17:11:10 2008 New Revision: 36541 URL: http://svn.reactos.org/svn/reactos?rev=36541&view=rev Log: - Fix a couple of bugcodes with incorrect MessageId - Add SYSTEM_THREAD_EXCEPTION_NOT_HANDLED make use of it Modified: trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Fri Sep 26 17:11:10 2008 @@ -1032,8 +1032,6 @@ restart your computer. . - - MessageId=0x7D Severity=Success Facility=System @@ -1043,6 +1041,14 @@ . MessageId=0x7E +Severity=Success +Facility=System +SymbolicName=SYSTEM_THREAD_EXCEPTION_NOT_HANDLED +Language=English +SYSTEM_THREAD_EXCEPTION_NOT_HANDLED +. + +MessageId=0x7F Severity=Success Facility=System SymbolicName=UNEXPECTED_KERNEL_MODE_TRAP @@ -1057,7 +1063,7 @@ Advanced Startup Options, and then select Safe Mode. . -MessageId=0x7F +MessageId=0x80 Severity=Success Facility=System SymbolicName=NMI_HARDWARE_FAILURE @@ -1065,7 +1071,7 @@ Hardware malfunction . -MessageId=0x80 +MessageId=0x8E Severity=Success Facility=System SymbolicName=KERNEL_MODE_EXCEPTION_NOT_HANDLED @@ -1073,7 +1079,7 @@ KERNEL_MODE_EXCEPTION_NOT_HANDLED . -MessageId=0x8E +MessageId=0x81 Severity=Success Facility=System SymbolicName=SPIN_LOCK_INIT_FAILURE Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Fri Sep 26 17:11:10 2008 @@ -129,7 +129,7 @@ ExceptionPointers->ExceptionRecord->ExceptionInformation[3]); /* Bugcheck the system */ - KeBugCheckEx(0x7E, + KeBugCheckEx(SYSTEM_THREAD_EXCEPTION_NOT_HANDLED, ExceptionPointers->ExceptionRecord->ExceptionCode, (ULONG_PTR)ExceptionPointers->ExceptionRecord->ExceptionAddress, (ULONG_PTR)ExceptionPointers->ExceptionRecord,

1 0

[ekohl] 36540: Fix lock handle typecasts.
by ekohl＠svn.reactos.org 26 Sep '08

26 Sep '08

Author: ekohl Date: Fri Sep 26 15:25:47 2008 New Revision: 36540 URL: http://svn.reactos.org/svn/reactos?rev=36540&view=rev Log: Fix lock handle typecasts. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Sep 26 15:25:47 2008 @@ -728,7 +728,7 @@ // return ScmLockDatabase(0, hMgr->0xC, hLock); /* FIXME: Lock the database */ - *lpLock = (void *)0x12345678; /* Dummy! */ + *lpLock = (SC_RPC_LOCK)0x12345678; /* Dummy! */ return ERROR_SUCCESS; } Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Fri Sep 26 15:25:47 2008 @@ -2408,7 +2408,7 @@ { /* Call to services.exe using RPC */ dwError = RUnlockServiceDatabase(BindingHandle, - (SC_RPC_LOCK)ScLock); + (LPSC_RPC_LOCK)&ScLock); } _SEH_HANDLE {

1 0

[pschweitzer] 36539: Get rid off recursive FsRtlIsNameInExpression once again. Fix a typo in iterative function that fixes it properly. We now get ReactOS up to 2nd stage with that fix. 2nd stage is broken...
by pschweitzer＠svn.reactos.org 26 Sep '08

26 Sep '08

Author: pschweitzer Date: Fri Sep 26 14:50:39 2008 New Revision: 36539 URL: http://svn.reactos.org/svn/reactos?rev=36539&view=rev Log: Get rid off recursive FsRtlIsNameInExpression once again. Fix a typo in iterative function that fixes it properly. We now get ReactOS up to 2nd stage with that fix. 2nd stage is broken... Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Fri Sep 26 14:50:39 2008 @@ -268,8 +268,7 @@ * rewritten to avoid recursion and better wildcard handling * should be implemented (see FsRtlDoesNameContainWildCards). * - *--*/ -#if 0 + *--*/ BOOLEAN NTAPI FsRtlIsNameInExpression(IN PUNICODE_STRING Expression, @@ -309,103 +308,11 @@ { k = 0; } - if (k == Name->Length / sizeof(WCHAR)) + if (k == Expression->Length / sizeof(WCHAR)) { return TRUE; } } return FALSE; -} -#endif -BOOLEAN -NTAPI -FsRtlIsNameInExpression(IN PUNICODE_STRING Expression, - IN PUNICODE_STRING Name, - IN BOOLEAN IgnoreCase, - IN PWCHAR UpcaseTable OPTIONAL) -{ - USHORT ExpressionPosition, NamePosition; - UNICODE_STRING TempExpression, TempName; - - ExpressionPosition = 0; - NamePosition = 0; - while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - NamePosition < (Name->Length / sizeof(WCHAR))) - { - if (Expression->Buffer[ExpressionPosition] == L'*') - { - ExpressionPosition++; - if (ExpressionPosition == (Expression->Length / sizeof(WCHAR))) - { - return TRUE; - } - while (NamePosition < (Name->Length / sizeof(WCHAR))) - { - TempExpression.Length = - TempExpression.MaximumLength = - Expression->Length - (ExpressionPosition * sizeof(WCHAR)); - TempExpression.Buffer = Expression->Buffer + ExpressionPosition; - TempName.Length = - TempName.MaximumLength = - Name->Length - (NamePosition * sizeof(WCHAR)); - TempName.Buffer = Name->Buffer + NamePosition; - /* FIXME: Rewrite to get rid of recursion */ - if (FsRtlIsNameInExpression(&TempExpression, &TempName, - IgnoreCase, UpcaseTable)) - { - return TRUE; - } - NamePosition++; - } - } - else - { - if (Expression->Buffer[ExpressionPosition] == L'?' || ( - IgnoreCase && !UpcaseTable && - RtlUpcaseUnicodeChar(Expression->Buffer[ExpressionPosition]) == - RtlUpcaseUnicodeChar(Name->Buffer[NamePosition])) || - (!IgnoreCase && Expression->Buffer[ExpressionPosition] == - Name->Buffer[NamePosition])) - { - NamePosition++; - - ExpressionPosition++; - } - else if (IgnoreCase && UpcaseTable) - { - if (UpcaseTable[Expression->Buffer[ExpressionPosition]] == - UpcaseTable[Name->Buffer[NamePosition]]) - { - NamePosition++; - ExpressionPosition++; - } - } - else - { - return FALSE; - } - } - } - - /* Handle matching of "f0_*.*" expression to "f0_000" file name. */ - if (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - Expression->Buffer[ExpressionPosition] == L'.') - { - while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - (Expression->Buffer[ExpressionPosition] == L'.' || - Expression->Buffer[ExpressionPosition] == L'*' || - Expression->Buffer[ExpressionPosition] == L'?')) - { - ExpressionPosition++; - } - } - - if (ExpressionPosition == (Expression->Length / sizeof(WCHAR)) && - NamePosition == (Name->Length / sizeof(WCHAR))) - { - return TRUE; - } - - return FALSE; }

1 0

[cgutman] 36538: - Remove dead code - Fixes coverity error 85
by cgutman＠svn.reactos.org 26 Sep '08

26 Sep '08

Author: cgutman Date: Fri Sep 26 13:10:50 2008 New Revision: 36538 URL: http://svn.reactos.org/svn/reactos?rev=36538&view=rev Log: - Remove dead code - Fixes coverity error 85 Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Fri Sep 26 13:10:50 2008 @@ -485,16 +485,9 @@ } else { - if (NdisStatus == NDIS_STATUS_SUCCESS) - { - NdisTransferData(&NdisStatus, Adapter->NdisHandle, - MacReceiveContext, 0, PacketSize, - NdisPacket, &BytesTransferred); - } - else - { - BytesTransferred = 0; - } + NdisTransferData(&NdisStatus, Adapter->NdisHandle, + MacReceiveContext, 0, PacketSize, + NdisPacket, &BytesTransferred); } TI_DbgPrint(DEBUG_DATALINK, ("Calling complete\n"));

1 0

[cfinck] 36537: Forgot these files in my last commits. Now fixing can begin...
by cfinck＠svn.reactos.org 26 Sep '08

26 Sep '08

Author: cfinck Date: Fri Sep 26 08:04:39 2008 New Revision: 36537 URL: http://svn.reactos.org/svn/reactos?rev=36537&view=rev Log: Forgot these files in my last commits. Now fixing can begin... Modified: trunk/web/reactos.org/htdocs/roscms/custom.php trunk/web/reactos.org/htdocs/roscms/index.php trunk/web/reactos.org/htdocs/roscms/roscms_conf.php trunk/web/reactos.org/htdocs/roscms/roscms_config.php trunk/web/reactos.org/htdocs/roscms/style.css trunk/web/reactos.org/htdocs/roscms/style_editor.css Modified: trunk/web/reactos.org/htdocs/roscms/custom.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/cust… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/custom.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/custom.php [iso-8859-1] Fri Sep 26 08:04:39 2008 @@ -22,11 +22,11 @@ $roscms_extern_brand = "RosCMS"; $roscms_extern_version = "v3"; - $roscms_extern_version_detail = "v3.0731"; + $roscms_extern_version_detail = "v3.0730"; - $roscms_intern_webserver_pages = "http://localhost/reactos.org/"; + $roscms_intern_webserver_pages = "http://www.reactos.org/"; - $roscms_intern_webserver_roscms = "http://localhost/reactos.org/roscms/"; + $roscms_intern_webserver_roscms = "http://www.reactos.org/roscms/"; $roscms_intern_page_link = $roscms_intern_webserver_roscms . "?page="; $roscms_intern_script_name = $roscms_intern_page_link . $rpm_page; Modified: trunk/web/reactos.org/htdocs/roscms/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inde… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/index.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/index.php [iso-8859-1] Fri Sep 26 08:04:39 2008 @@ -248,7 +248,8 @@ break; } - /*if ($rdf_uri_1 != "data_out") { +/* + if ($rdf_uri_1 != "data_out") { echo "<hr />"; echo "<p>"; echo "1) ".$rdf_uri_1."<br />"; @@ -261,6 +262,6 @@ echo "8) ".$rdf_uri_8; echo "</p>"; - }*/ - + } +*/ ?> Modified: trunk/web/reactos.org/htdocs/roscms/roscms_conf.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/rosc… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/roscms_conf.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/roscms_conf.php [iso-8859-1] Fri Sep 26 08:04:39 2008 @@ -5,7 +5,7 @@ $roscms_intern_path_html=""; // subfolder $roscms_intern_path_xhtml="xhtml/"; // subfolder $roscms_intern_path_gererator="roscms/"; // subfolder - $roscms_intern_path_server="http://localhost/reactos.org/"; // complete server path + $roscms_intern_path_server="http://www.reactos.org/"; // complete server path $roscms_intern_fileformat_html="html"; // htm $roscms_intern_w3cformat_html="html"; // html @@ -23,17 +23,17 @@ // System Paths $roscms_SET_dirname = "reactos.org/roscms"; - $roscms_SET_path = "http://localhost/".$roscms_SET_dirname."/"; + $roscms_SET_path = "http://www.".$roscms_SET_dirname."/"; $roscms_SET_path_ex = $roscms_SET_path."index.php/"; - $roscms_SET_path_full = "/<path-to-web-dir>/reactos.org/htdocs/roscms/"; + $roscms_SET_path_full = "/web/reactos.org/htdocs/roscms/"; // URI - $rdf_URI_tree_counter = -4; + $rdf_URI_tree_counter = -3; // Server Timezone - $rdf_server_timezone = 2; // for CET + $rdf_server_timezone = -1; // for CET // Database Name $rdf_dbname = "roscms"; @@ -77,7 +77,9 @@ $rdf_user_id = 0; $rdf_user_name = "Guest"; $rdf_user_level = 0; // 0 = guest, 1 = registered user, 2 = membership, 3 = moderator, 4 = author, 5 = admin - $rdf_user_timezone = 0; + $rdf_user_timezone = 1; $rdf_user_timezone_name = "UTC"; + //$rdf_user_id = 2; + //$rdf_user_name = "Klemens Friedl"; ?> Modified: trunk/web/reactos.org/htdocs/roscms/roscms_config.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/rosc… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/roscms_config.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/roscms_config.php [iso-8859-1] Fri Sep 26 08:04:39 2008 @@ -1,5 +1,4 @@ <?php - /* RosCMS - ReactOS Content Management System Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> @@ -18,24 +17,24 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + // Config: (please sync this with the database) $roscms_intern_version="RosCMS - http://www.reactos.org/"; // RosCMS info $roscms_intern_path="/"; // the dirs after http://www.reactos.org $roscms_intern_path_html=""; // subfolder $roscms_intern_path_xhtml="xhtml/"; // subfolder $roscms_intern_path_gererator="roscms/"; // subfolder - $roscms_intern_path_server="http://localhost/reactos.org/"; // complete server path - + $roscms_intern_path_server="http://www.reactos.org/"; // complete server path + $roscms_intern_fileformat_html="html"; // htm $roscms_intern_w3cformat_html="html"; // html $roscms_intern_fileformat_xhtml="html"; // htm $roscms_intern_w3cformat_xhtml="xhtml"; // html + $roscms_standard_output_format="both"; // html/xhtml/both $roscms_standard_language="en"; // en/de/fr/... - $roscms_standard_language_full="English"; // en/de/fr/... ?> Modified: trunk/web/reactos.org/htdocs/roscms/style.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/styl… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/style.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/style.css [iso-8859-1] Fri Sep 26 08:04:39 2008 @@ -76,6 +76,27 @@ font-weight: bold; } +h4 { + font-size: 16px; + color: #5984C3; + font-weight: bold; + margin-top: 5px; +} + +h5 { + font-size: 14px; + color: #5984C3; + font-weight: bold; + margin-top: 5px; +} + +h6 { + font-size: 12px; + color: #5984C3; + font-weight: bold; +} + + a { font-size: 12px; color: #006090; @@ -166,7 +187,7 @@ #leftNav ol li a { display: block; - width: 137px; + width: 145px; padding: 2px 4px 2px 4px; color: #3F3849; @@ -204,3 +225,16 @@ #bugzillaContent table { font-size: 12px; } + +/* icon-pics */ +p.icon_p { + clear: left; +} +img.icon, p.icon_p img { + height: 48px; + width: 48px; + float: left; + margin: 5px 10px 5px 10px; + border: 0; +} + Modified: trunk/web/reactos.org/htdocs/roscms/style_editor.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/styl… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/style_editor.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/style_editor.css [iso-8859-1] Fri Sep 26 08:04:39 2008 @@ -56,6 +56,26 @@ h3 { font-size: 18px; + color: #5984C3; + font-weight: bold; +} + +h4 { + font-size: 16px; + color: #5984C3; + font-weight: bold; + margin-top: 5px; +} + +h5 { + font-size: 14px; + color: #5984C3; + font-weight: bold; + margin-top: 5px; +} + +h6 { + font-size: 12px; color: #5984C3; font-weight: bold; } @@ -199,3 +219,18 @@ #bugzillaContent table { font-size: 12px; } + + +/* icon-pics */ +p.icon_p { + clear: left; +} +img.icon, p.icon_p img { + height: 48px; + width: 48px; + float: left; + margin: 5px 10px 5px 10px; + border: 0; +} + +

1 0

[cfinck] 36536: Commit missing stuff from the server (2/2) This is not yet meant to work, I'm just committing unmodified files from the Web server for making it easier to track my changes later. Added a new "roscms" subdirectory to the "resources" directory, installation and conversion files should go there. This way, the "roscms" dir on the server might really become a simple SVN checkout someday... :-)
by cfinck＠svn.reactos.org 26 Sep '08

26 Sep '08

Author: cfinck Date: Fri Sep 26 07:07:07 2008 New Revision: 36536 URL: http://svn.reactos.org/svn/reactos?rev=36536&view=rev Log: Commit missing stuff from the server (2/2) This is not yet meant to work, I'm just committing unmodified files from the Web server for making it easier to track my changes later. Added a new "roscms" subdirectory to the "resources" directory, installation and conversion files should go there. This way, the "roscms" dir on the server might really become a simple SVN checkout someday... :-) Added: trunk/web/reactos.org/resources/roscms/ trunk/web/reactos.org/resources/roscms/install.php - copied unchanged from r36512, trunk/web/reactos.org/htdocs/roscms/install.php trunk/web/reactos.org/resources/roscms/roscms.sql - copied unchanged from r36512, trunk/web/reactos.org/sql/roscms.sql trunk/web/reactos.org/resources/roscms/roscms_2to3_content.php - copied unchanged from r36512, trunk/web/reactos.org/htdocs/roscms/roscms_2to3_content.php trunk/web/reactos.org/resources/roscms/roscms_2to3_dyncontent.php - copied unchanged from r36512, trunk/web/reactos.org/htdocs/roscms/roscms_2to3_dyncontent.php trunk/web/reactos.org/resources/roscms/roscms_2to3_page.php - copied unchanged from r36512, trunk/web/reactos.org/htdocs/roscms/roscms_2to3_page.php trunk/web/reactos.org/resources/roscms/roscms_2to3_script.php - copied unchanged from r36512, trunk/web/reactos.org/htdocs/roscms/roscms_2to3_script.php Removed: trunk/web/reactos.org/htdocs/roscms/install.php trunk/web/reactos.org/htdocs/roscms/roscms.sql trunk/web/reactos.org/htdocs/roscms/roscms_2to3_content.php trunk/web/reactos.org/htdocs/roscms/roscms_2to3_dyncontent.php trunk/web/reactos.org/htdocs/roscms/roscms_2to3_page.php trunk/web/reactos.org/htdocs/roscms/roscms_2to3_script.php trunk/web/reactos.org/sql/roscms.sql Removed: trunk/web/reactos.org/htdocs/roscms/install.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inst… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/install.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/install.php (removed) @@ -1,398 +1,0 @@ -<?php - /* RosCMS install script */ - - // This function was taken from the sourceStream() function of "Database.php" of MediaWiki 1.10.0 and modified - function import_sql_dump( $file ) - { - $ret = TRUE; - $fp = fopen( $file, "r" ); - - while( !feof( $fp ) ) - { - $line = trim( fgets( $fp, 1024 ) ); - $sl = strlen( $line ) - 1; - - // Skip empty and comment lines - if( $sl < 0 || ( $line{0} == "-" && $line{1} == "-" ) ) - continue; - - // If this lines ends with a semicolon, it terminates the command - if( $line{$sl} == ";" ) - { - $done = true; - $line = substr( $line, 0, $sl ); - } - - $cmd .= "$line\n"; - - if( $done ) - { - if( !mysql_query( $cmd ) ) - { - $ret = FALSE; - echo "<br />" . mysql_errno() . ": " . mysql_error(); - } - - $done = false; - $cmd = ""; - } - } - - fclose( $fp ); - - if( $ret ) - echo "OK"; - - return $ret; - } - - $rpm_ready = ""; - if (array_key_exists("ready", $_GET)) $rpm_ready=htmlspecialchars($_GET["ready"]); -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> -<html> -<head> - <title>RosCMS v3 - Install Script</title> - <style type="text/css"> -  - </style> -</head> -<body> -<?php - if ($rpm_ready == "step2") { -?> - <h1>RosCMS v3 - Install Script - Step2</h1> - <form id="form1" method="post" action="install.php?ready=step3"> - <h3>Database Information</h3> - - <table> - <tr> - <td>Database Host Name:</td> - <td><input name="dbHost" type="text" id="dbHost" value="localhost" size="25" maxlength="255" /></td> - </tr> - <tr> - <td>Database User Name:</td> - <td><input name="dbUser" type="text" id="dbUser" value="root" size="25" maxlength="255" /></td> - </tr> - <tr> - <td>Database User Password:</td> - <td><input name="dbPass" type="text" id="dbPass" size="25" maxlength="255" /></td> - </tr> - <tr> - <td>Database Name:</td> - <td><input name="dbName" type="text" id="dbName" value="roscms" size="25" maxlength="255" /></td> - </tr> - </table> - - <h3>Server Information</h3> - <p>Complete Server Path: <input name="path_server" type="text" id="path_server" value="http://localhost/domain.com/" size="50" maxlength="255" /> - </p> - - <h3>RosCMS Settings</h3> - <p>RosCMS directory : - <input name="roscmsdir" type="text" id="roscmsdir" value="roscms" size="20" maxlength="50" /> - </p> - <p>Default Language: - <input name="lang_std" type="text" id="lang_std" value="en" size="5" maxlength="2" /> - </p> - <p>Default Language Name: - <input name="lang_std_full" type="text" id="lang_std_full" value="English" size="20" maxlength="50" /> - </p> - <p>Default Translation Language: - <input name="lang_std_trans" type="text" id="lang_std_trans" value="de" size="5" maxlength="2" /> - </p> - - <h3>Super Administrator Account</h3> - <p>Account-Name: - <input name="admin_name" type="text" id="admin_name" value="Admin" size="20" maxlength="50" /> - </p> - <p>Fullname: - <input name="admin_fullname" type="text" id="admin_fullname" value="Administrator" size="20" maxlength="50" /> -</p> - <p>Password: - <input name="admin_pwd" type="password" id="admin_pwd" size="20" maxlength="50" /> - <font size="1">(6 or more characters)</font></p> - <p>E-Mail Address: - <input name="admin_email" type="text" id="admin_email" value="admin(a)domain.com" size="50" maxlength="255" /> -</p> - <p> </p> - <input type="submit" name="Submit" value="Install RosCMS ..." /> - </form> -<?php - } - else if ($rpm_ready == "step3") { - echo "<h1>RosCMS v3 - Install Script - Step3</h1>"; - - $dbHost = "localhost"; - $dbUser = "root"; - $dbPass = ""; - $dbName = "roscms"; - $path_server = ""; - $path_roscms = ""; - $lang_std = ""; - $lang_std_full = ""; - $lang_std_trans = ""; - $admin_name = ""; - $admin_fullname = ""; - $admin_pwd = ""; - $admin_email = ""; - - if (array_key_exists("dbHost", $_POST)) $dbHost=htmlspecialchars($_POST["dbHost"]); - if (array_key_exists("dbUser", $_POST)) $dbUser=htmlspecialchars($_POST["dbUser"]); - if (array_key_exists("dbPass", $_POST)) $dbPass=htmlspecialchars($_POST["dbPass"]); - if (array_key_exists("dbName", $_POST)) $dbName=htmlspecialchars($_POST["dbName"]); - if (array_key_exists("path_server", $_POST)) $path_server=htmlspecialchars($_POST["path_server"]); - if (array_key_exists("roscmsdir", $_POST)) $path_roscms=htmlspecialchars($_POST["roscmsdir"]); - if (array_key_exists("lang_std", $_POST)) $lang_std=htmlspecialchars($_POST["lang_std"]); - if (array_key_exists("lang_std_full", $_POST)) $lang_std_full=htmlspecialchars($_POST["lang_std_full"]); - if (array_key_exists("lang_std_trans", $_POST)) $lang_std_trans=htmlspecialchars($_POST["lang_std_trans"]); - if (array_key_exists("admin_name", $_POST)) $admin_name=htmlspecialchars($_POST["admin_name"]); - if (array_key_exists("admin_fullname", $_POST)) $admin_fullname=htmlspecialchars($_POST["admin_fullname"]); - if (array_key_exists("admin_pwd", $_POST)) $admin_pwd=htmlspecialchars($_POST["admin_pwd"]); - if (array_key_exists("admin_email", $_POST)) $admin_email=htmlspecialchars($_POST["admin_email"]); - - - if ($path_server == "") { - die("Invalid server-path!"); - } - - if ($path_roscms == "" || $lang_std == "" || $lang_std_full == "" || lang_std_trans == "") { - die("Invalid RosCMS config settings!"); - } - - if ($admin_name == "" || $admin_pwd == "" || $admin_email == "") { - die("Invalid account settings!"); - } - - - echo "Connecting to the MySQL Server... "; - $connect = mysql_connect($dbHost, $dbUser, $dbPass) or die("Cannot connect to the MySQL Server!"); - echo "OK<br />"; - - echo "Creating the Database... "; - mysql_query("CREATE DATABASE `". mysql_real_escape_string($dbName) ."`") or die( mysql_errno() . ": " . mysql_error() ); - echo "OK<br />"; - - echo "Selecting the Database... "; - mysql_select_db($dbName, $connect) or die("Cannot find and select <b>".$dbName."</b>!"); - echo "OK<br />"; - - echo "Importing the SQL Data... "; - if( !import_sql_dump( "roscms.sql" ) ) { - die("Error: import not successfull!"); - } - echo "<br />"; - - echo "Adding first account... "; - $insert_account = mysql_query("INSERT INTO `users` ( `user_id` , `user_name` , `user_roscms_password` , `user_roscms_getpwd_id` , `user_timestamp_touch` , `user_timestamp_touch2` , `user_login_counter` , `user_account_enabled` , `user_account_hidden` , `user_register` , `user_fullname` , `user_email` , `user_website` , `user_language` , `user_country` , `user_timezone` , `user_occupation` , `user_description` , `user_setting_multisession` , `user_setting_browseragent` , `user_setting_ipaddress` , `user_setting_timeout` ) - VALUES ( - NULL , - '".mysql_real_escape_string($admin_name)."', - MD5( '".mysql_real_escape_string($admin_pwd)."' ) , - '', - '', - NOW( ) , - '0', - 'yes', - 'no', - NOW( ) , - '".mysql_real_escape_string($admin_fullname)."', - '".mysql_real_escape_string($admin_email)."', - '".mysql_real_escape_string($path_server)."', - '".mysql_real_escape_string($lang_std)."', - '', - '', - '', - '', - 'true', - 'true', - 'true', - 'true' - );") or die("Cannot insert first account!"); - echo "OK<br />"; - - echo "Adding account memberships... "; - $insert_membership = mysql_query("INSERT INTO `usergroup_members` ( `usergroupmember_userid` , `usergroupmember_usergroupid` ) - VALUES ( - '1', - 'user' - ), - ( - '1', - 'ros_sadmin' - );") or die("Cannot insert account memberships!"); - echo "OK<br />"; - - - // RosCMS settings - echo "Creating roscms config file... "; - $fp = fopen("custom.php", "w"); - flock($fp,2); - fputs($fp, '<?php - - /* - RosCMS - ReactOS Content Management System - Copyright (C) 2007 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. - */ - - - global $rpm_page; - - $roscms_extern_brand = "RosCMS"; - $roscms_extern_version = "v3"; - $roscms_extern_version_detail = "v3.0731"; - - $roscms_intern_webserver_pages = "'.$path_server.'"; - - $roscms_intern_roscms_dir = "'.$path_roscms.'"; - $roscms_intern_webserver_roscms = "'.$path_server.'".$roscms_intern_roscms_dir."/"; - $roscms_intern_page_link = $roscms_intern_webserver_roscms . "?page="; - $roscms_intern_script_name = $roscms_intern_page_link . $rpm_page; - - $roscms_intern_script_branch = $roscms_intern_script_name. "&branch="; - - $roscms_standard_language="'.$lang_std.'"; // en/de/fr/... - $roscms_standard_language_full="'.$lang_std_full.'"; // English/German/... - $roscms_standard_language_trans="'.$lang_std_trans.'"; // en/de/fr/...'); - - fputs($fp, "\n ?>"); - flock($fp, 3); - fclose($fp); - echo "OK<br />"; - - // RosCMS database login config - echo "Creating roscms database config file... "; - $fp = fopen("connect.db.php", "w"); - flock($fp,2); - fputs($fp, '<?php - /* - RosCMS - ReactOS Content Management System - Copyright (C) 2005-2007 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 = "'.$dbHost.'"; - $dbUser = "'.$dbUser.'"; - $dbPass = "'.$dbPass.'"; - $dbName = "'.$dbName.'"; - $roscms_database = $dbName; - - $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 = "";'); - - fputs($fp, "\n ?>"); - flock($fp, 3); - fclose($fp); - echo "OK<br />"; - - - echo "<p> </p>"; - echo "<p><b>RosCMS was set up successfully!</b></p>"; - - echo "<p> </p>"; - echo "<p>Delete this \"install.php\" file on the server and <a href=\"index.php?page=login\">then login into RosCMS</a> with your account.</p>"; - - } - else { -?> - <h1>RosCMS v3 - Install Script - Step1</h1> - <p><i>© Klemens Friedl 2005-2007, GNU GPL 2 license</i></p> - <p> </p> -<?php - if (get_magic_quotes_gpc()) { - die("<p>ERROR: Disable 'magic quotes' in php.ini (=Off)</p>"); - } - - $phpver = explode('-', phpversion()); - $phpver = $phpver[0]; - - if (substr($phpver, 0, 1) <= 3) { - die("<p>ERROR: RosCMS v3 don't work with versions prior to PHP 4!</p>"); - } - else if (substr($phpver, 0, 1) == 4) { - echo "<p>RosCMS v3 should work fine with PHP 4, make sure you use an up-to-date PHP 4 version. If possible and reasonable, upgrade to PHP 5 or later.</p>"; - } -?> - <p>Your PHP installation is configured correctly. RosCMS has been tested with MySQL 4 and 5. </p> - <p>Click <i>Next</i> to continue!</p> - - <p><a href="install.php?ready=step2"><b>Next ></b></a></p> -<?php - } -?> -</body> -</html> Removed: trunk/web/reactos.org/htdocs/roscms/roscms.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/rosc… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/roscms.sql [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/roscms.sql (removed) @@ -1,486 +1,0 @@ --- Database: `roscms` --- --- Date: 2007-08-13 11:12 --- MySQL-Version: 5.0.33 --- PHP-Version: 5.2.1 --- - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_` --- - -CREATE TABLE `data_` ( - `data_id` int(11) NOT NULL auto_increment, - `data_name` varchar(100) collate utf8_unicode_ci NOT NULL COMMENT 'together with page_type unique entries', - `data_type` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT '"page", "layout", "content", "script"', - `data_acl` varchar(50) collate utf8_unicode_ci NOT NULL default 'default', - PRIMARY KEY (`data_id`), - KEY `data_name` (`data_name`,`data_type`), - KEY `data_type` (`data_type`), - KEY `data_acl` (`data_acl`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='all RosCMS v1 "pages", "content", "dyncontent" and "inctext"'; - -INSERT INTO `data_` VALUES (1, 'index', 'page', 'defaultpage'); -INSERT INTO `data_` VALUES (2, 'default', 'template', 'layout'); -INSERT INTO `data_` VALUES (3, 'index', 'content', 'default'); -INSERT INTO `data_` VALUES (4, 'news', 'script', 'script'); -INSERT INTO `data_` VALUES (5, 'news_page', 'content', 'default'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_a` --- - -CREATE TABLE `data_a` ( - `data_id` int(11) NOT NULL auto_increment, - `data_name` varchar(100) collate utf8_unicode_ci NOT NULL COMMENT 'together with page_type unique entries', - `data_type` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT '"page", "layout", "content", "script"', - `data_acl` varchar(50) collate utf8_unicode_ci NOT NULL default 'default', - PRIMARY KEY (`data_id`), - KEY `data_name` (`data_name`,`data_type`), - KEY `data_type` (`data_type`), - KEY `data_acl` (`data_acl`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='all RosCMS v1 "pages", "content", "dyncontent" and "inctext"'; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_revision` --- - -CREATE TABLE `data_revision` ( - `rev_id` int(11) NOT NULL auto_increment COMMENT 'unique revisions id', - `data_id` int(11) NOT NULL, - `rev_version` int(11) NOT NULL COMMENT 'version number increase with every entry change', - `rev_language` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT 'language code ("en", "de", etc.)', - `rev_usrid` int(11) NOT NULL COMMENT 'user id who saved the entry', - `rev_datetime` datetime NOT NULL, - `rev_date` date NOT NULL, - `rev_time` time NOT NULL, - PRIMARY KEY (`rev_id`), - KEY `data_id` (`data_id`), - KEY `rev_language` (`rev_language`), - KEY `rev_version` (`rev_version`), - KEY `rev_datetime` (`rev_datetime`), - KEY `rev_usrid` (`rev_usrid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_revision` VALUES (1, 1, 1, 'en', 1, '2007-08-13 17:03:44', '2007-08-13', '17:03:44'); -INSERT INTO `data_revision` VALUES (2, 2, 1, 'en', 1, '2007-08-13 17:05:03', '2007-08-13', '17:05:03'); -INSERT INTO `data_revision` VALUES (6, 3, 2, 'en', 1, '2007-08-13 17:15:15', '2007-08-13', '17:15:15'); -INSERT INTO `data_revision` VALUES (5, 4, 2, 'en', 1, '2007-08-13 17:11:36', '2007-08-13', '17:11:36'); -INSERT INTO `data_revision` VALUES (7, 5, 1, 'en', 1, '2007-08-13 17:15:20', '2007-08-13', '17:15:20'); -INSERT INTO `data_revision` VALUES (8, 5, 1, 'en', 1, '2007-08-13 17:15:45', '2007-08-13', '17:15:45'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_revision_a` --- - -CREATE TABLE `data_revision_a` ( - `rev_id` int(11) NOT NULL auto_increment COMMENT 'unique revisions id', - `data_id` int(11) NOT NULL, - `rev_version` int(11) NOT NULL COMMENT 'version number increase with every entry change', - `rev_language` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT 'language code ("en", "de", etc.)', - `rev_usrid` int(11) NOT NULL COMMENT 'user id who saved the entry', - `rev_datetime` datetime NOT NULL, - `rev_date` date NOT NULL, - `rev_time` time NOT NULL, - PRIMARY KEY (`rev_id`), - KEY `data_id` (`data_id`), - KEY `rev_language` (`rev_language`), - KEY `rev_version` (`rev_version`), - KEY `rev_datetime` (`rev_datetime`), - KEY `rev_usrid` (`rev_usrid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_security` --- - -CREATE TABLE `data_security` ( - `sec_name` varchar(50) collate utf8_unicode_ci NOT NULL, - `sec_fullname` varchar(100) collate utf8_unicode_ci NOT NULL, - `sec_description` varchar(255) collate utf8_unicode_ci NOT NULL, - `sec_branch` varchar(10) collate utf8_unicode_ci NOT NULL, - `sec_lev1_read` tinyint(4) NOT NULL default '0', - `sec_lev1_write` tinyint(4) NOT NULL default '0', - `sec_lev1_add` tinyint(4) NOT NULL default '0', - `sec_lev1_pub` tinyint(4) NOT NULL default '0', - `sec_lev1_trans` tinyint(4) NOT NULL default '0', - `sec_lev2_read` tinyint(4) NOT NULL default '0', - `sec_lev2_write` tinyint(4) NOT NULL default '0', - `sec_lev2_add` tinyint(4) NOT NULL default '0', - `sec_lev2_pub` tinyint(4) NOT NULL default '0', - `sec_lev2_trans` tinyint(4) NOT NULL default '0', - `sec_lev3_read` tinyint(4) NOT NULL default '0', - `sec_lev3_write` tinyint(4) NOT NULL default '0', - `sec_lev3_add` tinyint(4) NOT NULL default '0', - `sec_lev3_pub` tinyint(4) NOT NULL default '0', - `sec_lev3_trans` tinyint(4) NOT NULL default '0', - `sec_allow` varchar(255) collate utf8_unicode_ci NOT NULL, - `sec_deny` varchar(255) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`sec_name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS content security'; - -INSERT INTO `data_security` VALUES ('default', 'Content (default)', 'Default content security ACL; normal translator cannot publish nor add new content', 'website', 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, '', ''); -INSERT INTO `data_security` VALUES ('script', 'Script or Variable', 'Entry contain scripts, variables or similar content which can only be accessed and altered by admins.', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, '', ''); -INSERT INTO `data_security` VALUES ('layout', 'Layout', 'Website layout related content, changing may destroy the website layout, so be careful!', 'website', 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, '', '|transmaint|'); -INSERT INTO `data_security` VALUES ('announcement', 'Official announcement', 'Official announcement, which shouldn''t be altered by anyone except admins and devs', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, '|developer|', ''); -INSERT INTO `data_security` VALUES ('notrans', 'No translation needed', 'Content don''t need a translation.', '', 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, '', ''); -INSERT INTO `data_security` VALUES ('rosversion', 'ReactOS versions number', 'Currrent ReactOS version number, change the related contents on every release day!', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, '|developer|', ''); -INSERT INTO `data_security` VALUES ('defaultpage', 'Page (default)', 'Default page security ACL', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|developer|', ''); -INSERT INTO `data_security` VALUES ('defaultmenu', 'Menu (default)', 'Menu content which can be translated by language maintainers', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|transmaint|', ''); -INSERT INTO `data_security` VALUES ('system', 'System', 'RosCMS system', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '|ros_sadmin|', ''); -INSERT INTO `data_security` VALUES ('readonly', 'Read-Only', 'Read only, noone can alter this', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, '', ''); -INSERT INTO `data_security` VALUES ('langmaint', 'Language Maintainer', 'Language-Group related content', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|transmaint|', ''); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_stext` --- - -CREATE TABLE `data_stext` ( - `stext_id` int(11) NOT NULL auto_increment, - `data_rev_id` int(11) NOT NULL, - `stext_name` varchar(100) collate utf8_unicode_ci NOT NULL, - `stext_content` varchar(255) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`stext_id`), - KEY `data_rev_id` (`data_rev_id`), - FULLTEXT KEY `stext_content` (`stext_content`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_stext` VALUES (14, 1, 'description', 'test page'); -INSERT INTO `data_stext` VALUES (13, 1, 'comment', ''); -INSERT INTO `data_stext` VALUES (12, 2, 'description', 'test template'); -INSERT INTO `data_stext` VALUES (15, 1, 'title', 'Index'); -INSERT INTO `data_stext` VALUES (19, 6, 'description', 'test content'); -INSERT INTO `data_stext` VALUES (18, 5, 'description', 'news php script'); -INSERT INTO `data_stext` VALUES (22, 7, 'description', 'news issue 1'); -INSERT INTO `data_stext` VALUES (23, 7, 'title', 'News_page'); -INSERT INTO `data_stext` VALUES (26, 8, 'description', 'news issue 2'); -INSERT INTO `data_stext` VALUES (27, 8, 'title', 'News_page'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_stext_a` --- - -CREATE TABLE `data_stext_a` ( - `stext_id` int(11) NOT NULL auto_increment, - `data_rev_id` int(11) NOT NULL, - `stext_name` varchar(100) collate utf8_unicode_ci NOT NULL, - `stext_content` varchar(255) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`stext_id`), - KEY `data_rev_id` (`data_rev_id`), - FULLTEXT KEY `stext_content` (`stext_content`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag` --- - -CREATE TABLE `data_tag` ( - `tag_id` int(11) NOT NULL auto_increment, - `data_id` int(11) NOT NULL, - `data_rev_id` int(11) NOT NULL, - `tag_name_id` int(11) NOT NULL, - `tag_value_id` int(11) NOT NULL, - `tag_usrid` int(11) NOT NULL, - PRIMARY KEY (`tag_id`), - KEY `data_id` (`data_id`), - KEY `data_rev_id` (`data_rev_id`), - KEY `tag_name_id` (`tag_name_id`), - KEY `tag_value_id` (`tag_value_id`), - KEY `tag_usrid` (`tag_usrid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_tag` VALUES (11, 1, 1, 1, 5, -1); -INSERT INTO `data_tag` VALUES (2, 1, 1, 2, 2, -1); -INSERT INTO `data_tag` VALUES (10, 2, 2, 1, 5, -1); -INSERT INTO `data_tag` VALUES (15, 4, 5, 5, 7, -1); -INSERT INTO `data_tag` VALUES (14, 4, 5, 1, 5, -1); -INSERT INTO `data_tag` VALUES (24, 3, 6, 1, 5, -1); -INSERT INTO `data_tag` VALUES (22, 5, 7, 1, 5, -1); -INSERT INTO `data_tag` VALUES (18, 5, 7, 6, 9, -1); -INSERT INTO `data_tag` VALUES (21, 5, 8, 1, 5, -1); -INSERT INTO `data_tag` VALUES (20, 5, 8, 6, 10, -1); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag_a` --- - -CREATE TABLE `data_tag_a` ( - `tag_id` int(11) NOT NULL auto_increment, - `data_id` int(11) NOT NULL, - `data_rev_id` int(11) NOT NULL, - `tag_name_id` int(11) NOT NULL, - `tag_value_id` int(11) NOT NULL, - `tag_usrid` int(11) NOT NULL, - PRIMARY KEY (`tag_id`), - KEY `data_id` (`data_id`), - KEY `data_rev_id` (`data_rev_id`), - KEY `tag_name_id` (`tag_name_id`), - KEY `tag_value_id` (`tag_value_id`), - KEY `tag_usrid` (`tag_usrid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag_name` --- - -CREATE TABLE `data_tag_name` ( - `tn_id` int(11) NOT NULL auto_increment, - `tn_name` varchar(100) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`tn_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_tag_name` VALUES (1, 'status'); -INSERT INTO `data_tag_name` VALUES (2, 'extension'); -INSERT INTO `data_tag_name` VALUES (4, 'star'); -INSERT INTO `data_tag_name` VALUES (5, 'kind'); -INSERT INTO `data_tag_name` VALUES (6, 'number'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag_name_a` --- - -CREATE TABLE `data_tag_name_a` ( - `tn_id` int(11) NOT NULL auto_increment, - `tn_name` varchar(100) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`tn_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag_value` --- - -CREATE TABLE `data_tag_value` ( - `tv_id` int(11) NOT NULL auto_increment, - `tv_value` varchar(255) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`tv_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_tag_value` VALUES (7, 'php'); -INSERT INTO `data_tag_value` VALUES (2, 'html'); -INSERT INTO `data_tag_value` VALUES (4, 'off'); -INSERT INTO `data_tag_value` VALUES (5, 'stable'); -INSERT INTO `data_tag_value` VALUES (9, '1'); -INSERT INTO `data_tag_value` VALUES (10, '2'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag_value_a` --- - -CREATE TABLE `data_tag_value_a` ( - `tv_id` int(11) NOT NULL auto_increment, - `tv_value` varchar(255) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`tv_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_text` --- - -CREATE TABLE `data_text` ( - `text_id` int(11) NOT NULL auto_increment, - `data_rev_id` int(11) NOT NULL, - `text_name` varchar(100) collate utf8_unicode_ci NOT NULL, - `text_content` text collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`text_id`), - KEY `data_rev_id` (`data_rev_id`), - FULLTEXT KEY `text_content` (`text_content`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_text` VALUES (9, 1, 'content', '[#templ_default]'); -INSERT INTO `data_text` VALUES (8, 2, 'content', '[#cont_head][#cont_menu_top][#cont_menu_side][#cont_contmenu_[#%NAME%]][#cont_menu_search][#cont_menu_language][#cont_menu_misc][#cont_%NAME%][#cont_bottom]'); -INSERT INTO `data_text` VALUES (13, 6, 'content', '<h1>Welcome to RosCMS v3</h1><p>RosCMS test page</p>[#inc_news]'); -INSERT INTO `data_text` VALUES (15, 7, 'content', 'news #1 ...'); -INSERT INTO `data_text` VALUES (17, 8, 'content', 'news #2'); -INSERT INTO `data_text` VALUES (12, 5, 'content', '<h3>News</h3> <?php $tmp_year = "2085"; $query_content = mysql_query("SELECT d.data_name, r.rev_usrid, s1.stext_content AS ''title'', s2.stext_content AS ''description'', v.tv_value as ''numb'', r.rev_date FROM data_ d, data_revision r, data_stext s1, data_stext s2, data_tag a, data_tag_name n, data_tag_value v WHERE d.data_name = ''news_page'' AND d.data_type = ''content'' AND r.data_id = d.data_id AND (r.rev_language = ''".mysql_real_escape_string($roscms_template_var_lang)."'' OR r.rev_language = ''en'') AND r.rev_version > 0 AND s1.data_rev_id = r.rev_id AND s1.stext_name = ''title'' AND s2.data_rev_id = r.rev_id AND s2.stext_name = ''description'' AND r.data_id = a.data_id AND r.rev_id = a.data_rev_id AND a.tag_usrid = ''-1'' AND a.tag_name_id = n.tn_id AND n.tn_name = ''number'' AND a.tag_value_id = v.tv_id ORDER BY r.rev_datetime DESC LIMIT 3;"); while($result_content = mysql_fetch_array($query_content)) { -if ($tmp_year > substr($result_content[''rev_date''], 0, 4)) { $tmp_year = substr($result_content[''rev_date''], 0, 4); echo "<h3>".$tmp_year."</h3>"; } $query_usraccount= mysql_query("SELECT user_name, user_fullname FROM users WHERE user_id = ''".mysql_real_escape_string($result_content["rev_usrid"])."'' LIMIT 1;"); $result_usraccount=mysql_fetch_array($query_usraccount); ?> <p align="left"><b><font color="#666666"><?php echo $result_content[''rev_date'']; ?>, <?php if ($result_usraccount[''user_fullname'']) { echo $result_usraccount[''user_fullname'']; } else { echo $result_usraccount[''user_name'']; } ?> </font></b><br /> <b><a href="<?php echo "[#link_".$result_content["data_name"]."_".$result_content["numb"]."]"; ?>"><?php echo $result_content["title"]; ?></a></b><br /> <?php echo $result_content["description"]; ?></p> <?php } // end while ?> '); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_text_a` --- - -CREATE TABLE `data_text_a` ( - `text_id` int(11) NOT NULL auto_increment, - `data_rev_id` int(11) NOT NULL, - `text_name` varchar(100) collate utf8_unicode_ci NOT NULL, - `text_content` text collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`text_id`), - KEY `data_rev_id` (`data_rev_id`), - FULLTEXT KEY `text_content` (`text_content`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_user_filter` --- - -CREATE TABLE `data_user_filter` ( - `filt_id` int(11) NOT NULL auto_increment, - `filt_usrid` int(11) NOT NULL, - `filt_title` varchar(50) collate utf8_unicode_ci NOT NULL, - `filt_type` smallint(6) NOT NULL default '1', - `filt_string` varchar(255) collate utf8_unicode_ci NOT NULL, - `filt_datetime` datetime NOT NULL, - `filt_usage` int(11) NOT NULL, - `filt_usagedate` datetime NOT NULL, - PRIMARY KEY (`filt_id`), - KEY `filt_usrid` (`filt_usrid`), - KEY `filt_name` (`filt_title`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `languages` --- - -CREATE TABLE `languages` ( - `lang_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', - `lang_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `lang_name_org` varchar(100) collate utf8_unicode_ci NOT NULL, - `lang_level` int(11) NOT NULL default '0', - PRIMARY KEY (`lang_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='available languages'; - -INSERT INTO `languages` VALUES ('en', 'English', 'English', 10); -INSERT INTO `languages` VALUES ('de', 'German', 'Deutsch', 8); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `subsys_mappings` --- - -CREATE TABLE `subsys_mappings` ( - `map_roscms_userid` bigint(20) NOT NULL default '0', - `map_subsys_name` varchar(10) character set utf8 NOT NULL default '', - `map_subsys_userid` int(7) NOT NULL default '0', - PRIMARY KEY (`map_roscms_userid`,`map_subsys_name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `user_sessions` --- - -CREATE TABLE `user_sessions` ( - `usersession_id` varchar(32) character set utf8 NOT NULL default '' COMMENT 'Unique ID of this session', - `usersession_user_id` bigint(20) NOT NULL default '0' COMMENT 'User this session belongs to', - `usersession_expires` datetime default NULL COMMENT 'Expiry date/time (NULL if does not expire)', - `usersession_browseragent` varchar(255) character set utf8 NOT NULL default '' COMMENT 'HTTP_USER_AGENT when this session was created', - `usersession_ipaddress` varchar(15) character set utf8 NOT NULL default '' COMMENT 'IP address from which this session was created', - `usersession_created` datetime NOT NULL default '0000-00-00 00:00:00' COMMENT 'session created (date/time) - all session will get deleted ... by date', - PRIMARY KEY (`usersession_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0 COMMENT='Sessions'; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `usergroup_members` --- - -CREATE TABLE `usergroup_members` ( - `usergroupmember_userid` bigint(20) NOT NULL default '0', - `usergroupmember_usergroupid` varchar(10) collate utf8_unicode_ci NOT NULL default 'user' -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `usergroups` --- - -CREATE TABLE `usergroups` ( - `usrgroup_name_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', - `usrgroup_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `usrgroup_intern_id` varchar(25) collate utf8_unicode_ci NOT NULL default '', - `usrgroup_seclev` tinyint(4) NOT NULL default '0', - `usrgroup_securitylevel` tinyint(4) NOT NULL default '0', - `usrgroup_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', - PRIMARY KEY (`usrgroup_name_id`), - UNIQUE KEY `usrgroup_name` (`usrgroup_name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `usergroups` VALUES ('ros_admin', 'Administrator', 'roscms_usrgrp_admin', 3, 70, 'Administrator-Group'); -INSERT INTO `usergroups` VALUES ('user', 'User', 'roscms_usrgrp_user', 0, 0, 'Normal Visitors'); -INSERT INTO `usergroups` VALUES ('developer', 'Developer', 'roscms_usrgrp_dev', 2, 50, 'Developer'); -INSERT INTO `usergroups` VALUES ('moderator', 'Moderator', 'roscms_usrgrp_team', 2, 20, 'Website Moderators'); -INSERT INTO `usergroups` VALUES ('translator', 'Translator', 'roscms_usrgrp_trans', 1, 10, 'Translators'); -INSERT INTO `usergroups` VALUES ('ros_sadmin', 'Super-Administrator', 'roscms_usrgrp_sadmin', 3, 100, 'Super-Administrator-Group'); -INSERT INTO `usergroups` VALUES ('transmaint', 'Tranlation Maintainer', 'roscms_usrgrp_trans', 2, 15, 'Translation Maintainer'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `users` --- - -CREATE TABLE `users` ( - `user_id` bigint(20) NOT NULL auto_increment, - `user_name` varchar(20) collate utf8_unicode_ci NOT NULL default '', - `user_roscms_password` varchar(32) collate utf8_unicode_ci NOT NULL default '', - `user_roscms_getpwd_id` varchar(50) collate utf8_unicode_ci NOT NULL default '', - `user_timestamp_touch` varchar(50) collate utf8_unicode_ci NOT NULL default '', - `user_timestamp_touch2` timestamp NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `user_login_counter` bigint(20) NOT NULL default '0', - `user_account_enabled` varchar(10) collate utf8_unicode_ci NOT NULL default 'no', - `user_account_hidden` varchar(5) collate utf8_unicode_ci NOT NULL default 'no', - `user_register` timestamp NULL default NULL, - `user_fullname` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `user_email` varchar(150) collate utf8_unicode_ci NOT NULL default '', - `user_website` varchar(150) collate utf8_unicode_ci NOT NULL default '', - `user_language` varchar(2) collate utf8_unicode_ci NOT NULL default '', - `user_country` varchar(2) collate utf8_unicode_ci NOT NULL default '', - `user_timezone` varchar(3) collate utf8_unicode_ci NOT NULL default '', - `user_occupation` varchar(50) collate utf8_unicode_ci NOT NULL default '', - `user_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `user_setting_multisession` varchar(5) collate utf8_unicode_ci NOT NULL default 'false', - `user_setting_browseragent` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', - `user_setting_ipaddress` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', - `user_setting_timeout` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', - PRIMARY KEY (`user_id`), - UNIQUE KEY `user_name` (`user_name`), - UNIQUE KEY `user_email` (`user_email`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table'; - Removed: trunk/web/reactos.org/htdocs/roscms/roscms_2to3_content.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/rosc… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/roscms_2to3_content.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/roscms_2to3_content.php (removed) @@ -1,143 +1,0 @@ -<?php - - error_reporting(E_ALL); - ini_set('error_reporting', E_ALL); - - if (get_magic_quotes_gpc()) { - die("ERROR: Disable 'magic quotes' in php.ini (=Off)"); - } - - if ( !defined('ROSCMS_SYSTEM') ) { - define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity - } - - - require("connect.db.php"); - require("inc/data_edit.php"); - - - echo "<h1>RosCMS Database Update - v2 to v3 - Content</h1>"; - - set_time_limit(0); // unlimited script run time - - - echo "<h3>Contents</h3>"; - echo "<ul>"; - $query_i_content = mysql_query("SELECT * - FROM content - WHERE content_active = 1 - AND content_lang != 'xhtml' - ORDER BY content_lang ASC, content_name ASC, content_version DESC, content_active DESC;"); - while ($result_i_content = mysql_fetch_array($query_i_content)) { - $roscms_i_lang = $result_i_content['content_lang']; - if ($roscms_i_lang == "all") { - $roscms_i_lang = "en"; - } - if ($roscms_i_lang == "html") { - $roscms_i_lang = "en"; - } - - echo "<li>".$result_i_content['content_name']." (".$result_i_content['content_lang'].")</li>"; - - $query_import_content = mysql_query("SELECT * - FROM data_ - WHERE data_name = '".mysql_real_escape_string($result_i_content['content_name'])."' - AND data_type = 'content' - LIMIT 1;"); - $result_import_content = mysql_fetch_array($query_import_content); - - - if ($result_import_content['data_id'] == "") { - $insert_page = mysql_query("INSERT INTO `data_` ( `data_id` , `data_name` , `data_type` , `data_acl`) - VALUES ( - NULL , - '".mysql_real_escape_string($result_i_content['content_name'])."', - 'content', - 'default' - );"); - } - - $query_import_content3 = mysql_query("SELECT * - FROM data_ - WHERE data_name = '".mysql_real_escape_string($result_i_content['content_name'])."' - AND data_type = 'content' - ORDER BY data_id DESC - LIMIT 1;"); - $result_import_content3 = mysql_fetch_array($query_import_content3); - - $query_import_content2 = mysql_query("SELECT COUNT(*) - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($result_import_content3['data_id'])."' - AND rev_language = '".mysql_real_escape_string($roscms_i_lang)."' - LIMIT 1;"); - $result_import_content2 = mysql_fetch_row($query_import_content2); - - if ($result_import_content2[0] <= 0) { - echo "<h6>lang: ".$result_i_content['content_lang']."</h6>"; - // revision entry doesn't exist - $insert_content_rev = mysql_query("INSERT INTO data_revision ( rev_id , data_id , rev_version , rev_language , rev_usrid , rev_datetime , rev_date , rev_time ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_import_content3['data_id'])."', - '".mysql_real_escape_string($result_i_content['content_version'])."', - '".mysql_real_escape_string($roscms_i_lang)."', - '".mysql_real_escape_string($result_i_content['content_usrname_id'])."', - '".mysql_real_escape_string($result_i_content['content_date']." ".$result_i_content['content_time'])."', - '".mysql_real_escape_string($result_i_content['content_date'])."', - '".mysql_real_escape_string($result_i_content['content_time'])."' - );"); - - - $query_import_content4 = mysql_query("SELECT rev_id - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($result_import_content3['data_id'])."' - AND rev_language = '".mysql_real_escape_string($roscms_i_lang)."' - ORDER BY rev_id DESC - LIMIT 1;"); - $result_import_content4 = mysql_fetch_array($query_import_content4); - - if ($result_import_content4['rev_id'] != "") { - - // stext: titel, description, extention, (property) - $insert_import_content_stext = mysql_query("INSERT INTO data_stext ( stext_id , data_rev_id , stext_name , stext_content ) - VALUES - ( - NULL , - '".mysql_real_escape_string($result_import_content4['rev_id'])."', - 'description', - '".mysql_real_escape_string($result_i_content['content_name'])."' - );"); - - // text: content - $insert_import_content_text = mysql_query("INSERT INTO data_text ( text_id , data_rev_id , text_name , text_content ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_import_content4['rev_id'])."', - 'content', - '".mysql_real_escape_string($result_i_content['content_text'])."' - );"); - - // tag: status = stable - tag_add($result_import_content3['data_id'], $result_import_content4['rev_id'], "status", "stable", "-1"); - - // tag: visible = all - tag_add($result_import_content3['data_id'], $result_import_content4['rev_id'], "visible", "all", "-1"); - - // tag: kind = default - tag_add($result_import_content3['data_id'], $result_import_content4['rev_id'], "kind", "default", "-1"); - } - } - } - echo "</ul>"; - - - echo "\n<hr />\n"; - - - - - - echo "\n<hr />\n"; - - -?> Removed: trunk/web/reactos.org/htdocs/roscms/roscms_2to3_dyncontent.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/rosc… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/roscms_2to3_dyncontent.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/roscms_2to3_dyncontent.php (removed) @@ -1,139 +1,0 @@ -<?php - - error_reporting(E_ALL); - ini_set('error_reporting', E_ALL); - - if (get_magic_quotes_gpc()) { - die("ERROR: Disable 'magic quotes' in php.ini (=Off)"); - } - - if ( !defined('ROSCMS_SYSTEM') ) { - define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity - } - - - require("connect.db.php"); - require("inc/data_edit.php"); - - - echo "<h1>RosCMS Database Update - v2 to v3 - DynContent</h1>"; - - set_time_limit(0); // unlimited script run time - - echo "<h3>Dynamic Contents</h3>"; - echo "<ul>"; - $query_i_content = mysql_query("SELECT * - FROM dyn_content - WHERE dyn_content_active = 1 - AND dyn_content_nr = 1 - AND dyn_content_lang = 'all' - ORDER BY dyn_content_lang ASC, dyn_content_name ASC, dyn_content_id ASC;"); - while ($result_i_content = mysql_fetch_array($query_i_content)) { - $roscms_i_lang = $result_i_content['dyn_content_lang']; - if ($roscms_i_lang == "all") { - $roscms_i_lang = "en"; - } - - echo "<li>".$result_i_content['dyn_content_name']."_".$result_i_content['dyn_content_id']." (".$result_i_content['dyn_content_lang'].")</li>"; - - $query_import_content = mysql_query("SELECT * - FROM data_ - WHERE data_name = '".mysql_real_escape_string($result_i_content['dyn_content_name'])."' - AND data_type = 'content' - LIMIT 1;"); - $result_import_content = mysql_fetch_array($query_import_content); - - - if ($result_import_content['data_id'] == "") { - $insert_page = mysql_query("INSERT INTO `data_` ( `data_id` , `data_name` , `data_type` , `data_acl` ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_i_content['dyn_content_name'])."', - 'content', - 'default' - );"); - } - - $query_import_content3 = mysql_query("SELECT * - FROM data_ - WHERE data_name = '".mysql_real_escape_string($result_i_content['dyn_content_name'])."' - AND data_type = 'content' - ORDER BY data_id DESC - LIMIT 1;"); - $result_import_content3 = mysql_fetch_array($query_import_content3); - - - // revision entry doesn't exist - $insert_content_rev = mysql_query("INSERT INTO data_revision ( rev_id , data_id , rev_version , rev_language , rev_usrid , rev_datetime , rev_date , rev_time ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_import_content3['data_id'])."', - '1', - '".mysql_real_escape_string($roscms_i_lang)."', - '".mysql_real_escape_string($result_i_content['dyn_content_usrname_id'])."', - '".mysql_real_escape_string($result_i_content['dyn_content_date']." ".$result_i_content['dyn_content_time'])."', - '".mysql_real_escape_string($result_i_content['dyn_content_date'])."', - '".mysql_real_escape_string($result_i_content['dyn_content_time'])."' - );"); - echo "<li>   => ".$result_i_content['dyn_content_name']."_".$result_i_content['dyn_content_id']." (".$result_i_content['dyn_content_text1'].")</li>"; - - - $query_import_content4 = mysql_query("SELECT rev_id - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($result_import_content3['data_id'])."' - AND rev_language = '".mysql_real_escape_string($roscms_i_lang)."' - ORDER BY rev_id DESC - LIMIT 1;"); - $result_import_content4 = mysql_fetch_array($query_import_content4); - - if ($result_import_content4['rev_id'] != "") { - - // stext: titel, description, extention, (property) - $insert_import_content_stext = mysql_query("INSERT INTO data_stext ( stext_id , data_rev_id , stext_name , stext_content ) - VALUES - ( - NULL , - '".mysql_real_escape_string($result_import_content4['rev_id'])."', - 'description', - '".mysql_real_escape_string($result_i_content['dyn_content_text3'])."' - ), - ( - NULL , - '".mysql_real_escape_string($result_import_content4['rev_id'])."', - 'title', - '".mysql_real_escape_string($result_i_content['dyn_content_text1'])."' - );"); - - // text: content - $insert_import_content_text = mysql_query("INSERT INTO data_text ( text_id , data_rev_id , text_name , text_content ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_import_content4['rev_id'])."', - 'content', - '".mysql_real_escape_string($result_i_content['dyn_content_text4'])."' - );"); - - // tag: status = stable - tag_add($result_import_content3['data_id'], $result_import_content4['rev_id'], "status", "stable", "-1"); - - // tag: visible = all - tag_add($result_import_content3['data_id'], $result_import_content4['rev_id'], "visible", "all", "-1"); - - // tag: kind = dynamic - tag_add($result_import_content3['data_id'], $result_import_content4['rev_id'], "kind", "dynamic", "-1"); - - // tag: number = ... - tag_add($result_import_content3['data_id'], $result_import_content4['rev_id'], "number", $result_i_content['dyn_content_id'], "-1"); - } - } - echo "</ul>"; - - - echo "\n<hr />\n"; - - - - echo "\n<hr />\n"; - - -?> Removed: trunk/web/reactos.org/htdocs/roscms/roscms_2to3_page.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/rosc… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/roscms_2to3_page.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/roscms_2to3_page.php (removed) @@ -1,186 +1,0 @@ -<?php - - error_reporting(E_ALL); - ini_set('error_reporting', E_ALL); - - if (get_magic_quotes_gpc()) { - die("ERROR: Disable 'magic quotes' in php.ini (=Off)"); - } - - if ( !defined('ROSCMS_SYSTEM') ) { - define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity - } - - - require("connect.db.php"); - require("inc/data_edit.php"); - - - echo "<h1>RosCMS Database Update - v2 to v3 - Page</h1>"; - - set_time_limit(0); // unlimited script run time - - echo "<h3>Pages</h3>"; - echo "<ul>"; - $query_i_page = mysql_query("SELECT * - FROM pages - WHERE page_active = 1 - ORDER BY page_name ASC, page_version DESC, page_active DESC;"); - while ($result_i_page = mysql_fetch_array($query_i_page)) { - $roscms_i_lang = $result_i_page['page_language']; - if ($roscms_i_lang == "all") { - $roscms_i_lang = "en"; - } - - echo "<li>".$result_i_page['page_name']." (".$roscms_i_lang.")</li>"; - - $query_import_page = mysql_query("SELECT * - FROM data_ - WHERE data_name = '".mysql_real_escape_string($result_i_page['page_name'])."' - AND data_type = 'page' - LIMIT 1;"); - $result_import_page = mysql_fetch_array($query_import_page); - echo "<h6>data-ID: ".$result_import_page['data_id']."</h6>"; - - - if ($result_import_page['data_id'] == "") { - $insert_page = mysql_query("INSERT INTO `data_` ( `data_id` , `data_name` , `data_type` , `data_acl` ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_i_page['page_name'])."', - 'page', - 'defaultpage' - );"); - } - - - $query_import_page3 = mysql_query("SELECT * - FROM data_ - WHERE data_name = '".mysql_real_escape_string($result_i_page['page_name'])."' - AND data_type = 'page' - LIMIT 1;"); - $result_import_page3 = mysql_fetch_array($query_import_page3); - - echo "<p>data_id: ".$result_import_page3['data_id']."</p>"; - - $query_import_page2 = mysql_query("SELECT COUNT(*) - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($result_import_page3['data_id'])."' - AND rev_language = '".mysql_real_escape_string($roscms_i_lang)."' - LIMIT 1;"); - $result_import_page2 = mysql_fetch_row($query_import_page2); - echo "<p>data_id-count: ".$result_import_page2[0]."</p>"; - - if ($result_import_page2[0] <= 0) { - // revision entry doesn't exist - $insert_page_rev = mysql_query("INSERT INTO data_revision ( rev_id , data_id , rev_version , rev_language , rev_usrid , rev_datetime , rev_date , rev_time ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_import_page3['data_id'])."', - '".mysql_real_escape_string($result_i_page['page_version'])."', - '".mysql_real_escape_string($roscms_i_lang)."', - '".mysql_real_escape_string($result_i_page['page_usrname_id'])."', - '".mysql_real_escape_string($result_i_page['page_date']." ".$result_i_page['page_time'])."', - '".mysql_real_escape_string($result_i_page['page_date'])."', - '".mysql_real_escape_string($result_i_page['page_time'])."' - );"); - - - $query_import_page4 = mysql_query("SELECT rev_id - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($result_import_page3['data_id'])."' - AND rev_language = '".mysql_real_escape_string($roscms_i_lang)."' - ORDER BY rev_id DESC - LIMIT 1;"); - $result_import_page4 = mysql_fetch_array($query_import_page4); - - if ($result_import_page4['rev_id'] != "") { - - if ($result_i_page['pages_extention'] == "default") { - $roscms_i_page_extention = "html"; - } - else { - $roscms_i_page_extention = $result_i_page['pages_extention']; - } - - /* - if ($result_i_page['pages_extra'] == "dynamic") { - $roscms_i_page_extra = ", ( - NULL , - '".mysql_real_escape_string($result_import_page4['rev_id'])."', - 'property', - '".mysql_real_escape_string($result_i_page['pages_extra'])."' - )"; - } - else { - $roscms_i_page_extra = ""; - } - ".$roscms_i_page_extra." - ,( - NULL , - '".mysql_real_escape_string($result_import_page4['rev_id'])."', - 'extention', - '".mysql_real_escape_string($roscms_i_page_extention)."' - ) - */ - - // stext: titel, description, extention, (property) - $insert_import_page_stext = mysql_query("INSERT INTO data_stext ( stext_id , data_rev_id , stext_name , stext_content ) - VALUES - ( - NULL , - '".mysql_real_escape_string($result_import_page4['rev_id'])."', - 'description', - '".mysql_real_escape_string($result_i_page['page_description'])."' - ), - ( - NULL , - '".mysql_real_escape_string($result_import_page4['rev_id'])."', - 'title', - '".mysql_real_escape_string($result_i_page['page_title'])."' - ) - ;"); - - // text: content - $insert_import_page_text = mysql_query("INSERT INTO data_text ( text_id , data_rev_id , text_name , text_content ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_import_page4['rev_id'])."', - 'content', - '".mysql_real_escape_string($result_i_page['page_text'])."' - );"); - - // tag: status = stable - tag_add($result_import_page3['data_id'], $result_import_page4['rev_id'], "status" /* name */, "stable" /* value */, "-1" /* usrid */); - - if ($result_i_page['pages_extra'] == "dynamic") { - // tag: kind = dynamic - tag_add($result_import_page3['data_id'], $result_import_page4['rev_id'], "kind" /* name */, "dynamic" /* value */, "-1" /* usrid */); - } - else { - // tag: kind = default - tag_add($result_import_page3['data_id'], $result_import_page4['rev_id'], "kind" /* name */, "default" /* value */, "-1" /* usrid */); - } - - if ($result_i_page['pages_extention'] == "default") { - // tag: extention = html - tag_add($result_import_page3['data_id'], $result_import_page4['rev_id'], "extention" /* name */, "html" /* value */, "-1" /* usrid */); - } - else { - // tag: extention = ... - tag_add($result_import_page3['data_id'], $result_import_page4['rev_id'], "extention" /* name */, $result_i_page['pages_extention'] /* value */, "-1" /* usrid */); - } - } - } - } - echo "</ul>"; - - - echo "\n<hr />\n"; - - - - echo "\n<hr />\n"; - - -?> Removed: trunk/web/reactos.org/htdocs/roscms/roscms_2to3_script.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/rosc… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/roscms_2to3_script.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/roscms_2to3_script.php (removed) @@ -1,144 +1,0 @@ -<?php - - error_reporting(E_ALL); - ini_set('error_reporting', E_ALL); - - if (get_magic_quotes_gpc()) { - die("ERROR: Disable 'magic quotes' in php.ini (=Off)"); - } - - if ( !defined('ROSCMS_SYSTEM') ) { - define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity - } - - - require("connect.db.php"); - require("inc/data_edit.php"); - - - echo "<h1>RosCMS Database Update - v2 to v3 - Script</h1>"; - - set_time_limit(0); // unlimited script run time - - - - echo "<h3>Scripts</h3>"; - echo "<ul>"; - $query_i_script = mysql_query("SELECT * - FROM include_text - WHERE inc_vis = '1' - ORDER BY inc_word ASC;"); - while ($result_i_script = mysql_fetch_array($query_i_script)) { - echo "<li>".$result_i_script['inc_word']."</li>"; - - $query_import_script = mysql_query("SELECT * - FROM data_ - WHERE data_name = '".mysql_real_escape_string($result_i_script['inc_word'])."' - AND data_type = 'script' - LIMIT 1;"); - $result_import_script = mysql_fetch_array($query_import_script); - - - if ($result_import_script['data_id'] == "") { - $insert_page = mysql_query("INSERT INTO `data_` ( `data_id` , `data_name` , `data_type` , `data_acl` ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_i_script['inc_word'])."', - 'script', - 'script' - );"); - } - - $query_import_script3 = mysql_query("SELECT * - FROM data_ - WHERE data_name = '".mysql_real_escape_string($result_i_script['inc_word'])."' - AND data_type = 'script' - ORDER BY data_id DESC - LIMIT 1;"); - $result_import_script3 = mysql_fetch_array($query_import_script3); - - echo "<p>data_id: ".$result_import_script3['data_id']."</p>"; - - $query_import_script2 = mysql_query("SELECT COUNT(*) - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($result_import_script3['data_id'])."' - AND rev_language = 'en' - LIMIT 1;"); - $result_import_script2 = mysql_fetch_row($query_import_script2); - - echo "<p>data_id-count: ".$result_import_script2[0]."</p>"; - - if ($result_import_script2[0] <= 0) { - // revision entry doesn't exist - $insert_script_rev = mysql_query("INSERT INTO data_revision ( rev_id , data_id , rev_version , rev_language , rev_usrid , rev_datetime , rev_date , rev_time ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_import_script3['data_id'])."', - '1', - 'en', - '".mysql_real_escape_string($result_i_script['inc_usrname_id'])."', - '".mysql_real_escape_string($result_i_script['inc_date']." ".$result_i_script['inc_time'])."', - '".mysql_real_escape_string($result_i_script['inc_date'])."', - '".mysql_real_escape_string($result_i_script['inc_time'])."' - );"); - - - - $query_import_script4 = mysql_query("SELECT rev_id - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($result_import_script3['data_id'])."' - AND rev_language = 'en' - ORDER BY rev_id DESC - LIMIT 1;"); - $result_import_script4 = mysql_fetch_array($query_import_script4); - - if ($result_import_script4['rev_id'] != "") { - - // stext: titel, description - $insert_import_script_stext = mysql_query("INSERT INTO data_stext ( stext_id , data_rev_id , stext_name , stext_content ) - VALUES - ( - NULL , - '".mysql_real_escape_string($result_import_script4['rev_id'])."', - 'description', - '".mysql_real_escape_string($result_i_script['inc_word'])."' - );"); - - // text: content - $insert_import_script_text = mysql_query("INSERT INTO data_text ( text_id , data_rev_id , text_name , text_content ) - VALUES ( - NULL , - '".mysql_real_escape_string($result_import_script4['rev_id'])."', - 'content', - '".mysql_real_escape_string($result_i_script['inc_text'])."' - );"); - - // tag: status = stable - tag_add($result_import_script3['data_id'], $result_import_script4['rev_id'], "status", "stable", "-1"); - - // tag: visible = admin - tag_add($result_import_script3['data_id'], $result_import_script4['rev_id'], "visible", "admin", "-1"); - - if ($result_i_script['inc_extra'] == "template_php") { - // tag: kind = php - tag_add($result_import_script3['data_id'], $result_import_script4['rev_id'], "kind", "php", "-1"); - } - else { - // tag: kind = var - tag_add($result_import_script3['data_id'], $result_import_script4['rev_id'], "kind", "var", "-1"); - } - } - } - } - echo "</ul>"; - - - echo "\n<hr />\n"; - - - - - echo "\n<hr />\n"; - - -?> Removed: trunk/web/reactos.org/sql/roscms.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/sql/roscms.sql?rev… ============================================================================== --- trunk/web/reactos.org/sql/roscms.sql [iso-8859-1] (original) +++ trunk/web/reactos.org/sql/roscms.sql (removed) @@ -1,486 +1,0 @@ --- Database: `roscms` --- --- Date: 2007-08-13 11:12 --- MySQL-Version: 5.0.33 --- PHP-Version: 5.2.1 --- - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_` --- - -CREATE TABLE `data_` ( - `data_id` int(11) NOT NULL auto_increment, - `data_name` varchar(100) collate utf8_unicode_ci NOT NULL COMMENT 'together with page_type unique entries', - `data_type` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT '"page", "layout", "content", "script"', - `data_acl` varchar(50) collate utf8_unicode_ci NOT NULL default 'default', - PRIMARY KEY (`data_id`), - KEY `data_name` (`data_name`,`data_type`), - KEY `data_type` (`data_type`), - KEY `data_acl` (`data_acl`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='all RosCMS v1 "pages", "content", "dyncontent" and "inctext"'; - -INSERT INTO `data_` VALUES (1, 'index', 'page', 'defaultpage'); -INSERT INTO `data_` VALUES (2, 'default', 'template', 'layout'); -INSERT INTO `data_` VALUES (3, 'index', 'content', 'default'); -INSERT INTO `data_` VALUES (4, 'news', 'script', 'script'); -INSERT INTO `data_` VALUES (5, 'news_page', 'content', 'default'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_a` --- - -CREATE TABLE `data_a` ( - `data_id` int(11) NOT NULL auto_increment, - `data_name` varchar(100) collate utf8_unicode_ci NOT NULL COMMENT 'together with page_type unique entries', - `data_type` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT '"page", "layout", "content", "script"', - `data_acl` varchar(50) collate utf8_unicode_ci NOT NULL default 'default', - PRIMARY KEY (`data_id`), - KEY `data_name` (`data_name`,`data_type`), - KEY `data_type` (`data_type`), - KEY `data_acl` (`data_acl`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='all RosCMS v1 "pages", "content", "dyncontent" and "inctext"'; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_revision` --- - -CREATE TABLE `data_revision` ( - `rev_id` int(11) NOT NULL auto_increment COMMENT 'unique revisions id', - `data_id` int(11) NOT NULL, - `rev_version` int(11) NOT NULL COMMENT 'version number increase with every entry change', - `rev_language` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT 'language code ("en", "de", etc.)', - `rev_usrid` int(11) NOT NULL COMMENT 'user id who saved the entry', - `rev_datetime` datetime NOT NULL, - `rev_date` date NOT NULL, - `rev_time` time NOT NULL, - PRIMARY KEY (`rev_id`), - KEY `data_id` (`data_id`), - KEY `rev_language` (`rev_language`), - KEY `rev_version` (`rev_version`), - KEY `rev_datetime` (`rev_datetime`), - KEY `rev_usrid` (`rev_usrid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_revision` VALUES (1, 1, 1, 'en', 1, '2007-08-13 17:03:44', '2007-08-13', '17:03:44'); -INSERT INTO `data_revision` VALUES (2, 2, 1, 'en', 1, '2007-08-13 17:05:03', '2007-08-13', '17:05:03'); -INSERT INTO `data_revision` VALUES (6, 3, 2, 'en', 1, '2007-08-13 17:15:15', '2007-08-13', '17:15:15'); -INSERT INTO `data_revision` VALUES (5, 4, 2, 'en', 1, '2007-08-13 17:11:36', '2007-08-13', '17:11:36'); -INSERT INTO `data_revision` VALUES (7, 5, 1, 'en', 1, '2007-08-13 17:15:20', '2007-08-13', '17:15:20'); -INSERT INTO `data_revision` VALUES (8, 5, 1, 'en', 1, '2007-08-13 17:15:45', '2007-08-13', '17:15:45'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_revision_a` --- - -CREATE TABLE `data_revision_a` ( - `rev_id` int(11) NOT NULL auto_increment COMMENT 'unique revisions id', - `data_id` int(11) NOT NULL, - `rev_version` int(11) NOT NULL COMMENT 'version number increase with every entry change', - `rev_language` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT 'language code ("en", "de", etc.)', - `rev_usrid` int(11) NOT NULL COMMENT 'user id who saved the entry', - `rev_datetime` datetime NOT NULL, - `rev_date` date NOT NULL, - `rev_time` time NOT NULL, - PRIMARY KEY (`rev_id`), - KEY `data_id` (`data_id`), - KEY `rev_language` (`rev_language`), - KEY `rev_version` (`rev_version`), - KEY `rev_datetime` (`rev_datetime`), - KEY `rev_usrid` (`rev_usrid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_security` --- - -CREATE TABLE `data_security` ( - `sec_name` varchar(50) collate utf8_unicode_ci NOT NULL, - `sec_fullname` varchar(100) collate utf8_unicode_ci NOT NULL, - `sec_description` varchar(255) collate utf8_unicode_ci NOT NULL, - `sec_branch` varchar(10) collate utf8_unicode_ci NOT NULL, - `sec_lev1_read` tinyint(4) NOT NULL default '0', - `sec_lev1_write` tinyint(4) NOT NULL default '0', - `sec_lev1_add` tinyint(4) NOT NULL default '0', - `sec_lev1_pub` tinyint(4) NOT NULL default '0', - `sec_lev1_trans` tinyint(4) NOT NULL default '0', - `sec_lev2_read` tinyint(4) NOT NULL default '0', - `sec_lev2_write` tinyint(4) NOT NULL default '0', - `sec_lev2_add` tinyint(4) NOT NULL default '0', - `sec_lev2_pub` tinyint(4) NOT NULL default '0', - `sec_lev2_trans` tinyint(4) NOT NULL default '0', - `sec_lev3_read` tinyint(4) NOT NULL default '0', - `sec_lev3_write` tinyint(4) NOT NULL default '0', - `sec_lev3_add` tinyint(4) NOT NULL default '0', - `sec_lev3_pub` tinyint(4) NOT NULL default '0', - `sec_lev3_trans` tinyint(4) NOT NULL default '0', - `sec_allow` varchar(255) collate utf8_unicode_ci NOT NULL, - `sec_deny` varchar(255) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`sec_name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS content security'; - -INSERT INTO `data_security` VALUES ('default', 'Content (default)', 'Default content security ACL; normal translator cannot publish nor add new content', 'website', 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, '', ''); -INSERT INTO `data_security` VALUES ('script', 'Script or Variable', 'Entry contain scripts, variables or similar content which can only be accessed and altered by admins.', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, '', ''); -INSERT INTO `data_security` VALUES ('layout', 'Layout', 'Website layout related content, changing may destroy the website layout, so be careful!', 'website', 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, '', '|transmaint|'); -INSERT INTO `data_security` VALUES ('announcement', 'Official announcement', 'Official announcement, which shouldn''t be altered by anyone except admins and devs', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, '|developer|', ''); -INSERT INTO `data_security` VALUES ('notrans', 'No translation needed', 'Content don''t need a translation.', '', 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, '', ''); -INSERT INTO `data_security` VALUES ('rosversion', 'ReactOS versions number', 'Currrent ReactOS version number, change the related contents on every release day!', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, '|developer|', ''); -INSERT INTO `data_security` VALUES ('defaultpage', 'Page (default)', 'Default page security ACL', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|developer|', ''); -INSERT INTO `data_security` VALUES ('defaultmenu', 'Menu (default)', 'Menu content which can be translated by language maintainers', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|transmaint|', ''); -INSERT INTO `data_security` VALUES ('system', 'System', 'RosCMS system', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '|ros_sadmin|', ''); -INSERT INTO `data_security` VALUES ('readonly', 'Read-Only', 'Read only, noone can alter this', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, '', ''); -INSERT INTO `data_security` VALUES ('langmaint', 'Language Maintainer', 'Language-Group related content', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|transmaint|', ''); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_stext` --- - -CREATE TABLE `data_stext` ( - `stext_id` int(11) NOT NULL auto_increment, - `data_rev_id` int(11) NOT NULL, - `stext_name` varchar(100) collate utf8_unicode_ci NOT NULL, - `stext_content` varchar(255) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`stext_id`), - KEY `data_rev_id` (`data_rev_id`), - FULLTEXT KEY `stext_content` (`stext_content`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_stext` VALUES (14, 1, 'description', 'test page'); -INSERT INTO `data_stext` VALUES (13, 1, 'comment', ''); -INSERT INTO `data_stext` VALUES (12, 2, 'description', 'test template'); -INSERT INTO `data_stext` VALUES (15, 1, 'title', 'Index'); -INSERT INTO `data_stext` VALUES (19, 6, 'description', 'test content'); -INSERT INTO `data_stext` VALUES (18, 5, 'description', 'news php script'); -INSERT INTO `data_stext` VALUES (22, 7, 'description', 'news issue 1'); -INSERT INTO `data_stext` VALUES (23, 7, 'title', 'News_page'); -INSERT INTO `data_stext` VALUES (26, 8, 'description', 'news issue 2'); -INSERT INTO `data_stext` VALUES (27, 8, 'title', 'News_page'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_stext_a` --- - -CREATE TABLE `data_stext_a` ( - `stext_id` int(11) NOT NULL auto_increment, - `data_rev_id` int(11) NOT NULL, - `stext_name` varchar(100) collate utf8_unicode_ci NOT NULL, - `stext_content` varchar(255) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`stext_id`), - KEY `data_rev_id` (`data_rev_id`), - FULLTEXT KEY `stext_content` (`stext_content`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag` --- - -CREATE TABLE `data_tag` ( - `tag_id` int(11) NOT NULL auto_increment, - `data_id` int(11) NOT NULL, - `data_rev_id` int(11) NOT NULL, - `tag_name_id` int(11) NOT NULL, - `tag_value_id` int(11) NOT NULL, - `tag_usrid` int(11) NOT NULL, - PRIMARY KEY (`tag_id`), - KEY `data_id` (`data_id`), - KEY `data_rev_id` (`data_rev_id`), - KEY `tag_name_id` (`tag_name_id`), - KEY `tag_value_id` (`tag_value_id`), - KEY `tag_usrid` (`tag_usrid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_tag` VALUES (11, 1, 1, 1, 5, -1); -INSERT INTO `data_tag` VALUES (2, 1, 1, 2, 2, -1); -INSERT INTO `data_tag` VALUES (10, 2, 2, 1, 5, -1); -INSERT INTO `data_tag` VALUES (15, 4, 5, 5, 7, -1); -INSERT INTO `data_tag` VALUES (14, 4, 5, 1, 5, -1); -INSERT INTO `data_tag` VALUES (24, 3, 6, 1, 5, -1); -INSERT INTO `data_tag` VALUES (22, 5, 7, 1, 5, -1); -INSERT INTO `data_tag` VALUES (18, 5, 7, 6, 9, -1); -INSERT INTO `data_tag` VALUES (21, 5, 8, 1, 5, -1); -INSERT INTO `data_tag` VALUES (20, 5, 8, 6, 10, -1); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag_a` --- - -CREATE TABLE `data_tag_a` ( - `tag_id` int(11) NOT NULL auto_increment, - `data_id` int(11) NOT NULL, - `data_rev_id` int(11) NOT NULL, - `tag_name_id` int(11) NOT NULL, - `tag_value_id` int(11) NOT NULL, - `tag_usrid` int(11) NOT NULL, - PRIMARY KEY (`tag_id`), - KEY `data_id` (`data_id`), - KEY `data_rev_id` (`data_rev_id`), - KEY `tag_name_id` (`tag_name_id`), - KEY `tag_value_id` (`tag_value_id`), - KEY `tag_usrid` (`tag_usrid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag_name` --- - -CREATE TABLE `data_tag_name` ( - `tn_id` int(11) NOT NULL auto_increment, - `tn_name` varchar(100) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`tn_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_tag_name` VALUES (1, 'status'); -INSERT INTO `data_tag_name` VALUES (2, 'extension'); -INSERT INTO `data_tag_name` VALUES (4, 'star'); -INSERT INTO `data_tag_name` VALUES (5, 'kind'); -INSERT INTO `data_tag_name` VALUES (6, 'number'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag_name_a` --- - -CREATE TABLE `data_tag_name_a` ( - `tn_id` int(11) NOT NULL auto_increment, - `tn_name` varchar(100) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`tn_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag_value` --- - -CREATE TABLE `data_tag_value` ( - `tv_id` int(11) NOT NULL auto_increment, - `tv_value` varchar(255) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`tv_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_tag_value` VALUES (7, 'php'); -INSERT INTO `data_tag_value` VALUES (2, 'html'); -INSERT INTO `data_tag_value` VALUES (4, 'off'); -INSERT INTO `data_tag_value` VALUES (5, 'stable'); -INSERT INTO `data_tag_value` VALUES (9, '1'); -INSERT INTO `data_tag_value` VALUES (10, '2'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_tag_value_a` --- - -CREATE TABLE `data_tag_value_a` ( - `tv_id` int(11) NOT NULL auto_increment, - `tv_value` varchar(255) collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`tv_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_text` --- - -CREATE TABLE `data_text` ( - `text_id` int(11) NOT NULL auto_increment, - `data_rev_id` int(11) NOT NULL, - `text_name` varchar(100) collate utf8_unicode_ci NOT NULL, - `text_content` text collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`text_id`), - KEY `data_rev_id` (`data_rev_id`), - FULLTEXT KEY `text_content` (`text_content`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `data_text` VALUES (9, 1, 'content', '[#templ_default]'); -INSERT INTO `data_text` VALUES (8, 2, 'content', '[#cont_head][#cont_menu_top][#cont_menu_side][#cont_contmenu_[#%NAME%]][#cont_menu_search][#cont_menu_language][#cont_menu_misc][#cont_%NAME%][#cont_bottom]'); -INSERT INTO `data_text` VALUES (13, 6, 'content', '<h1>Welcome to RosCMS v3</h1><p>RosCMS test page</p>[#inc_news]'); -INSERT INTO `data_text` VALUES (15, 7, 'content', 'news #1 ...'); -INSERT INTO `data_text` VALUES (17, 8, 'content', 'news #2'); -INSERT INTO `data_text` VALUES (12, 5, 'content', '<h3>News</h3> <?php $tmp_year = "2085"; $query_content = mysql_query("SELECT d.data_name, r.rev_usrid, s1.stext_content AS ''title'', s2.stext_content AS ''description'', v.tv_value as ''numb'', r.rev_date FROM data_ d, data_revision r, data_stext s1, data_stext s2, data_tag a, data_tag_name n, data_tag_value v WHERE d.data_name = ''news_page'' AND d.data_type = ''content'' AND r.data_id = d.data_id AND (r.rev_language = ''".mysql_real_escape_string($roscms_template_var_lang)."'' OR r.rev_language = ''en'') AND r.rev_version > 0 AND s1.data_rev_id = r.rev_id AND s1.stext_name = ''title'' AND s2.data_rev_id = r.rev_id AND s2.stext_name = ''description'' AND r.data_id = a.data_id AND r.rev_id = a.data_rev_id AND a.tag_usrid = ''-1'' AND a.tag_name_id = n.tn_id AND n.tn_name = ''number'' AND a.tag_value_id = v.tv_id ORDER BY r.rev_datetime DESC LIMIT 3;"); while($result_content = mysql_fetch_array($query_content)) { -if ($tmp_year > substr($result_content[''rev_date''], 0, 4)) { $tmp_year = substr($result_content[''rev_date''], 0, 4); echo "<h3>".$tmp_year."</h3>"; } $query_usraccount= mysql_query("SELECT user_name, user_fullname FROM users WHERE user_id = ''".mysql_real_escape_string($result_content["rev_usrid"])."'' LIMIT 1;"); $result_usraccount=mysql_fetch_array($query_usraccount); ?> <p align="left"><b><font color="#666666"><?php echo $result_content[''rev_date'']; ?>, <?php if ($result_usraccount[''user_fullname'']) { echo $result_usraccount[''user_fullname'']; } else { echo $result_usraccount[''user_name'']; } ?> </font></b><br /> <b><a href="<?php echo "[#link_".$result_content["data_name"]."_".$result_content["numb"]."]"; ?>"><?php echo $result_content["title"]; ?></a></b><br /> <?php echo $result_content["description"]; ?></p> <?php } // end while ?> '); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_text_a` --- - -CREATE TABLE `data_text_a` ( - `text_id` int(11) NOT NULL auto_increment, - `data_rev_id` int(11) NOT NULL, - `text_name` varchar(100) collate utf8_unicode_ci NOT NULL, - `text_content` text collate utf8_unicode_ci NOT NULL, - PRIMARY KEY (`text_id`), - KEY `data_rev_id` (`data_rev_id`), - FULLTEXT KEY `text_content` (`text_content`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `data_user_filter` --- - -CREATE TABLE `data_user_filter` ( - `filt_id` int(11) NOT NULL auto_increment, - `filt_usrid` int(11) NOT NULL, - `filt_title` varchar(50) collate utf8_unicode_ci NOT NULL, - `filt_type` smallint(6) NOT NULL default '1', - `filt_string` varchar(255) collate utf8_unicode_ci NOT NULL, - `filt_datetime` datetime NOT NULL, - `filt_usage` int(11) NOT NULL, - `filt_usagedate` datetime NOT NULL, - PRIMARY KEY (`filt_id`), - KEY `filt_usrid` (`filt_usrid`), - KEY `filt_name` (`filt_title`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `languages` --- - -CREATE TABLE `languages` ( - `lang_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', - `lang_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `lang_name_org` varchar(100) collate utf8_unicode_ci NOT NULL, - `lang_level` int(11) NOT NULL default '0', - PRIMARY KEY (`lang_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='available languages'; - -INSERT INTO `languages` VALUES ('en', 'English', 'English', 10); -INSERT INTO `languages` VALUES ('de', 'German', 'Deutsch', 8); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `subsys_mappings` --- - -CREATE TABLE `subsys_mappings` ( - `map_roscms_userid` bigint(20) NOT NULL default '0', - `map_subsys_name` varchar(10) character set utf8 NOT NULL default '', - `map_subsys_userid` int(7) NOT NULL default '0', - PRIMARY KEY (`map_roscms_userid`,`map_subsys_name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `user_sessions` --- - -CREATE TABLE `user_sessions` ( - `usersession_id` varchar(32) character set utf8 NOT NULL default '' COMMENT 'Unique ID of this session', - `usersession_user_id` bigint(20) NOT NULL default '0' COMMENT 'User this session belongs to', - `usersession_expires` datetime default NULL COMMENT 'Expiry date/time (NULL if does not expire)', - `usersession_browseragent` varchar(255) character set utf8 NOT NULL default '' COMMENT 'HTTP_USER_AGENT when this session was created', - `usersession_ipaddress` varchar(15) character set utf8 NOT NULL default '' COMMENT 'IP address from which this session was created', - `usersession_created` datetime NOT NULL default '0000-00-00 00:00:00' COMMENT 'session created (date/time) - all session will get deleted ... by date', - PRIMARY KEY (`usersession_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0 COMMENT='Sessions'; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `usergroup_members` --- - -CREATE TABLE `usergroup_members` ( - `usergroupmember_userid` bigint(20) NOT NULL default '0', - `usergroupmember_usergroupid` varchar(10) collate utf8_unicode_ci NOT NULL default 'user' -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `usergroups` --- - -CREATE TABLE `usergroups` ( - `usrgroup_name_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', - `usrgroup_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `usrgroup_intern_id` varchar(25) collate utf8_unicode_ci NOT NULL default '', - `usrgroup_seclev` tinyint(4) NOT NULL default '0', - `usrgroup_securitylevel` tinyint(4) NOT NULL default '0', - `usrgroup_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', - PRIMARY KEY (`usrgroup_name_id`), - UNIQUE KEY `usrgroup_name` (`usrgroup_name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `usergroups` VALUES ('ros_admin', 'Administrator', 'roscms_usrgrp_admin', 3, 70, 'Administrator-Group'); -INSERT INTO `usergroups` VALUES ('user', 'User', 'roscms_usrgrp_user', 0, 0, 'Normal Visitors'); -INSERT INTO `usergroups` VALUES ('developer', 'Developer', 'roscms_usrgrp_dev', 2, 50, 'Developer'); -INSERT INTO `usergroups` VALUES ('moderator', 'Moderator', 'roscms_usrgrp_team', 2, 20, 'Website Moderators'); -INSERT INTO `usergroups` VALUES ('translator', 'Translator', 'roscms_usrgrp_trans', 1, 10, 'Translators'); -INSERT INTO `usergroups` VALUES ('ros_sadmin', 'Super-Administrator', 'roscms_usrgrp_sadmin', 3, 100, 'Super-Administrator-Group'); -INSERT INTO `usergroups` VALUES ('transmaint', 'Tranlation Maintainer', 'roscms_usrgrp_trans', 2, 15, 'Translation Maintainer'); - - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `users` --- - -CREATE TABLE `users` ( - `user_id` bigint(20) NOT NULL auto_increment, - `user_name` varchar(20) collate utf8_unicode_ci NOT NULL default '', - `user_roscms_password` varchar(32) collate utf8_unicode_ci NOT NULL default '', - `user_roscms_getpwd_id` varchar(50) collate utf8_unicode_ci NOT NULL default '', - `user_timestamp_touch` varchar(50) collate utf8_unicode_ci NOT NULL default '', - `user_timestamp_touch2` timestamp NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `user_login_counter` bigint(20) NOT NULL default '0', - `user_account_enabled` varchar(10) collate utf8_unicode_ci NOT NULL default 'no', - `user_account_hidden` varchar(5) collate utf8_unicode_ci NOT NULL default 'no', - `user_register` timestamp NULL default NULL, - `user_fullname` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `user_email` varchar(150) collate utf8_unicode_ci NOT NULL default '', - `user_website` varchar(150) collate utf8_unicode_ci NOT NULL default '', - `user_language` varchar(2) collate utf8_unicode_ci NOT NULL default '', - `user_country` varchar(2) collate utf8_unicode_ci NOT NULL default '', - `user_timezone` varchar(3) collate utf8_unicode_ci NOT NULL default '', - `user_occupation` varchar(50) collate utf8_unicode_ci NOT NULL default '', - `user_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `user_setting_multisession` varchar(5) collate utf8_unicode_ci NOT NULL default 'false', - `user_setting_browseragent` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', - `user_setting_ipaddress` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', - `user_setting_timeout` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', - PRIMARY KEY (`user_id`), - UNIQUE KEY `user_name` (`user_name`), - UNIQUE KEY `user_email` (`user_email`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table'; -

1 0

[cfinck] 36535: Commit missing stuff from the server (1/2) This is not yet meant to work, I'm just committing unmodified files from the Web server for making it easier to track my changes later.
by cfinck＠svn.reactos.org 26 Sep '08

26 Sep '08

Author: cfinck Date: Fri Sep 26 06:54:49 2008 New Revision: 36535 URL: http://svn.reactos.org/svn/reactos?rev=36535&view=rev Log: Commit missing stuff from the server (1/2) This is not yet meant to work, I'm just committing unmodified files from the Web server for making it easier to track my changes later. Added: trunk/web/reactos.org/htdocs/roscms/inc/footer_closetable.php (with props) trunk/web/reactos.org/htdocs/roscms/logon/language_detection.php (with props) trunk/web/reactos.org/htdocs/roscms/logon/login.php trunk/web/reactos.org/htdocs/roscms/logon/login_optional.php (with props) trunk/web/reactos.org/htdocs/roscms/logon/logon.css (with props) trunk/web/reactos.org/htdocs/roscms/logon/logout.php trunk/web/reactos.org/htdocs/roscms/logon/subsys_login.php (with props) Removed: trunk/web/reactos.org/htdocs/roscms/images/Thumbs.db trunk/web/reactos.org/htdocs/roscms/inc/connect.db.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data.php trunk/web/reactos.org/htdocs/roscms/inc/data_menu.php trunk/web/reactos.org/htdocs/roscms/inc/header.php trunk/web/reactos.org/htdocs/roscms/inc/securitylog.php trunk/web/reactos.org/htdocs/roscms/inc/structure.php trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php trunk/web/reactos.org/htdocs/roscms/inc/tools.php Removed: trunk/web/reactos.org/htdocs/roscms/images/Thumbs.db URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/imag… ============================================================================== Binary file - no diff available. Removed: trunk/web/reactos.org/htdocs/roscms/inc/connect.db.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/connect.db.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/connect.db.php (removed) @@ -1,40 +1,0 @@ -<?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 = ""; - - -?> Modified: trunk/web/reactos.org/htdocs/roscms/inc/data.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -81,6 +81,11 @@ echo "<br />"; echo "<p>Currently not implemented!</p>"; break; + case "stats": + require("inc/data_menu.php"); + echo "<br />"; + require("../stats/admin/view_stats.php"); + break; } } Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_menu.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_menu.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_menu.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -140,6 +140,9 @@ case "maintain"; $curmenu = "maintain"; break; + case "stats"; + $curmenu = "stats"; + break; } break; /*case "user"; @@ -176,6 +179,9 @@ break; case 'maintain': temp_page2 = 'data&branch=maintain'; + break; + case 'stats': + temp_page2 = 'data&branch=stats'; break; } @@ -243,6 +249,13 @@ </div> <div class="tblbl">Maintain</div></th> <td>  </td> + <th class="int<?php if ($curmenu == "stats") { echo "2"; } else { echo "1"; } ?>" onclick="roscms_mainmenu('stats')"> <div class="tc1"> + <div class="tc2"> + <div class="tc3"></div> + </div> + </div> + <div class="tblbl">Statistics</div></th> + <td>  </td> <?php } ?> <td width="100%"><div align="right" id="ajaxloadinginfo" style="visibility:hidden;"><img src="images/ajax_loading.gif" alt="loading ..." width="13" height="13" /></div></td> @@ -268,6 +281,9 @@ else if ($curmenu == "maintain") { echo 'RosCMS Maintainer Interface'; } + else if ($curmenu == "stats") { + echo 'RosCMS Website Statistics'; + } ?> </div> </div> Added: trunk/web/reactos.org/htdocs/roscms/inc/footer_closetable.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/footer_closetable.php (added) +++ trunk/web/reactos.org/htdocs/roscms/inc/footer_closetable.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -1,0 +1,1 @@ +</td></tr></table> Propchange: trunk/web/reactos.org/htdocs/roscms/inc/footer_closetable.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/roscms/inc/header.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/header.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/header.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -44,7 +44,7 @@ ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> -<html lang="<?php echo $roscms_langres['lang_code']; ?>"> +<html lang="de"> <head> <title>ReactOS <?php if ($page_title != "") { echo "- ".$page_title; } ?></title> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $roscms_langres['charset']; ?>" /> Modified: trunk/web/reactos.org/htdocs/roscms/inc/securitylog.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/securitylog.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/securitylog.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -1,67 +1,0 @@ -<?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. - */ - - if ( !defined('ROSCMS_SYSTEM_LOG') ) { - die("Hacking attempt"); - } - - @include("db/connect_db.inc.php"); // database connection script - - if(session_is_registered('varusr') || $_SESSION['varusr'] != "") { - $roscms_intern_login_check_username=$_SESSION['varusr']; - $roscms_intern_login_check_password=$_SESSION['varpass']; - } - else { - $roscms_intern_login_check_username = $HTTP_COOKIE_VARS["rosname"]; - $roscms_intern_login_check_password = $HTTP_COOKIE_VARS["rospass"]; - } - - @$accountlogin_query = @mysql_query("SELECT usr_name, usr_roscms_passwd, usr_usergroup, usr_name_id FROM user WHERE usr_name = '".$roscms_intern_login_check_username."'") or die('DB error (login)!'); - @$accountlogin_result = @mysql_fetch_array($accountlogin_query); - - - $usrgrp=$accountlogin_result['usr_usergroup']; - - // Usergroup: - @$accountloginlevel_query = @mysql_query("SELECT * - FROM `usergroups` - WHERE 1 AND `usrgroup_name_id` = '$usrgrp'") or die('DB error (login)!'); - @$accountloginlevel_result = @mysql_fetch_array($accountloginlevel_query); - - - // Vars for other php scripts: (only use this vars for login/account check!) - - // Usergroup: - $roscms_intern_account_level=$accountloginlevel_result['usrgroup_securitylevel']; - $roscms_intern_account_group=$accountloginlevel_result['usrgroup_name']; - - // User: - $roscms_intern_account_id=$accountlogin_result['usr_name_id']; - - - $roscms_intern_log_text = "<b>Collected Information:</b><br>\n GATEWAY_INTERFACE: $GATEWAY_INTERFACE <br>\n SERVER_NAME: $SERVER_NAME <br>\n SERVER_SOFTWARE: $SERVER_SOFTWARE <br>\n SERVER_PROTOCOL: $SERVER_PROTOCOL <br>\n REQUEST_METHOD: $REQUEST_METHOD <br>\n QUERY_STRING: $QUERY_STRING <br>\n DOCUMENT_ROOT: $DOCUMENT_ROOT <br>\n HTTP_ACCEPT: $HTTP_ACCEPT <br>\n HTTP_ACCEPT_CHARSET: $HTTP_ACCEPT_CHARSET <br>\n HTTP_ENCODING: $HTTP_ENCODING <br>\n HTTP_ACCEPT_LANGUAGE: $HTTP_ACCEPT_LANGUAGE<br>\n HTTP_CONNECTION: $HTTP_CONNECTION <br>\n HTTP_HOST: $HTTP_HOST <br>\n HTTP_REFERER: $HTTP_REFERER <br>\n HTTP_USER_AGENT: $HTTP_USER_AGENT <br>\n REMOTE_ADDR: $REMOTE_ADDR <br>\n REMOTE_PORT: $REMOTE_PORT <br>\n SCRIPT_FILENAME: $SCRIPT_FILENAME <br>\n SERVER_ADMIN: $SERVER_ADMIN <br>\n SERVER_PORT: $SERVER_PORT <br>\n SERVER_SIGNATURE: $SERVER_SIGNATURE <br>\n PATH_TRANSLATED: $PATH_TRANSLATED <br>\n SCRIPT_NAME: $SCRIPT_NAME <br>\n REQUEST_URI: $REQUEST_URI <br>\n"; - - @$accountloginlevel_query = @mysql_query("INSERT INTO `roscms_security_log` ( `roscms_sec_log_id` , `roscms_sec_log_section` , `roscms_sec_log_priority` , `roscms_sec_log_reason` , `roscms_sec_log_user` , `roscms_sec_log_useraccount` , `roscms_sec_log_userip` , `roscms_sec_log_referrer` , `roscms_sec_log_text` , `roscms_sec_log_date` , `roscms_sec_log_time` , `roscms_sec_log_visible` ) - VALUES ('', '$seclog_section', '$seclog_level', '$seclog_reason', 'roscms_system', '$roscms_intern_account_id', '$REMOTE_ADDR', '$HTTP_REFERER', '$roscms_intern_log_text', CURDATE( ) , CURTIME( ) , '1');") or die('DB error (login)!'); - @$accountloginlevel_result = @mysql_fetch_array($accountloginlevel_query); - - - -?> Modified: trunk/web/reactos.org/htdocs/roscms/inc/structure.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/structure.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/structure.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -127,10 +127,9 @@ ?> </optgroup> <optgroup label="most popular"> - <option value="bg">ÐÑÐ»Ð³Ð°ÑÑÐºÐ¸ (Bulgarian)</option> <option value="en">English</option> + <option value="de">Deutsch (German)</option> <option value="fr">FranÃ§ais (French)</option> - <option value="de">Deutsch (German)</option> <option value="it">Italiano (Italian)</option> <option value="no">Norsk (Norwegian)</option> <option value="pl">Polski (Polish)</option> Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -1,147 +1,5 @@ <?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. - */ - -require_once("utils.php"); - -define('ROSCMS_LOGIN_OPTIONAL', 1); -define('ROSCMS_LOGIN_REQUIRED', 2); - -function roscms_subsys_login($subsys, $login_type, $target) -{ - if (ROSCMS_LOGIN_OPTIONAL != $login_type && - ROSCMS_LOGIN_REQUIRED != $login_type) - { - die("Invalid login_type $login_type for roscms_subsys_login"); - } - - if (isset($_COOKIE['roscmsusrkey']) && - preg_match('/^([a-z]{32})$/', $_COOKIE['roscmsusrkey'], $matches)) - { - $session_id_clean = $matches[1]; - - if (isset($_SERVER['REMOTE_ADDR']) && - preg_match('/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/', - $_SERVER['REMOTE_ADDR'], $matches) ) - { - $remote_addr_clean = $matches[1]; - } - else - { - $remote_addr_clean = 'invalid'; - } - if (isset($_SERVER['HTTP_USER_AGENT'])) - { - $browser_agent_clean = $_SERVER['HTTP_USER_AGENT']; - } - else - { - $browser_agent_clean = 'unknown'; - } - - require("connect.db.php"); - - /* Clean out expired sessions */ - $query = "DELETE FROM user_sessions " . - " WHERE usersession_expires IS NOT NULL " . - " AND usersession_expires < NOW()"; - mysql_query($query, $connect); - - /* Now, see if we have a valid login session */ - $bulk_of_where = " WHERE s.usersession_id = '" . - mysql_escape_string($session_id_clean) . "' " . - " AND u.user_id = s.usersession_user_id " . - " AND (u.user_setting_ipaddress = 'false' OR " . - " s.usersession_ipaddress = '" . - mysql_escape_string($remote_addr_clean) . "') " . - " AND (u.user_setting_browseragent = 'false' OR " . - " s.usersession_browseragent = '" . - mysql_escape_string($browser_agent_clean) . "') "; - if ($subsys == "roscms" || $subsys == "") - { - $query = "SELECT u.user_id, s.usersession_expires " . - " FROM roscms.user_sessions s, " . - " roscms.users u " . - $bulk_of_where; - } - else - { - $query = "SELECT m.map_subsys_userid, s.usersession_expires " . - " FROM roscms.user_sessions s, " . - " roscms.users u, " . - " roscms.subsys_mappings m " . - $bulk_of_where . - " AND m.map_roscms_userid = s.usersession_user_id " . - " AND m.map_subsys_name = '" . - mysql_escape_string($subsys) . "'"; - } - $statement = mysql_query($query, $connect) - or die('DB error (user login) ' . $query); - - if ($row = mysql_fetch_array($statement)) - { - /* Login session found */ - $userid = $row[0]; - - // For the Wiki, we have to start a session - if( $subsys == "wiki" ) - { - define('MEDIAWIKI', ''); - require_once("../wiki/includes/GlobalFunctions.php"); - wfSetupSession(); - } - - if (isset($row[1])) - { - /* Session with timeout. Update the expiry time in the table and - the expiry time of the cookie */ - $query = "UPDATE roscms.user_sessions " . - " SET usersession_expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . - " WHERE usersession_id = '" . - mysql_escape_string($session_id_clean) . "'"; - mysql_query($query, $connect); - setcookie('roscmsusrkey', $session_id_clean, - time() + 60 * 60, '/', cookie_domain()); - } - } - else - { - $userid = 0; - } - } - else - { - $userid = 0; - } - - if (0 == $userid && ROSCMS_LOGIN_REQUIRED == $login_type) - { - $url = "/roscms/?page=login"; - if ("" != $target) - { - $url .= "&target=" . urlencode($target); - } - header("Location: $url"); - exit; - } - - return $userid; -} + require_once("/web/reactos.org/htdocs/roscms/logon/subsys_login.php"); ?> Modified: trunk/web/reactos.org/htdocs/roscms/inc/tools.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/tools.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/tools.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -33,8 +33,6 @@ $intSecondMonth = $arrSecondDate[1]; $intSecondDay = $arrSecondDate[2]; - //echo "<p>ooo: ".$intFirstMonth.", ".$intFirstDay.", ".$intFirstYear."</p>"; - // Calculate the diference of the two dates and return the number of days $intDate1Jul = gregoriantojd($intFirstMonth, $intFirstDay, $intFirstYear); Added: trunk/web/reactos.org/htdocs/roscms/logon/language_detection.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logo… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/language_detection.php (added) +++ trunk/web/reactos.org/htdocs/roscms/logon/language_detection.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -1,0 +1,229 @@ +<?php +/* + Script Name: Full Operating system language detection + Author: Harald Hope, Website: http://techpatterns.com/ + Script Source URI: http://techpatterns.com/downloads/php_language_detection.php + Version 0.3.4 + Copyright (C) 29 November 2007 + GNU GPL +*/ + +//$tmp = get_languages(); +//echo "<p>LANG: ".$tmp[0][0]."</p>"; + + +// choice of redirection header or just getting language data +// to call this you only need to use the $feature parameter +function get_languages() +{ + // get the languages + $a_languages = languages(); + $index = ''; + $complete = ''; + $found = false;// set to default value + //prepare user language array + $user_languages = array(); + + //check to see if language is set + if ( isset( $_SERVER["HTTP_ACCEPT_LANGUAGE"] ) ) + { + //explode languages into array + $languages = strtolower( $_SERVER["HTTP_ACCEPT_LANGUAGE"] ); + $languages = explode( ",", $languages ); + + foreach ( $languages as $language_list ) + { + // pull out the language, place languages into array of full and primary + // string structure: + $temp_array = array(); + // slice out the part before ; on first step, the part before - on second, place into array + $temp_array[0] = substr( $language_list, 0, strcspn( $language_list, ';' ) );//full language + $temp_array[1] = substr( $language_list, 0, 2 );// cut out primary language + //place this array into main $user_languages language array + $user_languages[] = $temp_array; + } + + //start going through each one + for ( $i = 0; $i < count( $user_languages ); $i++ ) + { + foreach ( $a_languages as $index => $complete ) + { + if ( $index == $user_languages[$i][0] ) + { + // complete language, like english (canada) + $user_languages[$i][2] = $complete; + // extract working language, like english + $user_languages[$i][3] = substr( $complete, 0, strcspn( $complete, ' (' ) ); + } + } + } + } + else // if no languages found + { + $user_languages[0] = array( '','','','' ); //return blank array. + } + + return $user_languages; +} + +function languages() +{ +// pack abbreviation/language array +// important note: you must have the default language as the last item in each major language, after all the +// en-ca type entries, so en would be last in that case + $a_languages = array( + 'af' => 'Afrikaans', + 'sq' => 'Albanian', + 'ar-dz' => 'Arabic (Algeria)', + 'ar-bh' => 'Arabic (Bahrain)', + 'ar-eg' => 'Arabic (Egypt)', + 'ar-iq' => 'Arabic (Iraq)', + 'ar-jo' => 'Arabic (Jordan)', + 'ar-kw' => 'Arabic (Kuwait)', + 'ar-lb' => 'Arabic (Lebanon)', + 'ar-ly' => 'Arabic (libya)', + 'ar-ma' => 'Arabic (Morocco)', + 'ar-om' => 'Arabic (Oman)', + 'ar-qa' => 'Arabic (Qatar)', + 'ar-sa' => 'Arabic (Saudi Arabia)', + 'ar-sy' => 'Arabic (Syria)', + 'ar-tn' => 'Arabic (Tunisia)', + 'ar-ae' => 'Arabic (U.A.E.)', + 'ar-ye' => 'Arabic (Yemen)', + 'ar' => 'Arabic', + 'hy' => 'Armenian', + 'as' => 'Assamese', + 'az' => 'Azeri', + 'eu' => 'Basque', + 'be' => 'Belarusian', + 'bn' => 'Bengali', + 'bg' => 'Bulgarian', + 'ca' => 'Catalan', + 'zh-cn' => 'Chinese (China)', + 'zh-hk' => 'Chinese (Hong Kong SAR)', + 'zh-mo' => 'Chinese (Macau SAR)', + 'zh-sg' => 'Chinese (Singapore)', + 'zh-tw' => 'Chinese (Taiwan)', + 'zh' => 'Chinese', + 'hr' => 'Croatian', + 'cs' => 'Czech', + 'da' => 'Danish', + 'div' => 'Divehi', + 'nl-be' => 'Dutch (Belgium)', + 'nl' => 'Dutch (Netherlands)', + 'en-au' => 'English (Australia)', + 'en-bz' => 'English (Belize)', + 'en-ca' => 'English (Canada)', + 'en-ie' => 'English (Ireland)', + 'en-jm' => 'English (Jamaica)', + 'en-nz' => 'English (New Zealand)', + 'en-ph' => 'English (Philippines)', + 'en-za' => 'English (South Africa)', + 'en-tt' => 'English (Trinidad)', + 'en-gb' => 'English (United Kingdom)', + 'en-us' => 'English (United States)', + 'en-zw' => 'English (Zimbabwe)', + 'en' => 'English', + 'us' => 'English (United States)', + 'et' => 'Estonian', + 'fo' => 'Faeroese', + 'fa' => 'Farsi', + 'fi' => 'Finnish', + 'fr-be' => 'French (Belgium)', + 'fr-ca' => 'French (Canada)', + 'fr-lu' => 'French (Luxembourg)', + 'fr-mc' => 'French (Monaco)', + 'fr-ch' => 'French (Switzerland)', + 'fr' => 'French (France)', + 'mk' => 'FYRO Macedonian', + 'gd' => 'Gaelic', + 'ka' => 'Georgian', + 'de-at' => 'German (Austria)', + 'de-li' => 'German (Liechtenstein)', + 'de-lu' => 'German (Luxembourg)', + 'de-ch' => 'German (Switzerland)', + 'de' => 'German (Germany)', + 'el' => 'Greek', + 'gu' => 'Gujarati', + 'he' => 'Hebrew', + 'hi' => 'Hindi', + 'hu' => 'Hungarian', + 'is' => 'Icelandic', + 'id' => 'Indonesian', + 'it-ch' => 'Italian (Switzerland)', + 'it' => 'Italian (Italy)', + 'ja' => 'Japanese', + 'kn' => 'Kannada', + 'kk' => 'Kazakh', + 'kok' => 'Konkani', + 'ko' => 'Korean', + 'kz' => 'Kyrgyz', + 'lv' => 'Latvian', + 'lt' => 'Lithuanian', + 'ms' => 'Malay', + 'ml' => 'Malayalam', + 'mt' => 'Maltese', + 'mr' => 'Marathi', + 'mn' => 'Mongolian (Cyrillic)', + 'ne' => 'Nepali (India)', + 'nb-no' => 'Norwegian (Bokmal)', + 'nn-no' => 'Norwegian (Nynorsk)', + 'no' => 'Norwegian (Bokmal)', + 'or' => 'Oriya', + 'pl' => 'Polish', + 'pt-br' => 'Portuguese (Brazil)', + 'pt' => 'Portuguese (Portugal)', + 'pa' => 'Punjabi', + 'rm' => 'Rhaeto-Romanic', + 'ro-md' => 'Romanian (Moldova)', + 'ro' => 'Romanian', + 'ru-md' => 'Russian (Moldova)', + 'ru' => 'Russian', + 'sa' => 'Sanskrit', + 'sr' => 'Serbian', + 'sk' => 'Slovak', + 'ls' => 'Slovenian', + 'sb' => 'Sorbian', + 'es-ar' => 'Spanish (Argentina)', + 'es-bo' => 'Spanish (Bolivia)', + 'es-cl' => 'Spanish (Chile)', + 'es-co' => 'Spanish (Colombia)', + 'es-cr' => 'Spanish (Costa Rica)', + 'es-do' => 'Spanish (Dominican Republic)', + 'es-ec' => 'Spanish (Ecuador)', + 'es-sv' => 'Spanish (El Salvador)', + 'es-gt' => 'Spanish (Guatemala)', + 'es-hn' => 'Spanish (Honduras)', + 'es-mx' => 'Spanish (Mexico)', + 'es-ni' => 'Spanish (Nicaragua)', + 'es-pa' => 'Spanish (Panama)', + 'es-py' => 'Spanish (Paraguay)', + 'es-pe' => 'Spanish (Peru)', + 'es-pr' => 'Spanish (Puerto Rico)', + 'es-us' => 'Spanish (United States)', + 'es-uy' => 'Spanish (Uruguay)', + 'es-ve' => 'Spanish (Venezuela)', + 'es' => 'Spanish (Traditional Sort)', + 'sx' => 'Sutu', + 'sw' => 'Swahili', + 'sv-fi' => 'Swedish (Finland)', + 'sv' => 'Swedish', + 'syr' => 'Syriac', + 'ta' => 'Tamil', + 'tt' => 'Tatar', + 'te' => 'Telugu', + 'th' => 'Thai', + 'ts' => 'Tsonga', + 'tn' => 'Tswana', + 'tr' => 'Turkish', + 'uk' => 'Ukrainian', + 'ur' => 'Urdu', + 'uz' => 'Uzbek', + 'vi' => 'Vietnamese', + 'xh' => 'Xhosa', + 'yi' => 'Yiddish', + 'zu' => 'Zulu' ); + + return $a_languages; +} +?> Propchange: trunk/web/reactos.org/htdocs/roscms/logon/language_detection.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/roscms/logon/login.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logo… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/login.php (added) +++ trunk/web/reactos.org/htdocs/roscms/logon/login.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -1,0 +1,233 @@ +<?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. + */ + +// To prevent hacking activity: +if ( !defined('ROSCMS_LOGIN') ) +{ + die("Hacking attempt"); +} + +require_once("subsys_login.php"); + + +/* + * User Settings: + * + * user_setting_multisession == "true" (default: false) [multi sessions are allowed for this user] + * user_setting_browseragent == "true" (default: true) [no one should deactivate ("false") this option or only if he change the user agent very often (e.g. in opera: IE <=> Opera)] + * user_setting_ipaddress == "true" (default: true) [IP address check; avoid this setting if the user is behind a proxy or use more than one pc the same time (a possible security risk, but some persons wanted that behavior ...); Note: this is a per user setting, everyone can change it!] + * user_setting_timeout == "true" (default: false) [NO timeout; so user can use the ros homepage systems without to login everytime] + * + */ + +// Intern Member Groups: (set all to false) +$roscms_intern_usrgrp_sadmin = false; +$roscms_intern_usrgrp_admin = false; +$roscms_intern_usrgrp_dev = false; +$roscms_intern_usrgrp_team = false; +$roscms_intern_usrgrp_men = false; +$roscms_intern_usrgrp_transm = false; +$roscms_intern_usrgrp_trans = false; +$roscms_intern_usrgrp_user = false; + +global $roscms_intern_usrgrp_sadmin; +global $roscms_intern_usrgrp_admin; +global $roscms_intern_usrgrp_deve; +global $roscms_intern_usrgrp_team; +global $roscms_intern_usrgrp_men; +global $roscms_intern_usrgrp_transm; +global $roscms_intern_usrgrp_trans; +global $roscms_intern_usrgrp_user; + + + +$roscms_intern_login_check = ""; +$roscms_intern_login_check_usrgroup = ""; +$roscms_intern_account_group = ""; +$roscms_intern_account_level = ""; + + +$target = $_SERVER[ 'PHP_SELF' ]; +if ( IsSet( $_SERVER[ 'QUERY_STRING' ] ) ) { + $target .= '?' . $_SERVER[ 'QUERY_STRING' ]; +} +$roscms_currentuser_id = roscms_subsys_login("roscms", + ROSCMS_LOGIN_REQUIRED, + $target); +if (0 == $roscms_currentuser_id) { + die("login.php: unexpected return from roscms_subsys_login"); +} + +$query = "SELECT user_id, " . + " user_name, " . + " user_roscms_password, " . + " user_timestamp_touch, " . + " user_setting_timeout " . + " FROM users " . + " WHERE user_id = " . + $roscms_currentuser_id; +$query_usr = mysql_query($query) + or die('DB error (login script #1)!'); +$result_usr = mysql_fetch_array($query_usr) + or die('DB error (login script #2)'); + +if ($result_usr['user_name'] != "") { + $roscms_intern_timeout_option = $result_usr['user_setting_timeout']; +} +else { // only hacker/cracker/script kiddy/brute force script/bot/etc. is able to reach this part + die("<blink>No valid user session found!</blink><p><a href='http://www.reactos.org/roscms/?page=getpwd'>Delete all old sessions and login again!</a> (this function will also allow you to set a new password)</p>"); + // TODO: add it to the watchlist! +} + +if (isset($_POST['logout'])) { + header("location:?page=logout"); +} + +$querya = "SELECT user_login_counter, user_account_enabled, " . + " user_setting_multisession, " . + " user_setting_browseragent, user_setting_ipaddress " . + " FROM users " . + " WHERE user_id = $roscms_currentuser_id"; +$login_usr_keya_query = mysql_query($querya) + or die('DB error (login)!'); +$login_usr_keya_result = mysql_fetch_array($login_usr_keya_query); + +$roscms_currentuser_login_counter = $login_usr_keya_result['user_login_counter']; +$roscms_currentuser_login_user_account_enabled = $login_usr_keya_result['user_account_enabled']; +$roscms_currentuser_login_user_setting_multisession = $login_usr_keya_result['user_setting_multisession']; +$roscms_currentuser_login_user_setting_browseragent = $login_usr_keya_result['user_setting_browseragent']; +$roscms_currentuser_login_user_setting_ipaddress = $login_usr_keya_result['user_setting_ipaddress']; + +// if the account is NOT enabled; e.g. a reason could be that a member +// of the admin group has disabled this account because of spamming, +// etc. +if ($roscms_currentuser_login_user_account_enabled != "yes") { + die("Account is not enabled!<br><br>System message: " . + $roscms_currentuser_login_user_account_enabled); +} + + +$roscms_security_level = 0; +$roscms_security_memberships = "|"; + + +$rdf_user_id = $roscms_currentuser_id; +$rdf_user_name = "FOO BAR"; +$rdf_user_level = 4; +$rdf_user_timezone = 1; +$rdf_user_timezone_name = "CET"; + + + +// check usergroup membership +$query = "SELECT * " . + " FROM usergroup_members " . + " WHERE usergroupmember_userid = $roscms_currentuser_id"; +$roscms_login_usrgrp_member_query = mysql_query($query); +while($roscms_login_usrgrp_member_list = mysql_fetch_array($roscms_login_usrgrp_member_query)) { + switch ($roscms_login_usrgrp_member_list['usergroupmember_usergroupid']) { // Membership + case "user": // normal user + $roscms_intern_usrgrp_user = true; + break; + case "transmaint": // translation maintainer + case "translator": // translator + $roscms_intern_usrgrp_trans = true; + break; + case "m_lang": // language maintainer + $roscms_intern_usrgrp_transm = true; + break; + case "m_en": // maintainer for english (original language) + $roscms_intern_usrgrp_men = true; + break; + case "moderator": // moderator + case "mediateam": // mediateam (add here all other team's but not the 'web-team' => admin-group) + $roscms_intern_usrgrp_team = true; + break; + case "developer": // developer + $roscms_intern_usrgrp_dev = true; + break; + case "ros_admin": // administrator + $roscms_intern_usrgrp_admin = true; + break; + case "ros_sadmin": // super administrator (if someone is member of this group he is also a member of the normal admin group!) + $roscms_intern_usrgrp_admin = true; + $roscms_intern_usrgrp_sadmin = true; + break; + default: // nothing + break; + } + + + $query_usergroup = mysql_query("SELECT * + FROM usergroups + WHERE usrgroup_name_id = '".mysql_real_escape_string($roscms_login_usrgrp_member_list['usergroupmember_usergroupid'])."' + LIMIT 1;"); + $result_usergroup = mysql_fetch_array($query_usergroup); + + if ($result_usergroup['usrgroup_seclev'] > $roscms_security_level) { + $roscms_security_level = $result_usergroup['usrgroup_seclev']; + } + + $roscms_security_memberships .= $roscms_login_usrgrp_member_list['usergroupmember_usergroupid']."|"; + +} + +// Account level: + +if ($roscms_intern_usrgrp_sadmin == true) { + $roscms_intern_account_level = 100; +} +else { + if ($roscms_intern_usrgrp_admin == true) { + $roscms_intern_account_level = 75; + } + else { + if ($roscms_intern_usrgrp_dev == true) { + $roscms_intern_account_level = 50; + } + else { + if ($roscms_intern_usrgrp_team == true || + $roscms_intern_usrgrp_trans == true || + $roscms_intern_usrgrp_transm == true || + $roscms_intern_usrgrp_men == true) + { + $roscms_intern_account_level = 25; + } + else { + $roscms_intern_account_level = 0; + } + } + } +} + +//require_once("usergroups.php"); + + +// user id +$roscms_intern_account_id = $roscms_currentuser_id; +$roscms_intern_login_check_username=$result_usr['user_name']; + +// quick hack to test RosCMS; the following vars will change soon +$roscms_intern_login_check_usrgroup = "ros_sadmin"; +$roscms_intern_account_group = "ros_sadmin"; +$roscms_intern_login_check = "valid"; // valid login sequenze + +?> Added: trunk/web/reactos.org/htdocs/roscms/logon/login_optional.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logo… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/login_optional.php (added) +++ trunk/web/reactos.org/htdocs/roscms/logon/login_optional.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -1,0 +1,66 @@ +<?php + /* + ReactOS DynamicFrontend (RDF) + Copyright (C) 2007 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. + */ + + if ( !defined('ROSCMS_LOGIN') ) + { + die("Hacking attempt"); + } + + require_once("logon/subsys_login.php"); + + $rdf_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, ""); + + if ($rdf_user_id == 0) { + $rdf_user_id = 0; + $rdf_user_name = "Anonymous Guest"; + $rdf_user_level = 0; // 0 = guest, 1 = registered user, 2 = membership, 3 = moderator, 4 = author, 5 = admin + $rdf_user_timezone = 0; + $rdf_user_timezone_name = "UTC"; + } + else { + $sql_user = "SELECT u.user_id, u.user_name, u.user_level, u.user_timezone, z.tz_code, z.tz_value + FROM users u, user_timezone z + WHERE u.user_id = ".mysql_real_escape_string($rdf_user_id)." + AND u.user_account_enabled LIKE 'yes' + AND u.user_timezone = z.tz_code + LIMIT 1;"; + $query_user = mysql_query($sql_user); + $result_user = mysql_fetch_array($query_user); + + if ($result_user['user_id'] != "" && $result_user['user_id'] > 1 && $result_user['user_level'] >= 1 && $result_user['user_level'] <= 5) { + $rdf_user_id = $result_user['user_id']; + $rdf_user_name = $result_user['user_name']; + $rdf_user_level = $result_user['user_level']; + $rdf_user_timezone = $result_user['tz_value']; + $rdf_user_timezone_name = $result_user['tz_code']; + } + else { + $rdf_user_id = 0; + $rdf_user_name = "Anonymous Guest"; + $rdf_user_level = 0; + $rdf_user_timezone = 0; + $rdf_user_timezone_name = "UTC"; + } + } + + + + +?> Propchange: trunk/web/reactos.org/htdocs/roscms/logon/login_optional.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/roscms/logon/logon.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logo… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/logon.css (added) +++ trunk/web/reactos.org/htdocs/roscms/logon/logon.css [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -1,0 +1,120 @@ +.login-form { + margin-top: 20px; + margin-bottom: 20px; +} + +.login-form label { + color:#817A71; + display:block; + float:none; + font-size:105%; + font-weight:bold; + margin:0.7em 0pt 0.1em; +} + +.login-form input { + background:#FFFADB url(../images/form-back.gif) repeat-x scroll 0%; + border:1px solid #CBB945; + color:#776B1B; + font-size:125%; + font-weight:normal; + width:200px; + padding:3px 7px; + line-height:1; +} + +.login-form select { + background:#FFFADB; + border:1px solid #CBB945; + color:#776B1B; + font-size:115%; + font-weight:normal; + width:216px; + padding:3px 7px; + line-height:1; +} + +.login-title { + font-size:150%; + font-weight:bold; + padding: 5px; +} + +.login-options { + text-align:left; + margin-top: 20px; + margin-bottom: 10px; + padding: 10px; + color:#817A71; + font-size:105%; + font-weight:bold; +} + +.login-button input { + font-size:120%; + margin-bottom: 10px; +} + +.register-accept { + margin-top: 10px; + margin-bottom: 10px; +} +.register-accept a { + color:#000000 !important; + text-decoration:none; + font-style:italic; +} + +.corner1 { + background:transparent url(../images/ul.gif) no-repeat scroll left top; +} +.corner2 { + background:transparent url(../images/ll.gif) no-repeat scroll left bottom; +} +.corner3 { + background:transparent url(../images/ur.gif) no-repeat scroll right top; +} +.corner4 { + background:transparent url(../images/lr.gif) no-repeat scroll right bottom; +} + + +/* profil headline */ +.u-h1 { + font-size: 150%; + font-weight:bold; + margin-bottom:15px; +} +.u-h2 { + font-size: 100%; + margin-bottom:30px; +} + +.u-desc { + color:#817A71; + display:block; + float:none; + font-size:105%; + font-weight:bold; + margin:0.7em 0pt 0.1em; +} + +.u-title { + font-size:130%; + font-weight:bold; + padding: 5px; +} + +.u-title a { + font-size:95%; + font-weight:bold; + padding: 5px; + color:#000000 !important; +} + + +.u-link a { + color:#000000 !important; + font-size:110%; + font-weight:bold; +} Propchange: trunk/web/reactos.org/htdocs/roscms/logon/logon.css ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/roscms/logon/logout.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logo… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/logout.php (added) +++ trunk/web/reactos.org/htdocs/roscms/logon/logout.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -1,0 +1,60 @@ +<?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. + */ + + +// To prevent hacking activity: +if ( !defined('ROSCMS_LOGIN') ) +{ + die("Hacking attempt"); +} + +global $roscms_SET_path_ex; +global $rdf_login_cookie_usrkey; + +//require_once("logon_utils.php"); + +if (isset($_COOKIE[$rdf_login_cookie_usrkey])) +{ + $del_session_id = $_COOKIE[$rdf_login_cookie_usrkey]; + setcookie($rdf_login_cookie_usrkey, "", time() - 3600, "/", cookie_domain()); + $logout_usr_key_post = "DELETE FROM user_sessions " . + " WHERE usersession_id = '" . + mysql_escape_string($del_session_id) . + "'"; + $logout_usr_key_post_list = mysql_query($logout_usr_key_post) + or die("DB error (logout)!"); +} + + +$target = $_SERVER[ 'PHP_SELF' ]; +if ( IsSet( $_SERVER[ 'QUERY_STRING' ] ) ) { + $target .= '?' . $_SERVER[ 'QUERY_STRING' ]; +} +if (isset($_REQUEST['target'])) { + header("Location: http://" . $_SERVER['HTTP_HOST'] . + $_REQUEST['target']); + exit; +} + +header("Location: ".$roscms_SET_path_ex); + +exit; + +?> Added: trunk/web/reactos.org/htdocs/roscms/logon/subsys_login.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logo… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/subsys_login.php (added) +++ trunk/web/reactos.org/htdocs/roscms/logon/subsys_login.php [iso-8859-1] Fri Sep 26 06:54:49 2008 @@ -1,0 +1,147 @@ +<?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. + */ + +require_once("/web/reactos.org/htdocs/roscms/inc/utils.php"); + +define('ROSCMS_LOGIN_OPTIONAL', 1); +define('ROSCMS_LOGIN_REQUIRED', 2); + +function roscms_subsys_login($subsys, $login_type, $target) +{ + if (ROSCMS_LOGIN_OPTIONAL != $login_type && + ROSCMS_LOGIN_REQUIRED != $login_type) + { + die("Invalid login_type $login_type for roscms_subsys_login"); + } + + if (isset($_COOKIE['roscmsusrkey']) && + preg_match('/^([a-z]{32})$/', $_COOKIE['roscmsusrkey'], $matches)) + { + $session_id_clean = $matches[1]; + + if (isset($_SERVER['REMOTE_ADDR']) && + preg_match('/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/', + $_SERVER['REMOTE_ADDR'], $matches) ) + { + $remote_addr_clean = $matches[1]; + } + else + { + $remote_addr_clean = 'invalid'; + } + if (isset($_SERVER['HTTP_USER_AGENT'])) + { + $browser_agent_clean = $_SERVER['HTTP_USER_AGENT']; + } + else + { + $browser_agent_clean = 'unknown'; + } + + require("connect.db.php"); + + /* Clean out expired sessions */ + $query = "DELETE FROM user_sessions " . + " WHERE usersession_expires IS NOT NULL " . + " AND usersession_expires < NOW()"; + mysql_query($query, $connect); + + /* Now, see if we have a valid login session */ + $bulk_of_where = " WHERE s.usersession_id = '" . + mysql_escape_string($session_id_clean) . "' " . + " AND u.user_id = s.usersession_user_id " . + " AND (u.user_setting_ipaddress = 'false' OR " . + " s.usersession_ipaddress = '" . + mysql_escape_string($remote_addr_clean) . "') " . + " AND (u.user_setting_browseragent = 'false' OR " . + " s.usersession_browseragent = '" . + mysql_escape_string($browser_agent_clean) . "') "; + if ($subsys == "roscms" || $subsys == "") + { + $query = "SELECT u.user_id, s.usersession_expires " . + " FROM roscms.user_sessions s, " . + " roscms.users u " . + $bulk_of_where; + } + else + { + $query = "SELECT m.map_subsys_userid, s.usersession_expires " . + " FROM roscms.user_sessions s, " . + " roscms.users u, " . + " roscms.subsys_mappings m " . + $bulk_of_where . + " AND m.map_roscms_userid = s.usersession_user_id " . + " AND m.map_subsys_name = '" . + mysql_escape_string($subsys) . "'"; + } + $statement = mysql_query($query, $connect) + or die('DB error (user login) ' . $query); + + if ($row = mysql_fetch_array($statement)) + { + /* Login session found */ + $userid = $row[0]; + + // For the Wiki, we have to start a session + if( $subsys == "wiki" ) + { + define('MEDIAWIKI', ''); + require_once("../wiki/includes/GlobalFunctions.php"); + wfSetupSession(); + } + + if (isset($row[1])) + { + /* Session with timeout. Update the expiry time in the table and + the expiry time of the cookie */ + $query = "UPDATE roscms.user_sessions " . + " SET usersession_expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . + " WHERE usersession_id = '" . + mysql_escape_string($session_id_clean) . "'"; + mysql_query($query, $connect); + setcookie('roscmsusrkey', $session_id_clean, + time() + 60 * 60, '/', cookie_domain()); + } + } + else + { + $userid = 0; + } + } + else + { + $userid = 0; + } + + if (0 == $userid && ROSCMS_LOGIN_REQUIRED == $login_type) + { + $url = "/roscms/?page=login"; + if ("" != $target) + { + $url .= "&target=" . urlencode($target); + } + header("Location: $url"); + exit; + } + + return $userid; +} + +?> Propchange: trunk/web/reactos.org/htdocs/roscms/logon/subsys_login.php ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008