Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 31273: Removed an used var
by pschweitzer＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: pschweitzer Date: Sun Dec 16 12:59:16 2007 New Revision: 31273 URL: http://svn.reactos.org/svn/reactos?rev=31273&view=rev Log: Removed an used var Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Sun Dec 16 12:59:16 2007 @@ -1,4 +1,7 @@ *** XXX XXth, 2008 - RosBE 1.2 Released + +- Updated RosBE Configuration Tool. (Pierre Schweitzer) + - Removed an used var. (Pierre Schweitzer) - Added a "all" switch to clean.cmd to do both jobs, deleting Compiler Output AND Logs in one process. (Daniel Reimer) - Added a Security Prompt to clean.cmd to not accidentally delete all Built stuff. (Daniel Reimer) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Sun Dec 16 12:59:16 2007 @@ -86,7 +86,6 @@ VOID LoadSettings(HWND hwnd, PSETTINGS LoadedSettings) { FILE *pFile; - INT NbLines = 0; WCHAR optionsfile[MAX_PATH]; WCHAR *ptr, *ptr2; WCHAR WTempLine[25+MAX_PATH]; @@ -132,7 +131,6 @@ wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); } free(WTempLine); - NbLines++; } fclose(pFile); free(WTempLine);

1 0

[pschweitzer] 31272: Updated French translations for calc, shell32, syssetup
by pschweitzer＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: pschweitzer Date: Sun Dec 16 12:53:56 2007 New Revision: 31272 URL: http://svn.reactos.org/svn/reactos?rev=31272&view=rev Log: Updated French translations for calc, shell32, syssetup Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc Sun Dec 16 12:53:56 2007 @@ -139,11 +139,12 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,120,82 +DLG_ABOUT DIALOG 12,0,175,90 CAPTION "À propos de GNU winecalc" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END WHATS_THIS_MENU MENU DISCARDABLE Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Sun Dec 16 12:53:56 2007 @@ -358,193 +358,193 @@ FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - -GROUPBOX "Tasks", -1, 7, 10, 249, 45 +CAPTION "Général" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +GROUPBOX "Tâches", -1, 7, 10, 249, 45 //ICON -AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP -GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP +AUTORADIOBUTTON "Montrer les tâches communes dans les dossiers", 14001, 40, 25, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Utilisez les dossiers Windows class&iques", 14002, 40, 37, 120, 10, WS_TABSTOP +GROUPBOX "Parcourir les dossiers", -1, 7, 60, 249, 45, WS_TABSTOP //ICON -AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP -AUTORADIOBUTTON "Open each folder in its own &window", 14005, 40, 82, 140, 10, WS_TABSTOP -GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 +AUTORADIOBUTTON "Ouvrir tous les dossiers dans la &même fenêtre", 14004, 40, 70, 140, 10, WS_TABSTOP +AUTORADIOBUTTON "Ouvrir chaque dossier dans sa propre fenêtre", 14005, 40, 82, 140, 10, WS_TABSTOP +GROUPBOX "Cliquer sur les éléments de la façon suivante", -1, 7, 110, 249, 60 //ICON -AUTORADIOBUTTON "&Single-click to open an item (point to select)", 14007, 40, 120, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "Underline icon titles consistent with my &browser", 14008, 50, 132, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "Underline icon titles only when I &point at them", 14009, 50, 144, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", 14010, 40, 156, 170, 10, WS_TABSTOP -PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP +AUTORADIOBUTTON "Clic unique pour ouvrir un élément (pointer pour sélectionner)", 14007, 40, 120, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "Toujours souligner les titres des icônes avec mon navigateur", 14008, 50, 132, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "Souligner les titres des icônes seulement quand je les &pointe", 14009, 50, 144, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "&Double-cliquer pour ouvrir un élément (clic unique pour sélectionner)", 14010, 40, 156, 170, 10, WS_TABSTOP +PUSHBUTTON "Pa&ramètres par défaut", 14011, 180, 180, 60, 14, WS_TABSTOP END FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "View" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN -GROUPBOX "Folder views", -1, 7, 10, 249, 60 +CAPTION "Affichage" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +GROUPBOX "Affichage des dossiers", -1, 7, 10, 249, 60 //ICON -LTEXT "You can apply the view(such as Details or Tiles) that\nyou are using for this folder to all folders.", -1, 60, 20, 180, 20 -PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP -PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP -LTEXT "Advanced settings:", -1, 7, 80, 100, 10 +LTEXT "Vous pouvez appliquer l'affichage (tel que Détails ou Miniatures) que\nvous utilisez pour ce dossier à tous les dossiers.", -1, 60, 20, 180, 20 +PUSHBUTTON "Appliquer à tous les dossiers", 14001, 60, 50, 80, 14, WS_TABSTOP +PUSHBUTTON "&Réinitialiser tous les dossiers", 14002, 150, 50, 80, 14, WS_TABSTOP +LTEXT "Paramètres avancés :", -1, 7, 80, 100, 10 CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 -PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP +PUSHBUTTON "Paramètres par &défaut", 14004, 180, 210, 80, 14, WS_TABSTOP END FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "File Types" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN -LTEXT "Registered file &types:", -1, 7, 10, 70, 10 +CAPTION "Types de fichier" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "&Types de fichier enregistrés :", -1, 7, 10, 70, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 -PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP -PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP -GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 -LTEXT "Opens with:", -1, 12, 140, 40, 10 +PUSHBUTTON "&Nouveau", 14001, 120, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "Supprimer", 14002, 180, 110, 50, 14, WS_TABSTOP +GROUPBOX "Détails pour l'extension '%s'", 14003, 7, 130, 249, 70 +LTEXT "Ouvrir avec :", -1, 12, 140, 40, 10 //ICON -LTEXT "Appname", 14005, 100, 140, 40, 10 -PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 -PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP +LTEXT "Nom de l'application", 14005, 100, 140, 40, 10 +PUSHBUTTON "&Changer...", 14006, 180, 140, 50, 14, WS_TABSTOP +LTEXT "Les fichiers avec l'extension '%s' sont du type '%s'. Pour\nchanger les paramètres qui concernent tous les fichiers '%s', cliquez\nsur Avancé.", 14007, 12, 155, 160, 30 +PUSHBUTTON "A&vancé", 14008, 180, 175, 50, 14, WS_TABSTOP END CONFIRM_FILE_REPLACE_DLG DIALOGEX 0, 0, 282, 143 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Confirm File Replace" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14 - PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14 - PUSHBUTTON "&No", IDNO, 150, 122, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14 +CAPTION "Confirmer le remplacement de fichier" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Oui", IDYES, 20, 122, 60, 14 + PUSHBUTTON "Oui pour tous", 12807, 85, 122, 60, 14 + PUSHBUTTON "&Non", IDNO, 150, 122, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX - LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "This folder already contains a system file named '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "Would you like to replace the existing file", -1, 44, 35, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12302, 79, 51, 198, 20, SS_NOPREFIX + LTEXT "Ce dossier contient déjà un fichier nommé '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX + LTEXT "Ce dossier contient déjà un fichier en lecture-seule nommé '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Ce dossier contient déjà un fichier système nommé '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Désirez-vous remplacer le fichier existant", -1, 44, 35, 228, 10, SS_NOPREFIX + LTEXT "(date et taille inconnues)", 12302, 79, 51, 198, 20, SS_NOPREFIX ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL - LTEXT "with this one?", -1, 44, 75, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12303, 79, 91, 198, 20, SS_NOPREFIX + LTEXT "par celui-ci ?", -1, 44, 75, 228, 10, SS_NOPREFIX + LTEXT "(date et taille inconnues)", 12303, 79, 91, 198, 20, SS_NOPREFIX ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END LOGOFF_DLG DIALOGEX 0, 0, 190, 60 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Log Off ReactOS" +CAPTION "Fermer ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + LTEXT "Êtes-vous sûr de vouloir fermer ReactOS ?", -1, 43, 11, 140, 22 + DEFPUSHBUTTON "Fermer", IDOK, 57, 40, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 122, 40, 60, 14 END DISCONNECT_DLG DIALOGEX 0, 0, 190, 60 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Disconnect ReactOS" +CAPTION "Déconnecter ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 49, 14346, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to disconnect?", -1, 49, 12, 137, 23 - DEFPUSHBUTTON "&Disconnect", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 123, 40, 60, 14 + LTEXT "Êtes-vous sûr de vouloir vous déconnecter ?", -1, 49, 12, 137, 23 + DEFPUSHBUTTON "&Déconnecter", IDOK, 57, 40, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 123, 40, 60, 14 END AUTOPLAY1_DLG DIALOGEX 0, 0, 227, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "AutoPlay" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Select a content type, then choose an action for ReactOS to perform automatically when that type is used in this device:", 1000, 7, 7, 215, 20 +CAPTION "Exécution automatique" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sélectionnez un type de contenu, puis choisissez une action que ReactOS réalisera automatiquement que ce type sera utilisé dans ce périphérique :", 1000, 7, 7, 215, 20 CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200 GROUPBOX "Actions", -1, 7, 45, 212, 146 - AUTORADIOBUTTON "Select an action to &perform:", 1005, 14, 54, 202, 10, WS_GROUP + AUTORADIOBUTTON "Sélectionnez une action à réaliser :", 1005, 14, 54, 202, 10, WS_GROUP CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107 - AUTORADIOBUTTON "Prompt me each time to &choose an action", 1006, 14, 177, 202, 10 - PUSHBUTTON "&Restore Defaults", 1008, 108, 197, 110, 14, WS_DISABLED + AUTORADIOBUTTON "M'interroger à chaque fois pour &choisir une action", 1006, 14, 177, 202, 10 + PUSHBUTTON "Pa&ramètres par défaut", 1008, 108, 197, 110, 14, WS_DISABLED END MIXED_CONTENT1_DLG DIALOG 0, 0, 227, 207 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Mixed Content" +CAPTION "Contenu mixte" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20 - LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8 + LTEXT "Ce disque ou dispositif contient plus d'un type de fichier.", 1001, 32, 7, 191, 20 + LTEXT "Que voulez-vous que ReactOS fasse ?", 1002, 32, 31, 188, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139 DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 160, 186, 60, 14 END MIXED_CONTENT2_DLG DIALOG 0, 0, 227, 206 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Mixed Content" +CAPTION "Contenu mixte" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS can perform the same action each time you insert a disk or connect a device with this kind of file:", 1001, 30, 7, 193, 20 + LTEXT "ReactOS peut réaliser la même action chaque fois que vous insérez un disque ou connectez un dispositif avec ce type de fichiers :", 1001, 30, 7, 193, 20 ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "What do you want ReactOS to do?", 1002, 32, 41, 190, 8 + LTEXT "Que voulez-vous que ReactOS fasse ?", 1002, 32, 41, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112 - AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10 + AUTOCHECKBOX "Toujours réaliser l'action sélectionnée.", 1004, 32, 171, 190, 10 DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 160, 185, 60, 14 END AUTOPLAY2_DLG DIALOG 0, 0, 227, 181 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Autoplay" +CAPTION "Exécution automatique" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS can perform the same action each time you connect this device.", 1001, 32, 7, 190, 22 - LTEXT "&What do you want ReactOS to do?", 1002, 32, 31, 190, 8 + LTEXT "ReactOS peut réaliser la même action chaque fois que vous connectez ce dispositif.", 1001, 32, 7, 190, 22 + LTEXT "Que voulez-vous que ReactOS fasse ?", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 - AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8 + AUTOCHECKBOX "Toujours réaliser l'action sélectionnée", 1004, 32, 143, 190, 8 DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 159, 160, 60, 14 END SHUTDOWN_DLG DIALOG 0, 0, 211, 103 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Shut Down ReactOS" +CAPTION "Fermer ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP - LTEXT "What do you want the computer to do?", -1, 39, 7, 167, 10 + LTEXT "Que voulez-vous que l'ordinateur fasse ?", -1, 39, 7, 167, 10 COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL - LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37 + LTEXT "Maintenir votre session, garder votre ordinateur lancé avec peu d'énergie et les données toujours en mémoire. L'ordinateur se réveille lorsque vous pressez une touche ou que vous bougez la souris.", 8225, 39, 40, 167, 37 DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14 - PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 75, 82, 60, 14 + PUSHBUTTON "Aide", IDHELP, 144, 82, 60, 14 END FORMAT_DLG DIALOGEX 50, 50, 184, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Format" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Start", IDOK, 53, 198, 60, 14 - PUSHBUTTON "&Close", IDCANCEL, 118, 198, 60, 14 - LTEXT "Ca&pacity:", -1, 7, 6, 169, 9 +CAPTION "Formater" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Démarrer", IDOK, 53, 198, 60, 14 + PUSHBUTTON "Fermer", IDCANCEL, 118, 198, 60, 14 + LTEXT "Ca&pacité :", -1, 7, 6, 169, 9 COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&File system", -1, 7, 35, 170, 9 + LTEXT "Système de fichier", -1, 7, 35, 170, 9 COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8 - LTEXT "&Allocation unit size", -1, 7, 64, 170, 9 + LTEXT "Taille d'unité d'&allocation", -1, 7, 64, 170, 9 COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Volume &label", -1, 7, 93, 170, 9 + LTEXT "Nom du volume", -1, 7, 93, 170, 9 EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL - GROUPBOX "Format &options", 4610, 7, 121, 170, 49 - AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 - AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 + GROUPBOX "&Options de formatage", 4610, 7, 121, 170, 49 + AUTOCHECKBOX "Formatage rapide", 28674, 16, 135, 155, 10 + AUTOCHECKBOX "Activer la compression", 28675, 16, 152, 155, 10 END STRINGTABLE DISCARDABLE @@ -631,7 +631,7 @@ IDS_COMMON_VIDEO "Documents\\Mes vidéos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Nouveau dossier" IDS_DRIVE_FIXED "Disque local" IDS_DRIVE_CDROM "CDROM" @@ -642,8 +642,8 @@ IDS_SHELL_ABOUT_AUTHORS "&Auteurs" IDS_SHELL_ABOUT_BACK "< Précédent" - FCIDM_SHVIEW_NEW "Nouveau" - FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" - FCIDM_SHVIEW_NEWLINK "Nouveau &lien" - IDS_FOLDER_OPTIONS "Folder Options" -END + FCIDM_SHVIEW_NEW "Nouveau" + FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" + FCIDM_SHVIEW_NEWLINK "Nouveau &lien" + IDS_FOLDER_OPTIONS "Options du dossier" +END Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Sun Dec 16 12:53:56 2007 @@ -76,16 +76,16 @@ "Si vous êtes sur un réseau, le nom saisi doit être unique.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Nom de l'ordinateur :", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE LTEXT "L'assistant va créer un compte utilisateur sur votre ordinateur appelé Administrateur. "\ "Vous pourrez utiliser ce compte pour avoir un accès complet à votre ordinateur.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Entrez le mot de passe Administrateur (14 caractères ou moins).", IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Mot de passe :", IDC_STATIC, 54, 104, 75, 8 - EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "Confirmation :", IDC_STATIC, 54, 123, 75, 8 - EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "&Mot de passe :", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "Confirmation :", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -100,13 +100,13 @@ LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pour changer la localisation système, cliquez sur Modifier.", IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "&Modifier...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + PUSHBUTTON "&Modifier...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 LTEXT "La configuration clavier contrôle la saisie des touches quand vous tapez.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Pour changer la configuration clavier, cliquez sur Modifier.", IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "M&odifier...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 + PUSHBUTTON "M&odifier...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 END @@ -115,12 +115,12 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Date et Heure", IDC_STATIC, 53, 7, 253, 8 + LTEXT "Date et Heure :", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "Fuseau horaire", IDC_STATIC, 53, 42, 253, 8 + LTEXT "Fuseau horaire :", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Ajuster automatiquement l'horloge pour l'heure &d'été",

1 0

[tkreuzer] 31271: fix export definition
by tkreuzer＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: tkreuzer Date: Sun Dec 16 05:45:59 2007 New Revision: 31271 URL: http://svn.reactos.org/svn/reactos?rev=31271&view=rev Log: fix export definition Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def Sun Dec 16 05:45:59 2007 @@ -668,7 +668,7 @@ NtGdiUpdateTransform@4 NtGdiSetPUMPDOBJ@16 NtGdiBRUSHOBJ_DeleteRbrush@8 -NtGdiUnmapMemFont@4 +NtGdiUMPDEngFreeUserMem@4 NtGdiDrawStream@12 UMPDDrvQuerySpoolType@8 DefaultHTCallBack@4

1 0

[tkreuzer] 31270: w32kdll for windows 2003 SP2
by tkreuzer＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: tkreuzer Date: Sun Dec 16 05:32:20 2007 New Revision: 31270 URL: http://svn.reactos.org/svn/reactos?rev=31270&view=rev Log: w32kdll for windows 2003 SP2 Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c (with props) trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S (with props) trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def (with props) trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild (with props) Modified: trunk/rostests/apitests/w32kdll/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/w32kdll/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/director… Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…

1 0

[greatlrd] 31269: do not try add DDSD_LPSURFACE when it is already been set
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 03:56:43 2007 New Revision: 31269 URL: http://svn.reactos.org/svn/reactos?rev=31269&view=rev Log: do not try add DDSD_LPSURFACE when it is already been set Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 03:56:43 2007 @@ -81,7 +81,8 @@ * if they forget set it, the ddraw will autoamtic * set it for system memory. */ - if ((pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) == DDSCAPS_SYSTEMMEMORY) + if ( ((pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) == DDSCAPS_SYSTEMMEMORY) && + ((pDDSD->dwFlags & DDSD_LPSURFACE) != DDSD_LPSURFACE) ) { pDDSD->dwFlags = pDDSD->dwFlags | DDSD_LPSURFACE; }

1 0

[greatlrd] 31268: fix a typo
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 03:46:43 2007 New Revision: 31268 URL: http://svn.reactos.org/svn/reactos?rev=31268&view=rev Log: fix a typo Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 03:46:43 2007 @@ -81,7 +81,7 @@ * if they forget set it, the ddraw will autoamtic * set it for system memory. */ - if ((pDDSD->dwFlags & DDSCAPS_SYSTEMMEMORY) != DDSCAPS_SYSTEMMEMORY) + if ((pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) == DDSCAPS_SYSTEMMEMORY) { pDDSD->dwFlags = pDDSD->dwFlags | DDSD_LPSURFACE; }

1 0

[greatlrd] 31267: fix a bug in createsurface DDSD_LPSURFACE should only be automatic set if we have a system memory surface.
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 03:43:22 2007 New Revision: 31267 URL: http://svn.reactos.org/svn/reactos?rev=31267&view=rev Log: fix a bug in createsurface DDSD_LPSURFACE should only be automatic set if we have a system memory surface. Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 03:43:22 2007 @@ -78,10 +78,10 @@ /* * program does not need set the DDSD_LPSURFACE, - * if they forget set it, the ddraw will autoamtic set it. - * + * if they forget set it, the ddraw will autoamtic + * set it for system memory. */ - if ((pDDSD->dwFlags & DDSD_LPSURFACE) != DDSD_LPSURFACE) + if ((pDDSD->dwFlags & DDSCAPS_SYSTEMMEMORY) != DDSCAPS_SYSTEMMEMORY) { pDDSD->dwFlags = pDDSD->dwFlags | DDSD_LPSURFACE; }

1 0

[greatlrd] 31266: fix another bug in createsurface a program does not need set the flag DDSD_LPSURFACE, if they forget ddraw will automatic set it.
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 03:38:22 2007 New Revision: 31266 URL: http://svn.reactos.org/svn/reactos?rev=31266&view=rev Log: fix another bug in createsurface a program does not need set the flag DDSD_LPSURFACE, if they forget ddraw will automatic set it. Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 03:38:22 2007 @@ -76,6 +76,16 @@ return DDERR_INVALIDPARAMS; } + /* + * program does not need set the DDSD_LPSURFACE, + * if they forget set it, the ddraw will autoamtic set it. + * + */ + if ((pDDSD->dwFlags & DDSD_LPSURFACE) != DDSD_LPSURFACE) + { + pDDSD->dwFlags = pDDSD->dwFlags | DDSD_LPSURFACE; + } + /* FIXME count our how many surface we need */ DxHeapMemAlloc(slist_int, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_INT ) );

1 0

[greatlrd] 31265: fix a check in createsurface do not accpect if both flag DDSCAPS_SYSTEMMEMORY and DDSCAPS_VIDEOMEMORY are set in pDDSD->ddsCaps
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 03:28:35 2007 New Revision: 31265 URL: http://svn.reactos.org/svn/reactos?rev=31265&view=rev Log: fix a check in createsurface do not accpect if both flag DDSCAPS_SYSTEMMEMORY and DDSCAPS_VIDEOMEMORY are set in pDDSD->ddsCaps Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 03:28:35 2007 @@ -58,6 +58,12 @@ return DDERR_INVALIDOBJECT; } + if ( ((pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) == DDSCAPS_SYSTEMMEMORY) && + ((pDDSD->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) == DDSCAPS_VIDEOMEMORY) ) + { + return DDERR_INVALIDCAPS; + } + if(!(pDDSD->dwFlags & DDSD_HEIGHT) && !(pDDSD->dwFlags & DDSD_HEIGHT) && !(pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) {

1 0

[frik85] 31264: ReactOS paste service * improved data-i/o code * new features like word-wrap * bug fixes URI: http://www.reactos.org/paste/
by frik85＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: frik85 Date: Sun Dec 16 02:04:19 2007 New Revision: 31264 URL: http://svn.reactos.org/svn/reactos?rev=31264&view=rev Log: ReactOS paste service * improved data-i/o code * new features like word-wrap * bug fixes URI: http://www.reactos.org/paste/ Modified: trunk/web/reactos.org/htdocs/paste/inc/account.php trunk/web/reactos.org/htdocs/paste/inc/header.php trunk/web/reactos.org/htdocs/paste/inc/help.php trunk/web/reactos.org/htdocs/paste/inc/highlight.php trunk/web/reactos.org/htdocs/paste/inc/paste.php trunk/web/reactos.org/htdocs/paste/inc/recent.php trunk/web/reactos.org/htdocs/paste/index.php Modified: trunk/web/reactos.org/htdocs/paste/inc/account.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/a… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/account.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/account.php Sun Dec 16 02:04:19 2007 @@ -24,7 +24,7 @@ require_once("/web/reactos.org/htdocs/roscms/inc/subsys_login.php"); $RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . $RSDB_intern_path); */ - $RSDB_intern_user_id=0; + $RSDB_intern_user_id=2; $RSDB_USER_name="Anonymous"; if($RSDB_intern_user_id != 0) { @@ -40,5 +40,6 @@ else { $RSDB_USER_name = "Anonymous"; } + //echo "<h1>!!!".$RSDB_USER_name."</h1>"; ?> Modified: trunk/web/reactos.org/htdocs/paste/inc/header.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/h… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/header.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/header.php Sun Dec 16 02:04:19 2007 @@ -18,6 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +function create_header() { + +global $ros_paste_SET_path; +global $ros_paste_SET_path_ex; ?> @@ -101,9 +106,30 @@ </ol> </div> <p></p> - + + +<script type="text/javascript"></script> +<script type="text/javascript" + src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> +</script> + </td>  <td id="content"> +<?php + } +?> Modified: trunk/web/reactos.org/htdocs/paste/inc/help.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/h… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/help.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/help.php Sun Dec 16 02:04:19 2007 @@ -28,5 +28,5 @@ <h2>What's different about this one? </h2> <p> A lot of paste sites have appeared lately, and many of them are quite similar. The ReactOS "Copy&Paste" paste service provide a unique list of features and a broad range of code highlight support. It uses <a href="http://rafb.net/paste/highlight.phps" target="_blank">rafb.net's code highlight php library</a> which is free available under BSD license. </p> <h2>How long is the paste accessable? </h2> -<p> The paste is accessable for 7 days. </p> +<p> The paste is accessable for 7 days (default setting). The timeframe can be set between 1 to 7 days as per paste setting. </p> <p></p> Modified: trunk/web/reactos.org/htdocs/paste/inc/highlight.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/h… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/highlight.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/highlight.php Sun Dec 16 02:04:19 2007 @@ -496,7 +496,60 @@ "varchar", "variable", "varying", "verbose", "version", "view", "volatile", "when", "whenever", "where", "with", "without", - "work", "write", "year", "zone") + "work", "write", "year", "zone"), + + + "Bash" => array( + "alias", "break", "case", "continue", + "do", "done", "elif", "else", + "esac", "exit", "export", "fi", + "for", "if", "in", "return", + "set", "then", "unalias", "unset", + "while", "halt", "ifconfig", "lsmod", + "modprobe", "reboot", "rmmod", "route", + "shutdown", "traceroute", "awk", "basename", + "cat", "cp", "echo", "egrep", + "fgrep", "gawk", "grep", "gzip", + "kill", "killall", "less", "md", + "mkdir", "mv", "nice", "pidof", + "ps", "rd", "read", "rm", + "rmdir", "sed", "sleep", "test", + "touch", "ulimit", "uname", "usleep", + "zcat", "zless" + ), + + "Batch" => array( + "do", "else", "end", "errorlevel", + "exist", "exit", "for", "goto", + "if", "not", "pause", "return", + "say", "select", "then", "when", + "ansi", "append", "assign", "attrib", + "autofail", "backup", "basedev", "boot", + "break", "buffers", "cache", "call", + "cd", "chcp", "chdir", "chkdsk", + "choice", "cls", "cmd", "codepage", + "command", "comp", "copy", "country", + "date", "ddinstal", "debug", "del", + "detach", "device", "devicehigh", "devinfo", + "dir", "diskcoache", "diskcomp", "diskcopy", + "doskey", "dpath", "dumpprocess", "eautil", + "endlocal", "erase", "exit_vdm", "extproc", + "fcbs", "fdisk", "fdiskpm", "files", + "find", "format", "fsaccess", "fsfilter", + "graftabl", "iopl", "join", "keyb", "keys", + "label", "lastdrive", "libpath", "lh", "loadhigh", + "makeini", "maxwait", "md", "mem", "memman", "mkdir", "mode", "move", + "net", "patch", "path", "pauseonerror", "picview", "pmrexx", "print", + "printmonbufsize", "priority", "priority_disk_io", "prompt", "protectonly", + "protshell", "pstat", "rd", "recover", "reipl", "ren", "rename", "replace", + "restore", "rmdir", "rmsize", "run", "set", "setboot", "setlocal", "shell", + "shift", "sort", "spool", "start", "subst", "suppresspopups", "swappath", + "syslevel", "syslog", "threads", "time", "timeslice", "trace", "tracebuf", + "tracefmt", "trapdump", "tree", "type", "undelete", "unpack", "use", + "ver", "verify", "view", "vmdisk", "vol", + "xcopy", "xcopy32", "xdfcopy", + "echo", "off", "on" + ) ); @@ -751,7 +804,7 @@ $mirc[line_comment]["\n"] = normal_text; $mirc[line_comment][0] = line_comment; - + $ruby = $perl; $python = $perl; @@ -850,6 +903,9 @@ $xml[dq_escape][";"] = dq_literal; $xml[dq_escape][0] = dq_escape; + $bash = $perl; + $batch = $c89;; + // // Main state transition table // @@ -869,7 +925,9 @@ "PL/I" => $pli, "SQL" => $sql, "XML" => $xml, - "Scheme" => $sch + "Scheme" => $sch, + "Bash" => $bash, + "Batch" => $batch ); @@ -949,6 +1007,10 @@ $process["XML"][xml_tag][dq_literal] = "rtrim1"; $process["XML"][dq_literal][xml_tag] = "rtrim1"; $process["XML"][dq_literal][dq_escape] = "rtrim1"; + + $process["Bash"] = $process["Perl"]; + $process["Batch"] = $process["C++"]; + $process_end["C89"] = "syntax_highlight_helper"; $process_end["C++"] = $process_end["C89"]; @@ -965,7 +1027,8 @@ $process_end["PL/I"] = $process_end["C89"]; $process_end["SQL"] = $process_end["C89"]; $process_end["Scheme"] = "sch_syntax_helper"; - + $process_end["Bash"] = $process_end["C89"]; + $process_end["Batch"] = $process_end["C89"]; $edges["C89"][normal_text .",". dq_literal] = '<span class="literal">"'; $edges["C89"][normal_text .",". sq_literal] = '<span class="literal">\''; @@ -1049,6 +1112,10 @@ $edges["XML"][sq_literal . "," . xml_tag] = '\'</span>'; $edges["XML"][sq_literal . "," . sq_escape] = '<span class="html_entity">&'; $edges["XML"][sq_escape . "," . sq_literal] = '</span>'; + + $edges["Bash"] = $edges["Perl"]; + $edges["Batch"] = $edges["C89"]; + // // The State Machine Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/p… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/paste.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/paste.php Sun Dec 16 02:04:19 2007 @@ -29,94 +29,109 @@ } if ($ros_paste_SET_pasteid) { + create_header(); + $query_pasteid=mysql_query("SELECT * FROM `paste_service` - WHERE `paste_id` = '".mysql_real_escape_string($ros_paste_SET_pasteid)."' + WHERE `paste_id` = '".mysql_real_escape_string($ros_paste_SET_pasteid)."' LIMIT 1 ;"); $result_pasteid = mysql_fetch_array($query_pasteid); - echo '<link href="highlight.css" type="text/css" rel="stylesheet" />'; - echo "<h1><a style=\"color:#FFFFFF ! important ;\" href=\"http://www.reactos.org/\">Home</a> > <a style=\"color:#FFFFFF ! important ;\" href=\"".$ros_paste_SET_path."\">Paste Service</a> > ".$ros_paste_SET_pasteid."</h1>"; - echo "<h2>"; - if ($result_pasteid['paste_desc']) { - echo $result_pasteid['paste_desc']; + if ($result_pasteid['paste_lines'] == "" || $result_pasteid['paste_lines'] <= 0 || compareDate((date('Y')."-".date('m')."-".date('d')),stripDate($result_pasteid['paste_datetime'])) > 7) { + echo "<p><b>No related paste exists.</b></p>"; + } else if (compareDate((date('Y')."-".date('m')."-".date('d')),stripDate($result_pasteid['paste_datetime'])) <= $result_pasteid['paste_days']) { + + echo '<link href="highlight.css" type="text/css" rel="stylesheet" />'; + echo "<h1><a style=\"color:#FFFFFF ! important ;\" href=\"http://www.reactos.org/\">Home</a> > <a style=\"color:#FFFFFF ! important ;\" href=\"".$ros_paste_SET_path."\">Paste Service</a> > ".$ros_paste_SET_pasteid."</h1>"; + echo "<h2>"; + if ($result_pasteid['paste_desc']) { + echo $result_pasteid['paste_desc']; + } + else { + echo "Paste #".$result_pasteid['paste_id']; + } + echo "</h2>"; + + ?> + + <p>Pasted by: <b><?php echo $result_pasteid['paste_nick']; ?></b><br /> + Language: <b><?php echo $result_pasteid['paste_lang']; ?></b><br /> + Description: <b><?php echo $result_pasteid['paste_desc']; ?></b><br /> + Pasted on: <b><?php echo $result_pasteid['paste_date']; ?></b><br /> + Expire after: <b><?php echo $result_pasteid['paste_days']; ?> days </b><br /> + Paste history: <b><?php + + if ($result_pasteid['paste_public'] == "1") { + echo "yes (public)"; } else { - echo $result_pasteid['paste_id']; - } - echo "</h2>"; - -?> - -<p>Pasted by: <b><?php echo $result_pasteid['paste_nick']; ?></b><br /> -Language: <b><?php echo $result_pasteid['paste_lang']; ?></b><br /> -Description: <b><?php echo $result_pasteid['paste_desc']; ?></b><br /> -Pasted on: <b><?php echo $result_pasteid['paste_date']; ?></b><br /> -Expire after: <b><?php echo $result_pasteid['paste_days']; ?> days </b><br /> -Paste history: <b><?php - - if ($result_pasteid['paste_public'] == "1") { - echo "yes (public)"; - } - else { - echo "no (private)"; - } - -?></b></p> -<p><?php - - if (@$ros_paste_SET_pasteflag == "nln") { - echo '<a href="'. $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/">Add line numbers</a>'; - } - else { - echo '<a href="'. $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/nln/">Remove line numbers</a>'; - } -?> | - <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/text/'; ?>" target="_blank">Download as Text</a> | - <a href="<?php echo $ros_paste_SET_path_ex . 'recent/'; ?>">Other recent pastes</a> | - <a href="<?php echo $ros_paste_SET_path; ?>">Create new paste</a> </p> -<?php - - - $ros_paste_SET_textcontent = htmlspecialchars($result_pasteid['paste_content']); - if ($result_pasteid['paste_tabs'] != "0") { - $PASTE_var_tabs = ""; - for($xxx=0; $xxx<$result_pasteid['paste_tabs']; $xxx++){ - $PASTE_var_tabs .= " "; - } - $ros_paste_SET_textcontent = str_replace("\t",$PASTE_var_tabs,$ros_paste_SET_textcontent); - } - - - - // Content: - $ros_paste_SET_textcontent = syntax_highlight($ros_paste_SET_textcontent, $result_pasteid['paste_lang']); - - - + echo "no (private)"; + } + + ?></b></p> + <p><?php + if (@$ros_paste_SET_pasteflag == "nln") { - echo '<pre class="code" style="margin: 6px;">'; - echo $ros_paste_SET_textcontent; - echo '</pre>'; + echo '<a href="'. $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/">Add line numbers</a>'; } else { -?> - <table cellspacing="5" cellpadding="1" border="0"> - <tbody> - <tr> - - <td align="right" valign="top"><pre class="code"><?php + echo '<a href="'. $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/nln/">Remove line numbers</a>'; + } + ?> | + <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/text/'; ?>" target="_blank">Download as Text</a> + <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/textw/'; ?>" target="_blank">(word-warp)</a> | + <a href="<?php echo $ros_paste_SET_path_ex . 'recent/'; ?>">Other recent pastes</a> | + <a href="<?php echo $ros_paste_SET_path; ?>">Create new paste</a> </p> + <?php + + + $filename = $ros_paste_SET_content."/".$result_pasteid['paste_id'].".txt"; + $handle = @fopen($filename, "r"); + $contents = @fread($handle, @filesize($filename)); + @fclose($handle); - for ($PASTE_linecount=1; $PASTE_linecount <= $result_pasteid['paste_lines']; $PASTE_linecount++) { - echo $PASTE_linecount."\n"; + if ($contents == "") { + die("<b>paste expired</b>"); + } + + $ros_paste_SET_textcontent = htmlspecialchars($contents); + if ($result_pasteid['paste_tabs'] != "0") { + $PASTE_var_tabs = ""; + for($xxx=0; $xxx<$result_pasteid['paste_tabs']; $xxx++){ + $PASTE_var_tabs .= " "; } + $ros_paste_SET_textcontent = str_replace("\t",$PASTE_var_tabs,$ros_paste_SET_textcontent); + } - ?></pre> - </td> - <td width="100%" valign="top"><pre class="code"><?php echo $ros_paste_SET_textcontent; ?></pre></td></tr></tbody></table> + + // Content: + $ros_paste_SET_textcontent = syntax_highlight($ros_paste_SET_textcontent, $result_pasteid['paste_lang']); + + + + if (@$ros_paste_SET_pasteflag == "nln") { + echo '<pre class="code" style="margin: 6px;">'; + echo $ros_paste_SET_textcontent; + echo '</pre>'; + } + else { + ?> + <table cellspacing="5" cellpadding="1" border="0"> + <tbody> + <tr> + + <td align="right" valign="top"><pre class="code"><?php + + for ($PASTE_linecount=1; $PASTE_linecount <= $result_pasteid['paste_lines']; $PASTE_linecount++) { + echo $PASTE_linecount."\n"; + } + + ?></pre> + </td> + <td width="100%" valign="top"><pre class="code"><?php echo $ros_paste_SET_textcontent; ?></pre></td></tr></tbody></table> <?php - } - + } + } } else { if ($ros_paste_SET_cnp == "1") { @@ -124,7 +139,8 @@ $ros_paste_SET_lang = ""; $ros_paste_SET_usrname = ""; $ros_paste_SET_nick = ""; - $ros_paste_SET_husrname = ""; + //$ros_paste_SET_husrname = ""; + //$ros_paste_SET_husrid = ""; $ros_paste_SET_desc = ""; $ros_paste_SET_cvt_tabs = ""; $ros_paste_SET_optday = ""; @@ -132,10 +148,12 @@ $ros_paste_SET_textcontent = ""; $ros_paste_SET_public = ""; + if (array_key_exists("lang", $_POST)) $ros_paste_SET_lang=htmlspecialchars($_POST["lang"]); if (array_key_exists("usrname", $_POST)) $ros_paste_SET_usrname=htmlspecialchars($_POST["usrname"]); if (array_key_exists("nick", $_POST)) $ros_paste_SET_nick=htmlspecialchars($_POST["nick"]); - if (array_key_exists("husrname", $_POST)) $ros_paste_SET_husrname=htmlspecialchars($_POST["husrname"]); + //if (array_key_exists("husrname", $_POST)) $ros_paste_SET_husrname=htmlspecialchars($_POST["husrname"]); + //if (array_key_exists("husrid", $_POST)) $ros_paste_SET_husrid=htmlspecialchars($_POST["husrid"]); if (array_key_exists("desc", $_POST)) $ros_paste_SET_desc=htmlspecialchars($_POST["desc"]); if (array_key_exists("cvt_tabs", $_POST)) $ros_paste_SET_cvt_tabs=htmlspecialchars($_POST["cvt_tabs"]); if (array_key_exists("optday", $_POST)) $ros_paste_SET_optday=htmlspecialchars($_POST["optday"]); @@ -144,11 +162,14 @@ if (array_key_exists("optpub", $_POST)) $ros_paste_SET_public=htmlspecialchars($_POST["optpub"]); // Nick: + $ros_paste_SET_husrname = $RSDB_USER_name; + $ros_paste_SET_husrid = $RSDB_intern_user_id; + if ($ros_paste_SET_usrname == "1") { $PASTE_var_nick = $ros_paste_SET_nick; } elseif ($ros_paste_SET_usrname == "2") { - if ($PASTE_var_nick == "") { + if ($ros_paste_SET_husrname == "") { $PASTE_var_nick = "Anonymous"; } else { @@ -174,7 +195,7 @@ $PASTE_var_public = $ros_paste_SET_public; - // Paste ID: + /*// Paste ID: $tmp_id_check = true; while($tmp_id_check) { mt_srand((double)microtime()*1000000); @@ -189,7 +210,7 @@ if ($result_pasteid[0] <= 0) { $tmp_id_check = false; } - } + }*/ /*if ($ros_paste_SET_cvt_tabs != "0") { $PASTE_var_tabs = ""; @@ -210,15 +231,74 @@ $PASTE_var_lines = sizeof(explode("\n", $PASTE_var_content)); $PASTE_var_lang = $ros_paste_SET_lang; + + $ip = @$_SERVER["HTTP_X_FORWARDED_FOR"]; + $proxy = $_SERVER["REMOTE_ADDR"]; + $host = @gethostbyaddr($_SERVER["HTTP_X_FORWARDED_FOR"]); + + if ($ip == "") { + $ip = $proxy; + } + + //echo "<p>$ip<br />$proxy<br />$host</p>"; + // SQL Statement: - $paste_sql="INSERT INTO `paste_service` ( `paste_id` , `paste_date` , `paste_days` , `paste_nick` , `paste_desc` , `paste_content` , `paste_lines` , `paste_tabs`, `paste_public` , `paste_lang` , `paste_datetime` ) - VALUES ( '".mysql_real_escape_string($PASTE_var_pasteid)."' , CURDATE( ) , '".mysql_real_escape_string($PASTE_var_days)."', '".mysql_real_escape_string($PASTE_var_nick)."', '".mysql_real_escape_string($PASTE_var_desc)."', '".mysql_real_escape_string($PASTE_var_content)."', '".mysql_real_escape_string($PASTE_var_lines)."', '".mysql_real_escape_string($PASTE_var_tabs)."', '".mysql_real_escape_string($PASTE_var_public)."', '".mysql_real_escape_string($PASTE_var_lang)."', NOW( ) );"; + $tmp_insert_date = date("Y-m-d H:i:s"); + $paste_sql="INSERT INTO `paste_service` ( `paste_date` , `paste_days` , `paste_usrid` , `paste_nick` , `paste_desc` , `paste_lines` , `paste_tabs`, `paste_public` , `paste_lang` , `paste_datetime` , `paste_ip` , `paste_proxy` , `paste_host` ) + VALUES ( CURDATE( ) , '".mysql_real_escape_string($PASTE_var_days)."', '".mysql_real_escape_string($ros_paste_SET_husrid)."', '".mysql_real_escape_string($PASTE_var_nick)."', '".mysql_real_escape_string($PASTE_var_desc)."', '".mysql_real_escape_string($PASTE_var_lines)."', '".mysql_real_escape_string($PASTE_var_tabs)."', '".mysql_real_escape_string($PASTE_var_public)."', '".mysql_real_escape_string($PASTE_var_lang)."', '".$tmp_insert_date."', '".mysql_real_escape_string($ip)."', '".mysql_real_escape_string($proxy)."', '".mysql_real_escape_string($host)."' );"; $paste_query=mysql_query($paste_sql); + + $sql_inserted_entry = "SELECT paste_id + FROM paste_service + WHERE paste_datetime = '".$tmp_insert_date."' + LIMIT 1;"; + $query_inserted_entry = mysql_query($sql_inserted_entry); + $result_inserted_entry = mysql_fetch_array($query_inserted_entry); + + //echo $sql_inserted_entry; + //echo $result_inserted_entry['paste_id']; + + if (!@is_dir($ros_paste_SET_content)) { + @mkdir($ros_paste_SET_content,"0493"); + } + + if ($result_inserted_entry['paste_id'] == "") { + die(""); + } + + $filename = $ros_paste_SET_content."/".$result_inserted_entry['paste_id'].".txt"; + + // Let's make sure the file exists and is writable first. + if (!@is_writable($filename)) { + + // In our example we're opening $filename in append mode. + // The file pointer is at the bottom of the file hence + // that's where $somecontent will go when we fwrite() it. + if (!$handle = @fopen($filename, 'a')) { + die("error: open file problem"); + } + + // Write $somecontent to our opened file. + if (@fwrite($handle, $PASTE_var_content) === FALSE) { + die("error: file write problem"); + } + + //echo "Success, wrote to file ($filename)"; + + @fclose($handle); + + } + + $update_entry = mysql_query("UPDATE `paste_service` SET `paste_size` = '".mysql_real_escape_string(@filesize($filename))."' WHERE `paste_service`.`paste_id` = ".$result_inserted_entry['paste_id']." LIMIT 1 ;"); + + // Redirect to paste result page: - header("Location: ". $ros_paste_SET_path_ex . $PASTE_var_pasteid. "/"); + header("Location: ". $ros_paste_SET_path_ex . $result_inserted_entry['paste_id']. "/"); } else { + create_header(); + ?> <h1><a href="http://www.reactos.org/">Home</a> > Paste Service</h1> <h2>Copy & Paste - paste service</h2> @@ -229,6 +309,8 @@ <td valign="top" bgcolor="#E2E2E2" style="padding-left: 0px; padding-right: 5px;"><b><font size="2" face="Verdana, Arial, Helvetica, sans-serif">Language:</font></b></td> <td bgcolor="#E2E2E2"><select name="lang" id="lang"> <option value="Plain Text">Plain Text</option> + <option value="Bash">Bash *</option> + <option value="Batch">Batch *</option> <option value="C89">C (C89)</option> <option value="C" selected="selected">C (C99)</option> <option value="C++">C++</option> @@ -240,19 +322,18 @@ <option value="PL/I">PL/I</option> <option value="Python">Python</option> <option value="Ruby">Ruby</option> - <option value="Scheme">Scheme (beta)</option> + <option value="Scheme">Scheme *</option> <option value="SQL">SQL</option> <option value="VB">Visual Basic</option> - <option value="XML">XML (beta)</option> - </select></td> + <option value="XML">XML *</option> + </select> +    <font size="1">(* experimental syntax highlighting)</font></td> </tr> <tr> <td valign="top" bgcolor="#EEEEEE" style="padding-left: 0px; padding-right: 5px;"><b><font size="2" face="Verdana, Arial, Helvetica, sans-serif">Nickname:</font></b></td> <td bgcolor="#EEEEEE"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"> <input name="usrname" type="radio" id="usrname" value="2" checked="checked" /> - <?php echo $RSDB_USER_name; ?> - <input name="husrname" type="hidden" id="husrname" value="<?php echo $RSDB_USER_name; ?>" /> - <br /> + <?php echo $RSDB_USER_name; ?><br /> <input name="usrname" type="radio" id="usrname" value="1" /> <input type="text" size="14" maxlength="9" name="nick" id="nick" value=""/> </font></td> Modified: trunk/web/reactos.org/htdocs/paste/inc/recent.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/r… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/recent.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/recent.php Sun Dec 16 02:04:19 2007 @@ -23,13 +23,15 @@ ?> <h1>Recent Pastes</h1> <h2>Recent Pastes</h2> -<p>Pastes expire by default after 7 days, if desired even earlier. </p> +<p>Pastes expire by default after 7 days, if desired even earlier. This page lists the 50 most recent pastes. </p> <table width="100%" border="0" cellpadding="1" cellspacing="1"> <tr bgcolor="#5984C3"> - <td width="25%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Date</strong></font></div></td> - <td width="10%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Language</strong></font></div></td> - <td width="25%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Nick</strong></font></div></td> - <td width="40%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> + <td width="20%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Date</strong></font></div></td> + <td width="35%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> + <td width="20%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Nick</strong></font></div></td> + <td width="10%"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Language</strong></font></div></td> + <td width="5%"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Lines</strong></font></div></td> + <td width="10%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Size</strong></font></div></td> </tr> <?php @@ -41,8 +43,9 @@ FROM `paste_service` WHERE `paste_days` <=7 AND `paste_public` = 1 + AND paste_size < 100000 ORDER BY `paste_datetime` DESC - LIMIT 0 , 30 ;") ; + LIMIT 0 , 50 ;"); while($result_content = mysql_fetch_array($query_content)) { //echo "<p>".stripDate($result_content['paste_datetime'])."</p>"; @@ -65,12 +68,8 @@ echo $farbe2; $farbe = $farbe2; } - ?>"><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><?php echo $result_content['paste_datetime']; ?></font></div></td> - <td valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><?php echo $result_content['paste_lang']; ?></font></div></td> - <td valign="middle" bgcolor="<?php echo $farbe; ?>"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"> - <div align="left"><?php echo $result_content['paste_nick']; ?> - </div></td> - <td valign="middle" bgcolor="<?php echo $farbe; ?>" ><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><a href="<?php echo $ros_paste_SET_path_ex . $result_content['paste_id']."/"; ?>"> + ?>"><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><a href="<?php echo $ros_paste_SET_path_ex . $result_content['paste_id']."/"; ?>"><?php echo substr($result_content['paste_datetime'],0,strlen($result_content['paste_datetime'])-3); ?></a></font></div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>" ><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"> <?php if ($result_content['paste_desc']) { @@ -81,7 +80,11 @@ } ?> - </a></font></div></td> + </font></div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><div align="left"><?php echo $result_content['paste_nick']; ?> </div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><?php echo $result_content['paste_lang']; ?></font></div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="right"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><?php echo $result_content['paste_lines']; ?></font></div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="right"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><?php echo $result_content['paste_size']; ?> byte</font></div></td> </tr> <?php } Modified: trunk/web/reactos.org/htdocs/paste/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/index… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/index.php (original) +++ trunk/web/reactos.org/htdocs/paste/index.php Sun Dec 16 02:04:19 2007 @@ -30,6 +30,7 @@ $ros_paste_SET_path = "http://localhost/reactos.org/paste/"; $ros_paste_SET_path_ex = "http://localhost/reactos.org/paste/index.php/"; $ros_paste_SET_dirs = "reactos.org/paste/"; + $ros_paste_SET_content = "content"; @@ -82,10 +83,12 @@ } } + include("inc/tools.php"); + switch ($ros_paste_SET_page) { default: case "paste": // Paste Your Content - if (@$ros_paste_SET_pasteflag == "text") { + if (@$ros_paste_SET_pasteflag == "text" || @$ros_paste_SET_pasteflag == "textw") { include("inc/account.php"); $query_pasteid=mysql_query("SELECT * FROM `paste_service` @@ -94,8 +97,12 @@ $result_pasteid = mysql_fetch_array($query_pasteid); header('Content-type: text/plain'); - //echo "ReactOS Paste Service - http://www.reactos.org/paste/".$result_pasteid['paste_id']."/ \n\n"; - $ros_paste_SET_textcontent = $result_pasteid['paste_content']; + //echo " \n\n"; + $filename = $ros_paste_SET_content."/".$result_pasteid['paste_id'].".txt"; + $handle = @fopen($filename, "r"); + $contents = @fread($handle, @filesize($filename)); + @fclose($handle); + $ros_paste_SET_textcontent = $contents; //$ros_paste_SET_textcontent = str_replace(" "," ",$ros_paste_SET_textcontent); if ($result_pasteid['paste_tabs'] != "0") { $PASTE_var_tabs = ""; @@ -104,7 +111,11 @@ } $ros_paste_SET_textcontent = str_replace("\t",$PASTE_var_tabs,$ros_paste_SET_textcontent); } - echo $ros_paste_SET_textcontent; + if (@$ros_paste_SET_pasteflag == "textw") { + echo wordwrap($ros_paste_SET_textcontent, 80, "\n", true); + } else { + echo $ros_paste_SET_textcontent; + } } else { include("inc/header.php"); @@ -116,18 +127,20 @@ break; case "conditions": // Conditions include("inc/header.php"); + create_header(); include("inc/conditions.php"); include("inc/footer.php"); break; case "help": // Help & FAQ include("inc/header.php"); + create_header(); include("inc/help.php"); include("inc/footer.php"); break; case "recent": // Recent Pastes include("inc/header.php"); + create_header(); include("inc/account.php"); - include("inc/tools.php"); include("inc/recent.php"); include("inc/footer.php"); break;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs