July 2009 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : note: Remove obsolete line from update()
by Alexander Nicolaysen Sørnes 23 Jul '09

23 Jul '09

Module: appdb Branch: master Commit: 0f82fb839c1311a274f07a266564ac2ce570cf82 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0f82fb839c1311a274f07a26… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 16:24:08 2009 +0200 note: Remove obsolete line from update() --- include/note.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/note.php b/include/note.php index b6153d5..ea4098b 100644 --- a/include/note.php +++ b/include/note.php @@ -117,7 +117,6 @@ class Note { $sVersionBefore = Version::lookup_name($oNote->iVersionId); $sVersionAfter = Version::lookup_name($this->iVersionId); $sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n"; - $this->iVersionId = $iVersionId; } if($sWhatChanged) $this->SendNotificationMail("edit",$sWhatChanged);

1 0

Alexander Nicolaysen Sørnes : url: Fix moving to a new version
by Alexander Nicolaysen Sørnes 23 Jul '09

23 Jul '09

Module: appdb Branch: master Commit: 8be4e24864a190c5885f8d730fba1c07a9d3e37c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8be4e24864a190c5885f8d73… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 15:33:47 2009 +0200 url: Fix moving to a new version --- include/url.php | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/url.php b/include/url.php index 93e11ae..0419168 100644 --- a/include/url.php +++ b/include/url.php @@ -138,6 +138,10 @@ class Url { if(!$this->iUrlId) return FALSE; + $oUrl = new url($this->iUrlId); + + if($this->iVersionId && !$iVersionId) + $iVersionId = $this->iVersionId; $sWhatChanged = ""; @@ -159,7 +163,7 @@ class Url { $this->sUrl = $sUrl; } - if ($iVersionId && $iVersionId!=$this->iVersionId) + if ($iVersionId && $iVersionId!=$oUrl->iVersionId) { if (!query_parameters("UPDATE appData SET versionId = '?' WHERE id = '?'", $iVersionId, $this->iUrlId)) @@ -519,8 +523,10 @@ class Url { public function objectSetParent($iNewId, $sClass = '') { - $oAppData = new appData($this->iUrlId, null, $this); - return $oAppData->objectSetParent($iNewId, $sClass); + if($this->iVersionId) + $this->iVersionId = $iNewId; + else + $this->iAppId = $iNewId; } function objectGetChildren($bIncludeDeleted = false)

1 0

Alexander Nicolaysen Sørnes : downloadurl: Fix moving to a new version
by Alexander Nicolaysen Sørnes 23 Jul '09

23 Jul '09

Module: appdb Branch: master Commit: a2cedc2edcf178e18053f690df685ff37450ba88 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a2cedc2edcf178e18053f690… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 15:31:11 2009 +0200 downloadurl: Fix moving to a new version --- include/downloadurl.php | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index 152fbc4..9883fc0 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -71,8 +71,10 @@ class downloadurl public function objectSetParent($iNewId, $sClass = '') { - $oAppData = new appData($this->iId, null, $this); - return $oAppData->objectSetParent($iNewId, $sClass); + if($this->iVersionId) + $this->iVersionId = $iNewId; + else + $this->iAppId = $iNewId; } function objectGetChildren($bIncludeDeleted = false) @@ -365,8 +367,8 @@ class downloadurl } $hResult = query_parameters("UPDATE appData SET - description = '?', url = '?' WHERE id = '?'", - $this->sDescription, $this->sUrl, $this->iId); + description = '?', url = '?', versionId = '?' WHERE id = '?'", + $this->sDescription, $this->sUrl, $this->iVersionId, $this->iId); if(!$hResult) return FALSE;

1 0

Alexander Nicolaysen Sørnes : screenshot : Fix objectSetParent()
by Alexander Nicolaysen Sørnes 23 Jul '09

23 Jul '09

Module: appdb Branch: master Commit: 62b1c7406db3f3a623379dfa8fb3bd7feab8050e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=62b1c7406db3f3a623379dfa… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 15:23:49 2009 +0200 screenshot: Fix objectSetParent() --- include/screenshot.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 97e393c..2f542f5 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -302,8 +302,10 @@ class screenshot public function objectSetParent($iNewId, $sClass = '') { - $oAppData = new appData($this->iScreenshotId, null, $this); - return $oAppData->objectSetParent($iNewId, $sClass); + if($this->iVersionId) + $this->iVersionId = $iNewId; + else + $this->iAppId = $iNewId; } function objectGetChildren($bIncludeDeleted = false)

1 0

Alexander Nicolaysen Sørnes : Implement version::objectMoveChildren() on top of version:: objectGetChildren()
by Alexander Nicolaysen Sørnes 23 Jul '09

23 Jul '09

Module: appdb Branch: master Commit: e9c4d2ef169894438c86f0c79aec46a6d168b993 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e9c4d2ef169894438c86f0c7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 01:40:25 2009 +0200 Implement version::objectMoveChildren() on top of version::objectGetChildren() --- include/appData.php | 16 ++++++++++ include/bugs.php | 24 ++++++++++++++- include/comment.php | 35 +++++++++++++++++++++- include/downloadurl.php | 11 ++++++- include/maintainer.php | 41 ++++++++++++++++++++++++- include/monitor.php | 39 ++++++++++++++++++++++++- include/note.php | 16 ++++++++++ include/screenshot.php | 12 +++++++ include/url.php | 12 +++++++ include/version.php | 74 +++++++++++++++++++++------------------------- 10 files changed, 232 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=e9c4d2ef169894438c86…

1 0

Alexander Nicolaysen Sørnes : screenshot : Link to the actual image in notification mails
by Alexander Nicolaysen Sørnes 22 Jul '09

22 Jul '09

Module: appdb Branch: master Commit: bd7081ebb457dcba46782cbe085c0d78379df8e7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bd7081ebb457dcba46782cbe… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 22:06:14 2009 +0200 screenshot: Link to the actual image in notification mails --- include/screenshot.php | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index e4ecf4b..e906899 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -406,7 +406,12 @@ class screenshot { $oVersion = new version($this->iVersionId); $sAppName = version::fullName($this->iVersionId); - $sMsg = $oVersion->objectMakeUrl()."\n"; + + if(!$bDeleted) + $sMsg = $this->objectMakeUrl()."\n"; + else + $sMsg = $oVersion->objectMakeUrl()."\n"; + if(!$bDeleted) { if(!$this->bQueued) @@ -771,8 +776,7 @@ class screenshot function objectMakeUrl() { - /* STUB */ - return TRUE; + return APPDB_ROOT."appimage.php?iId={$this->iScreenshotId}"; } function allowAnonymousSubmissions()

1 0

Alexander Nicolaysen Sørnes : voteInspector: Show e-mail addresses
by Alexander Nicolaysen Sørnes 22 Jul '09

22 Jul '09

Module: appdb Branch: master Commit: 1de14734d08e582fa4cedd1396490ec00a93cde3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1de14734d08e582fa4cedd13… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 22:00:12 2009 +0200 voteInspector: Show e-mail addresses --- include/vote.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/vote.php b/include/vote.php index bc293bb..c19874f 100644 --- a/include/vote.php +++ b/include/vote.php @@ -310,6 +310,7 @@ class voteInspector $oTableRow->AddTextCell('Delete account'); $oTableRow->AddTextCell('User'); $oTableRow->AddTextCell('ID'); + $oTableRow->AddTextCell('E-mail'); $oTableRow->AddTextCell('Created'); $oTableRow->AddTextCell('Votes'); $oTableRow->AddTextCell('Privileges'); @@ -331,6 +332,7 @@ class voteInspector $oTableRow->AddTextCell($shDelete); $oTableRow->AddTextCell($oVoter->objectMakeLink()); $oTableRow->AddTextCell($oVoter->iUserId); + $oTableRow->AddTextCell($oVoter->sEmail); $oTableRow->AddTextCell($oVoter->sDateCreated); $oTableRow->AddTextCell($oRow->count);

1 0

Alexander Nicolaysen Sørnes : voteInspector: Make it possible to delete user accounts
by Alexander Nicolaysen Sørnes 22 Jul '09

22 Jul '09

Module: appdb Branch: master Commit: 5062357ff96f6622a8335ec7ce658bee4cc65c80 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5062357ff96f6622a8335ec7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 21:42:14 2009 +0200 voteInspector: Make it possible to delete user accounts --- include/vote.php | 73 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 67 insertions(+), 6 deletions(-) diff --git a/include/vote.php b/include/vote.php index 4f486b6..bc293bb 100644 --- a/include/vote.php +++ b/include/vote.php @@ -233,11 +233,14 @@ class voteManager class voteInspector { private $iVersionId; + private $aDeleteVoters; function voteInspector($iVersionId = null) { if(is_numeric($iVersionId)) $this->iVersionId = $iVersionId; + + $this->aDeleteVoters = array(); } public function objectGetId() @@ -255,16 +258,37 @@ class voteInspector return $_SESSION['current']->hasPriv('admin'); } + public function objectGetSubmitterId() + { + return -1; + } + + public function getVotes() + { + return query_parameters("SELECT userId, COUNT(userId) as count FROM appVotes WHERE + versionId = '?' + GROUP BY userId", $this->iVersionId); + } + + public function getVoteCount() + { + return vote_count_version_total($this->iVersionId); + } + + public function getVoterCount() + { + return mysql_num_rows($this->getVotes()); + } + public function outputEditor() { $oVersion = new version($this->iVersionId); - echo 'Inspecting votes for ' . version::fullNameLink($this->iVersionId); - echo ' '; + echo 'Inspecting votes for ' . version::fullNameLink($this->iVersionId).' '; + echo 'Total votes: '.$this->getVoteCount().' '; + echo 'To delete bogus user accounts, select them and press the Delete button below. '; - $hResult = query_parameters("SELECT userId, COUNT(userId) as count FROM appVotes WHERE - versionId = '?' - GROUP BY userId", $this->iVersionId); + $hResult = $this->getVotes(); if(!$hResult) { @@ -283,6 +307,7 @@ class voteInspector $oTableRow = new TableRow(); $oTableRow->setClass('color4'); + $oTableRow->AddTextCell('Delete account'); $oTableRow->AddTextCell('User'); $oTableRow->AddTextCell('ID'); $oTableRow->AddTextCell('Created'); @@ -297,6 +322,13 @@ class voteInspector $oVoter = new user($oRow->userId); $oTableRow = new TableRow(); $oTableRow->setClass(($i % 2) ? 'color0' : 'color1'); + + if($oVoter->hasPriv('admin')) + $shDelete = ''; + else + $shDelete = "<input type=\"checkbox\" name=\"iDelSlot$i\" value=\"{$oVoter->iUserId}\" />"; + + $oTableRow->AddTextCell($shDelete); $oTableRow->AddTextCell($oVoter->objectMakeLink()); $oTableRow->AddTextCell($oVoter->iUserId); $oTableRow->AddTextCell($oVoter->sDateCreated); @@ -342,7 +374,14 @@ class voteInspector public function getOutputEditorValues($aValues) { - + $iVoters = $this->getVoterCount(); + $this->aDeleteVoters = array(); + + for($i = 0; $i < $iVoters; $i++) + { + if(($iVoterId = getInput("iDelSlot$i", $aValues))) + $this->aDeleteVoters[] = new user($iVoterId); + } } public function create() @@ -354,6 +393,28 @@ class voteInspector { return true; } + + public function objectGetMail($sAction, $bMailSubmitter, $bParentAction) + { + $sSubject = ''; + $sMsg = ''; + $aMailTo = null; + + return array($sSubject, $sMsg, $aMailTo); + } + + public function delete() + { + $bSuccess = true; + + foreach($this->aDeleteVoters as $oVoter) + { + if(!$oVoter->delete()) + $bSuccess = false; + } + + return $bSuccess; + } } /**

1 0

Alexander Nicolaysen Sørnes : voteInspector: Show number of comments
by Alexander Nicolaysen Sørnes 22 Jul '09

22 Jul '09

Module: appdb Branch: master Commit: f5498d7d79e7b79a19312cf39cbd3c5fe872a8eb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f5498d7d79e7b79a19312cf3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 20:57:35 2009 +0200 voteInspector: Show number of comments --- include/vote.php | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/vote.php b/include/vote.php index 53ad01c..4f486b6 100644 --- a/include/vote.php +++ b/include/vote.php @@ -288,7 +288,8 @@ class voteInspector $oTableRow->AddTextCell('Created'); $oTableRow->AddTextCell('Votes'); $oTableRow->AddTextCell('Privileges'); - $oTableRow->AddTextCell('# of test results'); + $oTableRow->AddTextCell('Test data'); + $oTableRow->AddTextcell('Comments'); $oTable->AddRow($oTableRow); for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) @@ -324,6 +325,15 @@ class voteInspector $sSubmitted = 'DB failure'; $oTableRow->AddTextCell($sSubmitted); + + $hSubResult = query_parameters("SELECT COUNT(commentId) as count FROM appComments WHERE userId = '?'", $oVoter->iUserId); + + if($hSubResult && ($oSubRow = mysql_fetch_object($hSubResult))) + $sSubmitted = $oSubRow->count; + else + $sSubmitted = 'DB failure'; + + $oTableRow->AddTextCell($sSubmitted); $oTable->AddRow($oTableRow); }

1 0

Alexander Nicolaysen Sørnes : voteInspector: Show number of test results per user
by Alexander Nicolaysen Sørnes 22 Jul '09

22 Jul '09

Module: appdb Branch: master Commit: 8b561a2ccec9f0cddbf39bddce681d792e189639 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8b561a2ccec9f0cddbf39bdd… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 20:44:14 2009 +0200 voteInspector: Show number of test results per user --- include/vote.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/vote.php b/include/vote.php index 692c2ab..53ad01c 100644 --- a/include/vote.php +++ b/include/vote.php @@ -288,6 +288,7 @@ class voteInspector $oTableRow->AddTextCell('Created'); $oTableRow->AddTextCell('Votes'); $oTableRow->AddTextCell('Privileges'); + $oTableRow->AddTextCell('# of test results'); $oTable->AddRow($oTableRow); for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) @@ -314,6 +315,15 @@ class voteInspector } $oTableRow->AddTextCell($sPrivs); + + $hSubResult = query_parameters("SELECT COUNT(testingId) AS count FROM testResults WHERE submitterId = '?' AND state != 'deleted'", $oVoter->iUserId); + + if($hSubResult && ($oSubRow = mysql_fetch_object($hSubResult))) + $sSubmitted = $oSubRow->count; + else + $sSubmitted = 'DB failure'; + + $oTableRow->AddTextCell($sSubmitted); $oTable->AddRow($oTableRow); }

1 0