November 2009 - Wine-commits

Alexandre Julliard : comdlg32: Reimplement the 16-bit font dialog on top of the 32-bit one.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: e5a09cffebb91e5defef611d1d90c92d32c349d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a09cffebb91e5defef611d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 18:36:43 2009 +0100 comdlg32: Reimplement the 16-bit font dialog on top of the 32-bit one. Stub out the functionality that cannot be supported that way. --- dlls/comdlg32/cdlg.h | 25 --- dlls/comdlg32/fontdlg.c | 47 +++--- dlls/comdlg32/fontdlg16.c | 371 ++++++++------------------------------------- 3 files changed, 91 insertions(+), 352 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5a09cffebb91e5defef6…

1 0

Alexandre Julliard : comdlg32: Reimplement the 16-bit print dialog on top of the 32-bit one.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 9e643967abf3687e49cc590eb654c9de4c344baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e643967abf3687e49cc590eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 20:15:49 2009 +0100 comdlg32: Reimplement the 16-bit print dialog on top of the 32-bit one. Stub out the functionality that cannot be supported that way. --- dlls/comdlg32/printdlg.c | 78 ++++++- dlls/comdlg32/printdlg.h | 102 -------- dlls/comdlg32/printdlg16.c | 566 ++++++-------------------------------------- 3 files changed, 142 insertions(+), 604 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e643967abf3687e49cc5…

1 0

Alexandre Julliard : comdlg32: Reimplement the 16-bit color dialog on top of the 32-bit one.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 024a0683eb2e7a611bc9d7f9f40bd9e069cc1d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024a0683eb2e7a611bc9d7f9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 20:33:49 2009 +0100 comdlg32: Reimplement the 16-bit color dialog on top of the 32-bit one. Stub out the functionality that cannot be supported that way. --- dlls/comdlg32/cdlg.h | 22 --- dlls/comdlg32/cdlg16.h | 2 +- dlls/comdlg32/colordlg.c | 34 ++-- dlls/comdlg32/colordlg16.c | 444 +++----------------------------------------- 4 files changed, 40 insertions(+), 462 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=024a0683eb2e7a611bc9d…

1 0

Alexandre Julliard : comdlg32: Reimplement the 16-bit file dialog on top of the 32-bit one.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 424472c20d8059057277ae13a0ffe5c51a818e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424472c20d8059057277ae13a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 20:56:26 2009 +0100 comdlg32: Reimplement the 16-bit file dialog on top of the 32-bit one. Stub out the functionality that cannot be supported that way. --- dlls/comdlg32/filedlg16.c | 509 +++++++-------------------------------------- 1 files changed, 77 insertions(+), 432 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=424472c20d8059057277a…

1 0

Alexander Nicolaysen Sørnes : user: Fix fatal error in get_notify_email_address_list
by Alexander Nicolaysen Sørnes 13 Nov '09

13 Nov '09

Module: appdb Branch: master Commit: 0fe0530337584592d6f84a0bb1343a52a4a34550 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0fe0530337584592d6f84a0b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Nov 13 11:57:45 2009 +0100 user: Fix fatal error in get_notify_email_address_list --- include/user.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/user.php b/include/user.php index 212b331..5edc355 100644 --- a/include/user.php +++ b/include/user.php @@ -581,7 +581,8 @@ class User { // if we didn't find this entry in the $aUserId // array then we should add it if the admin has // enabled global emails - if($i === false && ($this->getPref('disable_global_emails','no') == 'no')) + $oAdmin = new user($oRow->userId); + if($i === false && ($oAdmin->getPref('disable_global_emails','no') == 'no')) $aUserId[] = $oRow->userid; } }

1 0

Alexander Nicolaysen Sørnes : maintainer : Avoid duplicate maintainers when merging apps/versions
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: 28b14f7beac05a1a632560c73160e22538313d3a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=28b14f7beac05a1a632560c7… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 18:15:38 2009 +0100 maintainer: Avoid duplicate maintainers when merging apps/versions --- include/maintainer.php | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 3741264..5ca2751 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -1002,10 +1002,27 @@ class maintainer return array(); } + public function isDuplicate() + { + $hResult = query_parameters("SELECT COUNT(maintainerId) as count FROM appMaintainers + WHERE versionId = '?' and appId = '?' AND userId = '?' AND maintainerId != '?'", + $this->iVersionId, $this->iAppId, $this->iUserId, $this->iMaintainerId); + + if(!$hResult) + return false; + + $oRow = mysql_fetch_object($hResult); + + return $oRow->count > 0; + } + public function update() { $oMaintainer = new maintainer($this->iMaintainerId); + if($this->isDuplicate()) + return $this->delete(); + if($this->iVersionId && $oMaintainer->iVersionId != $this->iVersionId) { $hResult = query_parameters("UPDATE appMaintainers SET versionId = '?'

1 0

Alexander Nicolaysen Sørnes : application: Fix viewing rejected applications for non-admins
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: f48d0fd290ae51f34ecb16f73636b28f9ac069b8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f48d0fd290ae51f34ecb16f7… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 18:45:57 2009 +0100 application: Fix viewing rejected applications for non-admins --- include/application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index 3251261..6f8fa26 100644 --- a/include/application.php +++ b/include/application.php @@ -1286,7 +1286,7 @@ class Application { if($sState != 'accepted' && !application::canEdit()) { /* Without edit rights users can only resubmit their rejected entries */ - if(!$bRejected) + if($sState != 'rejected') return FALSE; $sQuery = "SELECT COUNT(DISTINCT(appFamily.appId)) as count FROM appFamily$sExtraTables WHERE

1 0

Alexander Nicolaysen Sørnes : note: Don' t allow version maintainers to create app-wide notes
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: 3c860528dda88b6656e11e9c2451086fd2cf1835 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3c860528dda88b6656e11e9c… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 19:24:17 2009 +0100 note: Don't allow version maintainers to create app-wide notes --- include/note.php | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/include/note.php b/include/note.php index 92891b5..4cc9805 100644 --- a/include/note.php +++ b/include/note.php @@ -568,25 +568,32 @@ class Note { $aIds = $this->getDisplayModeIds(); $aOptions = $this->getDisplayModeNames(); - echo '<tr><td class="color1">Display mode</td>'."\n"; - echo '<td class="color0">'.html_radiobuttons($aIds, $aOptions, 'iVersionId', $this->iVersionId); + /* Version maintainers are not allowed to show a note app-wide */ + if($oApp->canEdit()) + { + echo '<tr><td class="color1">Display mode</td>'."\n"; + echo '<td class="color0">'.html_radiobuttons($aIds, $aOptions, 'iVersionId', $this->iVersionId); - /* Allow the note to be shown for certain versions only */ - $aIds = array(); - $aOptions = array(); - $aSelected = array(); + /* Allow the note to be shown for certain versions only */ + $aIds = array(); + $aOptions = array(); + $aSelected = array(); - foreach($oApp->getVersions(true) as $oAppVersion) // Only accepted versions - { - - $aIds[] = $oAppVersion->objectGetId(); - $aOptions[] = $oAppVersion->objectMakeLink(); + foreach($oApp->getVersions(true) as $oAppVersion) // Only accepted versions + { + + $aIds[] = $oAppVersion->objectGetId(); + $aOptions[] = $oAppVersion->objectMakeLink(); - $aSelected[] = $this->isLinkedWith($oAppVersion->objectGetId(), false); - } - echo html_checkboxes('iVersionId', $aIds, $aOptions, $aSelected); + $aSelected[] = $this->isLinkedWith($oAppVersion->objectGetId(), false); + } + echo html_checkboxes('iVersionId', $aIds, $aOptions, $aSelected); - echo '</td></tr>'; + echo '</td></tr>'; + } else + { + echo "<input type=\"hidden\" name=\"iVersionId\" value=\"{$oVersion->iVersionId}\" />"; + } } else if(!$this->iAppId) { echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">';

1 0

Alexander Nicolaysen Sørnes : Allow admins to disable global email notifications
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: dc06f730ca50e8ed575283c3d855e5cae9c3a6e7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dc06f730ca50e8ed575283c3… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 21:05:19 2009 +0100 Allow admins to disable global email notifications --- include/user.php | 5 +++-- preferences.php | 4 ++++ tables/prefs_list.sql | 24 +++++++++++++----------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/include/user.php b/include/user.php index 73d47eb..212b331 100644 --- a/include/user.php +++ b/include/user.php @@ -579,8 +579,9 @@ class User { $i = array_search($oRow->userid, $aUserId); // if we didn't find this entry in the $aUserId - // array then we should add it - if($i === false) + // array then we should add it if the admin has + // enabled global emails + if($i === false && ($this->getPref('disable_global_emails','no') == 'no')) $aUserId[] = $oRow->userid; } } diff --git a/preferences.php b/preferences.php index 962939a..103ba72 100644 --- a/preferences.php +++ b/preferences.php @@ -51,6 +51,10 @@ function build_prefs_list($oUser) continue; } + /* Check if the permission only applies to a specific group */ + if($r->show_for_group && !$_SESSION['current']->hasPriv($r->show_for_group)) + continue; + $input = html_select("pref_$r->name", explode('|', $r->value_list), $oUser->getpref($r->name, $r->def_value)); diff --git a/tables/prefs_list.sql b/tables/prefs_list.sql index 1952a03..df9a946 100644 --- a/tables/prefs_list.sql +++ b/tables/prefs_list.sql @@ -8,18 +8,20 @@ CREATE TABLE prefs_list ( def_value text, value_list text, description text, + show_for_group text, primary key(id) ); -INSERT INTO prefs_list VALUES (0, 'debug', 'no', 'yes|no', 'Enable debugging information'); -INSERT INTO prefs_list VALUES (0, 'sidebar', 'left', 'left|right', 'Sidebar location'); -INSERT INTO prefs_list VALUES (0, 'window:query', 'no', 'yes|no', 'Display query results in a new window'); -INSERT INTO prefs_list VALUES (0, 'window:help', 'no', 'yes|no', 'Display help in a new window'); -INSERT INTO prefs_list VALUES (0, 'window:offsite', 'no', 'yes|no', 'Display offsite URLs in a new window'); -INSERT INTO prefs_list VALUES (0, 'confirm_comment_deletion', 'yes', 'yes|no', 'Ask why you are deleting a comment before deleting it'); -INSERT INTO prefs_list VALUES (0, 'query:mode', 'view', 'view|edit', 'Default API details mode'); -INSERT INTO prefs_list VALUES (0, 'query:hide_header', 'no', 'yes|no', 'Hide apidb header in query results'); -INSERT INTO prefs_list VALUES (0, 'query:hide_sidebar', 'no', 'yes|no', 'Hide apidb sidebar in query results'); -INSERT INTO prefs_list VALUES (0, 'send_email', 'yes', 'yes|no', 'Send email notifications'); -INSERT INTO prefs_list VALUES (0, 'htmleditor', 'for supported browsers', 'always|for supported browsers|never', 'Display a graphical HTML editor in certain text fields'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('debug', 'no', 'yes|no', 'Enable debugging information'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('sidebar', 'left', 'left|right', 'Sidebar location'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('window:query', 'no', 'yes|no', 'Display query results in a new window'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('window:help', 'no', 'yes|no', 'Display help in a new window'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('window:offsite', 'no', 'yes|no', 'Display offsite URLs in a new window'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('confirm_comment_deletion', 'yes', 'yes|no', 'Ask why you are deleting a comment before deleting it'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('query:mode', 'view', 'view|edit', 'Default API details mode'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('query:hide_header', 'no', 'yes|no', 'Hide apidb header in query results'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('query:hide_sidebar', 'no', 'yes|no', 'Hide apidb sidebar in query results'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('send_email', 'yes', 'yes|no', 'Send email notifications'); +INSERT INTO prefs_list (name,def_value,value_list,description) VALUES ('htmleditor', 'for supported browsers', 'always|for supported browsers|never', 'Display a graphical HTML editor in certain text fields'); +INSERT INTO prefs_list (name,def_value,value_list,description,show_for_group) VALUES ('disable_global_emails', 'no', 'yes|no', 'Disable global e-mail notifications (only send for maintained apps)', 'admin');

1 0

Alexander Nicolaysen Sørnes : testData: Allow users to only show entries for unmaintained versions
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: abb82efe505decb39f16f99af50b8bcd542f1c89 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=abb82efe505decb39f16f99a… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Nov 12 17:34:39 2009 +0100 testData: Allow users to only show entries for unmaintained versions --- include/testData.php | 53 ++++++++++++++++++++++++++++++++++---------- include/testData_queue.php | 13 +++++++--- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/include/testData.php b/include/testData.php index 33661b1..19007d6 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1171,8 +1171,26 @@ class testData{ return $oRow->cnt; } - function objectGetEntriesCount($sState) + public function objectGetFilterInfo() { + $oFilter = new FilterInterface(); + $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show test data for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; + } + + function objectGetEntriesCount($sState, $oFilters = null) + { + $sExtraTables = ''; + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $sWhereFilter = ''; + + if($aOptions['onlyWithoutMaintainers'] == 'true') + { + $sExtraTables = ',appVersion'; + + $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = testResults.versionId"; + } + $oTest = new testData(); if($sState != 'accepted' && !$oTest->canEdit()) @@ -1180,10 +1198,10 @@ class testData{ if($sState == 'rejected') { $sQuery = "SELECT COUNT(testingId) AS count FROM - testResults WHERE + testResults$sExtraTables WHERE testResults.submitterId = '?' AND - testResults.state = '?'"; + testResults.state = '?'$sWhereFilter"; } else { $sQuery = "SELECT COUNT(testingId) AS count FROM @@ -1208,15 +1226,15 @@ class testData{ ) ) AND - testResults.state = '?'"; + testResults.state = '?'$sWhereFilter"; } $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $sState); } else { - $sQuery = "SELECT COUNT(testingId) as count FROM testResults WHERE - testResults.state = '?'"; + $sQuery = "SELECT COUNT(testingId) as count FROM testResults$sExtraTables WHERE + testResults.state = '?'$sWhereFilter"; $hResult = query_parameters($sQuery, $sState); } @@ -1234,8 +1252,19 @@ class testData{ return 'testingId'; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true) + function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true, $oFilters = null) { + $sExtraTables = ''; + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $sWhereFilter = ''; + + if($aOptions['onlyWithoutMaintainers'] == 'true') + { + $sExtraTables = ',appVersion'; + + $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = testResults.versionId"; + } + $oTest = new testData(); $sLimit = ""; @@ -1255,10 +1284,10 @@ class testData{ { if($sState == 'rejected') { - $sQuery = "SELECT testResults.* FROM testResults WHERE + $sQuery = "SELECT testResults.* FROM testResults$sExtraTables WHERE testResults.submitterId = '?' AND - testResults.state = '?' ORDER BY ?$sLimit"; + testResults.state = '?'$sWhereFilter ORDER BY ?$sLimit"; } else { $sQuery = "SELECT testResults.* FROM testResults, appVersion, @@ -1283,7 +1312,7 @@ class testData{ AND appMaintainers.state = 'accepted' AND - testResults.state = '?' ORDER BY ?$sLimit"; + testResults.state = '?'$sWhereFilter ORDER BY ?$sLimit"; } if($sLimit) { @@ -1296,8 +1325,8 @@ class testData{ } } else { - $sQuery = "SELECT testResults.* FROM testResults WHERE - testResults.state = '?' ORDER by ?$sLimit"; + $sQuery = "SELECT testResults.* FROM testResults$sExtraTables WHERE + testResults.state = '?'$sWhereFilter ORDER by ?$sLimit"; if($sLimit) $hResult = query_parameters($sQuery, $sState, $sOrderBy, $iStart, $iRows); else diff --git a/include/testData_queue.php b/include/testData_queue.php index fcc5992..0877535 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -147,14 +147,19 @@ class testData_queue return testData::objectGetDefaultSort(); } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true) + public function objectGetFilterInfo() { - return $this->oTestData->objectGetEntries($sState, $iRows, $iStart, $sOrderBy, $bAscending); + return testData::objectGetFilterInfo(); } - function objectGetEntriesCount($sState) + function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true, $oFilters = null) { - return testData::objectGetEntriesCount($sState); + return $this->oTestData->objectGetEntries($sState, $iRows, $iStart, $sOrderBy, $bAscending, $oFilters); + } + + function objectGetEntriesCount($sState, $oFilters = null) + { + return testData::objectGetEntriesCount($sState, $oFilters); } function objectGetHeader()

1 0