wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Michael Müller : msvfw32: Use case insensitive compare in ICInfo for fourcc codes.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 02fa1d4cc2f99909d62565e1760bc0158e36d700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02fa1d4cc2f99909d62565e17… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Nov 22 03:52:55 2016 -0200 msvfw32: Use case insensitive compare in ICInfo for fourcc codes. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 5 ++--- dlls/msvfw32/tests/msvfw.c | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 8ed6917..cc5c85d 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -299,9 +299,8 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) ICINFO *lpicinfo = param; DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); - /* exact match of fccHandler or nth driver found */ - if ((lpicinfo->fccHandler != nr) && (lpicinfo->fccHandler != fccHandler)) - return FALSE; + if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) + return FALSE; lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index d621da2..3fe6702 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -306,14 +306,12 @@ static void test_ICInfo(void) if (fcc[0] & 0x20) { fcc[0] &= ~0x20; -todo_wine ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); } else { fcc[0] |= 0x20; -todo_wine ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); }

1 0

Bruno Jesus : msvfw32: Allow ICInfo to enumerate codecs when fccType is zero.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: ca2420c0ea4e7cc56520e07fd4c1e18e46de503e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2420c0ea4e7cc56520e07fd… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 03:52:54 2016 -0200 msvfw32: Allow ICInfo to enumerate codecs when fccType is zero. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 4 ++-- dlls/msvfw32/tests/msvfw.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 0ae33ed..8ed6917 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -248,7 +248,7 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name), &data); if (lRet == ERROR_NO_MORE_ITEMS) break; if (lRet != ERROR_SUCCESS) continue; - if (name != 9 || strncasecmp(buf, fccTypeStr, 5)) continue; + if (fccType && (name != 9 || strncasecmp(buf, fccTypeStr, 5))) continue; buf[name] = '='; if ((result = handler(buf, cnt++, param))) break; } @@ -262,7 +262,7 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) for (s = buf; *s; s += strlen(s) + 1) { TRACE("got %s\n", s); - if (strncasecmp(s, fccTypeStr, 5) || s[9] != '=') continue; + if (fccType && (strncasecmp(s, fccTypeStr, 5) || s[9] != '=')) continue; if ((result = handler(s, cnt++, param))) break; } } diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 507d003..d621da2 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -318,7 +318,6 @@ todo_wine "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); } } -todo_wine ok(found != 0, "expected at least one codec\n"); }

1 0

Bruno Jesus : msvfw32/tests: Add tests for ICInfo().
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 90e4ad3b144b44805e21b8549129c29e75b797e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e4ad3b144b44805e21b8549… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 03:52:53 2016 -0200 msvfw32/tests: Add tests for ICInfo(). Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 125cac5..507d003 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -285,9 +285,47 @@ static void test_ICSeqCompress(void) ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); } +static void test_ICInfo(void) +{ + ICINFO info, info2; + DWORD i, found; + unsigned char *fcc; + + for (i = found = 0; ICInfo(0, i, &info); i++) + { + trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x\n", info.fccHandler); + + fcc = (unsigned char *)&info.fccHandler; + if (!isalpha(fcc[0])) continue; + + found++; + /* Test getting info with a different case - bug 41602 */ + if (fcc[0] & 0x20) + { + fcc[0] &= ~0x20; +todo_wine + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); + } + else + { + fcc[0] |= 0x20; +todo_wine + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); + } + } +todo_wine + ok(found != 0, "expected at least one codec\n"); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); + test_ICInfo(); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 5fb1f63976d59afc9f8c068911c726044f4338c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb1f63976d59afc9f8c06891… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Nov 22 12:36:16 2016 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 57 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/po/de.po b/po/de.po index a7da9ec..10b152c 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-07-21 10:58+0200\n" +"PO-Revision-Date: 2016-11-22 12:35+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -8049,10 +8049,8 @@ msgid "Wine was brought to you by:" msgstr "Wine wurde für Sie gekeltert von:" #: shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "&Ausführen..." +msgstr "Ausführen" #: shell32.rc:338 msgid "" @@ -10590,10 +10588,8 @@ msgid "IPv6 address" msgstr "IPv6-Adresse" #: msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "Systemkonfiguration" +msgstr "Systeminformationen" #: net.rc:30 msgid "" @@ -12009,6 +12005,33 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Aufruf:\n" +" regedit [Optionen] [Dateiname] [Schlüssel]\n" +"\n" +"Optionen:\n" +" [keine Option] Die grafische Variante des Programms starten.\n" +" /L:system.dat Speicherort der zu modifizierenden system.dat.\n" +" Kompatibel mit jeder anderen Option. Wird ignoriert.\n" +" /R:user.dat Speicherort der zu modifizierenden user.dat.\n" +" Kompatibel mit jeder anderen Option. Wird ignoriert.\n" +" /C Inhalte einer Registrierungsdatei importieren.\n" +" /D Den spezifizierten Schlüssel löschen.\n" +" /E Inhalte des spezifizierten Schlüssels in Datei " +"exportieren.\n" +" Falls kein Schlüssel angegeben wurde, wird die gesamte\n" +" Registrierung exportiert.\n" +" /S Stiller Modus. Es werden keine Meldungen angezeigt.\n" +" /V Die GUI im erweiterten Modus starten. Wird ignoriert.\n" +" /? Diese Hilfe anzeigen und beenden.\n" +" [Dateiname] Speicherort der Datei mit Registrierungsinformationen,\n" +" die importiert, bzw. in welche (wenn [/E] angegeben wurde)\n" +" exportiert werden soll.\n" +" [Schlüssel] Der zu modifizierende Registrierungsschlüssel.\n" +"\n" +"Beispielaufrufe:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -14582,10 +14605,8 @@ msgid "Error: Invalid query\n" msgstr "Fehler: Ungültige Anfrage\n" #: wmic.rc:31 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "Error: Invalid syntax for PATH\n" -msgstr "reg: Ungültige Syntax. " +msgstr "Fehler: Ungültige Syntax für PATH\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -14660,36 +14681,32 @@ msgid "F&ormat" msgstr "Forma&t" #: wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" -msgstr "&Liste" +msgstr "&Listen" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" msgstr "Auf&zählungszeichen" #: wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "CRL-Nummer" +msgstr "Zahlen" #: wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "Kleinbuchstaben" #: wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "Großbuchstaben" #: wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "Römische Ziffern - Kleinbuchstaben" #: wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "Römische Ziffern - Großbuchstaben" #: wordpad.rc:94 wordpad.rc:117 msgid "&Paragraph..."

1 0

Huw Davies : kernel32/tests: VerifyConsoleIoHandle() always returns FALSE on Windows 8 and 10.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 5dd0c7fa7b3b5e4307fab31e1140c8502ea1ec1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd0c7fa7b3b5e4307fab31e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 22 12:00:10 2016 +0000 kernel32/tests: VerifyConsoleIoHandle() always returns FALSE on Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 79e1772..a14bc45 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1319,7 +1319,9 @@ static void test_VerifyConsoleIoHandle( HANDLE handle ) SetLastError(0xdeadbeef); ret = pVerifyConsoleIoHandle(handle); error = GetLastError(); - ok(ret, "expected VerifyConsoleIoHandle to succeed\n"); + ok(ret || + broken(!ret), /* Windows 8 and 10 */ + "expected VerifyConsoleIoHandle to succeed\n"); ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); }

1 0

Huw Davies : kernel32/tests: On failure don' t test the returned count - it contains random data on Windows 8 and 10.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 542ba85ef88cc07b1dc178531bf900caec64c54d URL: http://source.winehq.org/git/wine.git/?a=commit;h=542ba85ef88cc07b1dc178531… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 22 12:00:09 2016 +0000 kernel32/tests: On failure don't test the returned count - it contains random data on Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 179 +++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=542ba85ef88cc07b1dc17…

1 0

Huw Davies : kernel32/tests: Add some GetLastError() values for Windows 8 and 10.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: f1b5e98ad8bc51e6781a012d4aa29ff25c9fc5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b5e98ad8bc51e6781a012d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 22 12:00:08 2016 +0000 kernel32/tests: Add some GetLastError() values for Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d8584c4..cdcfa15 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2616,27 +2616,35 @@ static void test_ReadConsole(void) SetLastError(0xdeadbeef); ret = GetFileSize(std_input, NULL); ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */ + "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ + "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(!bytes, "expected 0, got %u\n", bytes); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadConsoleA(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ + "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadConsoleW(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ + "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); }

1 0

Jeremy Newman : fix typo
by Jeremy Newman 22 Nov '16

22 Nov '16

Module: appdb Branch: master Commit: 37d412dc1e8c0188e1cb21e1f1a523d0f4f2b5d1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=37d412dc1e8c0188e1cb21e1… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 14:55:19 2016 -0600 fix typo --- include/objectManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/objectManager.php b/include/objectManager.php index eaf0503..182a8b9 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -187,7 +187,7 @@ class ObjectManager { header("HTTP/1.1 404 Not Found"); echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> 404 - Not Found!</h1>\n"; - echo "<p>We are unable to find the page your are trying to access. Please check your URL and try again.</p>\n"; + echo "<p>We are unable to find the page you are trying to access. Please check your URL and try again.</p>\n"; } else {

1 0

Jeremy Newman : improve item not found handling with 404 code
by Jeremy Newman 22 Nov '16

22 Nov '16

Module: appdb Branch: master Commit: be04b155ec663365febc3fc2459d73f7f28f9c20 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=be04b155ec663365febc3fc2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 14:48:37 2016 -0600 improve item not found handling with 404 code --- include/objectManager.php | 21 +++++++++++++++++---- objectManager.php | 15 ++++++--------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 126dfac..eaf0503 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -181,9 +181,22 @@ class ObjectManager return $bAllowed; } - public static function error_exit($shMessage) + public static function error_exit($shMessage, $b404 = false) { - echo '<div align="center"><p><font color="red"><b>'.$shMessage.'</b></font></p></div'; + if ($b404) + { + header("HTTP/1.1 404 Not Found"); + echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> 404 - Not Found!</h1>\n"; + echo "<p>We are unable to find the page your are trying to access. Please check your URL and try again.</p>\n"; + } + else + { + echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> Error!</h1>\n"; + echo "<p>We have encountered an error. More details in message below.</p>\n"; + } + echo "<p>If you feel this is an error on our end, please report it to our <a href=\"https://forum.winehq.org/viewforum.php?f=11\">forums</a>.\n"; + echo "<hr>\n"; + echo "<p><b>Error Message:</b> {$shMessage}</p>\n"; echo apidb_footer(); exit; } @@ -1287,11 +1300,11 @@ class ObjectManager /* Check that the entry exists */ if(!$oObject->objectGetId() && !$this->isNullIdAllowed('view')) - $this->error_exit("Entry not found (class: {$this->sClass}, id: {$this->iId})"); + $this->error_exit("Entry not found (class: {$this->sClass}, id: {$this->iId})", true); /* Check if the entry has been deleted */ if($oObject->objectGetState() == 'deleted') - $this->error_exit("This entry has been deleted (class: {$this->sClass}, id: {$this->iId})<br>\nIts content may have been moved to another entry"); + $this->error_exit("This entry has been deleted (class: {$this->sClass}, id: {$this->iId})<br>\nIts content may have been moved to another entry", true); /* Show a note if the entry is queued or rejected */ if($oObject->objectGetState() != 'accepted') diff --git a/objectManager.php b/objectManager.php index 37f61a9..1d3d66f 100644 --- a/objectManager.php +++ b/objectManager.php @@ -31,16 +31,13 @@ require_once(BASE.'include/tag_CommonReply.php'); require_once(BASE.'include/commonReply.php'); /* if we have no valid class name we should abort */ -if(!isset($aClean['sClass'])) +if(empty($aClean['sClass']) or !class_exists($aClean['sClass'])) { - echo "No class defined.\n"; - exit; -} - -/* make sure the class is defined */ -if(!class_exists($aClean['sClass'])) -{ - echo "Class ".$aClean['sClass']." doesn't exist"; + header("HTTP/1.1 404 Not Found"); + apidb_header("404 - Not Found!"); + echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> 404 - Not Found!</h1>\n"; + echo "<p>We were unable to load this page due to a missing or invalid class parameter.</p>\n"; + apidb_footer(); exit; }

1 0

Jeremy Newman : add google captcha check to the account creation form
by Jeremy Newman 22 Nov '16

22 Nov '16

Module: appdb Branch: master Commit: 159c60543f698264c3b2c31c800938548582552e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=159c60543f698264c3b2c31c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 11:27:37 2016 -0600 add google captcha check to the account creation form --- account.php | 20 +++++++++++++++++++- include/config.php.sample | 4 ++++ include/filter.php | 4 ++-- include/form_login_new.php | 6 ++++++ include/reCaptcha.php | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 3 deletions(-) diff --git a/account.php b/account.php index 6a6e3cd..f001d15 100644 --- a/account.php +++ b/account.php @@ -38,7 +38,7 @@ function do_account($sCmd = null) switch($sCmd) { case "new": - apidb_header("New Account"); + apidb_header("New Account", "<script src='https://www.google.com/recaptcha/api.js'></script>"); include(BASE."include/"."form_login_new.php"); apidb_footer(); exit; @@ -102,6 +102,24 @@ function cmd_do_new() return; } + if (!empty($aClean['g-recaptcha-response'])) + { + // validate captcha + require(BASE."include/reCaptcha.php"); + $reCaptcha = new reCaptcha(RECAPTCHA_SECRET); + if (!$reCaptcha->validate($aClean['g-recaptcha-response'], $_SERVER['REMOTE_ADDR'])) + { + // reCAPTCHA failed + retry("new", "reCAPTCHA check failed!"); + return; + } + } + else + { + retry("new", "reCAPTCHA check failed!"); + return; + } + $oUser = new User(); $sPassword = substr(base_convert(rand(0, PHP_INT_MAX),10, 36), 0, 9); $iResult = $oUser->create($aClean['sUserEmail'], $sPassword, diff --git a/include/config.php.sample b/include/config.php.sample index 53cba20..57f2652 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -20,6 +20,10 @@ define("APPDB_OWNER_EMAIL","appdb(a)winehq.org"); // e-mail of this product/compan define("APPDB_SENDER_EMAIL","appdb-noreply(a)winehq.org"); // The e-mail address which appears as the sender in mails sent by the AppDB define("BUGZILLA_ROOT","https://bugs.winehq.org/"); // path to bugzilla +// Google reCaptcha Secret Key - required on account creations +define("RECAPTCHA_KEY",""); +define("RECAPTCHA_SECRET",""); + // AppDB developers: Use this define to disable email from being sent from the appdb during testing //if(!defined("DISABLE_EMAIL")) // define("DISABLE_EMAIL", true); // disable email, see mail_appdb() in include/mail.php diff --git a/include/filter.php b/include/filter.php index 404e3a1..aa3fa6d 100644 --- a/include/filter.php +++ b/include/filter.php @@ -40,8 +40,8 @@ function filter_gpc() (strpos($aKeys[$i], "XinhaColorPicker") === 0) || // Xinha variables ($aKeys[$i] == "cx") || // google custom search variable ($aKeys[$i] == "cof") || // google custom search variable - ($aKeys[$i] == "q")) // google custom search variable - + ($aKeys[$i] == "q") || // google custom search variable + ($aKeys[$i] == "g-recaptcha-response")) // google reCaptcha variable { // copy the key over to the clean array // NOTE: we do not strip html tags or trim any Xinha variables diff --git a/include/form_login_new.php b/include/form_login_new.php index c063e71..00d14d7 100644 --- a/include/form_login_new.php +++ b/include/form_login_new.php @@ -34,6 +34,12 @@ $sReturnTo = (!empty($aClean['sReturnTo']) ? $aClean['sReturnTo'] : ''); </div> </div> <div class="form-group"> + <label class="col-sm-2 control-label"></label> + <div class="col-sm-10"> + <div class="g-recaptcha" data-sitekey="<?php echo RECAPTCHA_KEY; ?>"></div> + </div> +</div> +<div class="form-group"> <div class="col-sm-offset-2 col-sm-10"> <button type="submit" name="sCreate" class="btn btn-default"><i class="fa fa-sign-in"></i> Create Account</button> </div> diff --git a/include/reCaptcha.php b/include/reCaptcha.php new file mode 100644 index 0000000..09446d3 --- /dev/null +++ b/include/reCaptcha.php @@ -0,0 +1,34 @@ +<?php + +/* + Google Re-Captcha Class + by Jeremy Newman <jnewman(a)codeweavers.com> +*/ + +class reCaptcha +{ + private $reCaptchaSecret = ''; + public $res = false; + public function __construct ($secret = '') + { + $this->reCaptchaSecret = $secret; + return true; + } + public function validate ($resp, $ip) + { + if (empty($resp) or empty($ip)) + return false; + $post = array('secret' => $this->reCaptchaSecret, 'response' => $resp, 'remoteip' => $ip); + $ch = curl_init('https://www.google.com/recaptcha/api/siteverify'); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, $post); + $res = json_decode(curl_exec($ch)); + $this->res = $res; + curl_close($ch); + if (!empty($res->success) and $res->success) + return true; + return false; + } +} + +?> \ No newline at end of file

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
47
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

2003

2002

2001

wine-commits November 2016