October 2007 - Wine-commits

Juan Lang : wine.inf: Register cryptnet.dll.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 6974ab554e6029eb82e24777cf46c1c0cac1c97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6974ab554e6029eb82e24777c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:54:39 2007 -0700 wine.inf: Register cryptnet.dll. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 80715fa..e61d4fb 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2152,6 +2152,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,browseui.dll,1 11,,comcat.dll,1 11,,comctl32.dll,2 +11,,cryptnet.dll,1 11,,d3dxof.dll,1 11,,ddraw.dll,1 11,,ddrawex.dll,1

1 0

Juan Lang : crypt32: Add CertVerifyRevocation stub.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: cf8db7305df0eac593e5e02fe35ac8527f6cf2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8db7305df0eac593e5e02fe… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:57:32 2007 -0700 crypt32: Add CertVerifyRevocation stub. --- dlls/crypt32/cert.c | 9 +++++++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index d356c40..a95c2a5 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1231,6 +1231,15 @@ PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE hCertStore, return ret; } +BOOL WINAPI CertVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, + DWORD cContext, void *rgpvContext[], DWORD dwFlags, + PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) +{ + FIXME("(%08x, %d, %d, %p, %08x, %p, %p): stub\n", dwEncodingType, dwRevType, + cContext, rgpvContext, dwFlags, pRevPara, pRevStatus); + return FALSE; +} + PCRYPT_ATTRIBUTE WINAPI CertFindAttribute(LPCSTR pszObjId, DWORD cAttr, CRYPT_ATTRIBUTE rgAttr[]) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 874d26d..870ee48 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -90,7 +90,7 @@ @ stdcall CertVerifyCRLRevocation(long ptr long ptr) @ stdcall CertVerifyCRLTimeValidity(ptr ptr) @ stub CertVerifyCTLUsage -@ stub CertVerifyRevocation +@ stdcall CertVerifyRevocation(long long long ptr long ptr ptr) @ stdcall CertVerifySubjectCertificateContext(ptr ptr ptr) @ stdcall CertVerifyTimeValidity(ptr ptr) @ stdcall CertVerifyValidityNesting(ptr ptr)

1 0

Juan Lang : crypt32: Add basic test for CertVerifyRevocation.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 3b85a7946e393c9acad3f73077e20509367ca5d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b85a7946e393c9acad3f7307… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:58:38 2007 -0700 crypt32: Add basic test for CertVerifyRevocation. --- dlls/crypt32/tests/cert.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 34c313f..3bea543 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2575,6 +2575,45 @@ static void testVerifySubjectCert(void) CertFreeCertificateContext(context1); } +static void testVerifyRevocation(void) +{ + BOOL ret; + CERT_REVOCATION_STATUS status = { 0 }; + PCCERT_CONTEXT cert = CertCreateCertificateContext(X509_ASN_ENCODING, + bigCert, sizeof(bigCert)); + + /* Crash + ret = CertVerifyRevocation(0, 0, 0, NULL, 0, NULL, NULL); + */ + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(0, 0, 0, NULL, 0, NULL, &status); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + status.cbSize = sizeof(status); + ret = CertVerifyRevocation(0, 0, 0, NULL, 0, NULL, &status); + todo_wine + ok(ret, "CertVerifyRevocation failed: %08x\n", GetLastError()); + ret = CertVerifyRevocation(0, 2, 0, NULL, 0, NULL, &status); + todo_wine + ok(ret, "CertVerifyRevocation failed: %08x\n", GetLastError()); + ret = CertVerifyRevocation(2, 0, 0, NULL, 0, NULL, &status); + todo_wine + ok(ret, "CertVerifyRevocation failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(0, 0, 1, (void **)&cert, 0, NULL, &status); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_DLL, + "Expected CRYPT_E_NO_REVOCATION_DLL, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(0, 2, 1, (void **)&cert, 0, NULL, &status); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_DLL, + "Expected CRYPT_E_NO_REVOCATION_DLL, got %08x\n", GetLastError()); + + CertFreeCertificateContext(cert); +} + static BYTE privKey[] = { 0x07, 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x52, 0x53, 0x41, 0x32, 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x79, 0x10, 0x1c, 0xd0, 0x6b, 0x10, @@ -2921,6 +2960,7 @@ START_TEST(cert) testHashPublicKeyInfo(); testCompareCert(); testVerifySubjectCert(); + testVerifyRevocation(); testAcquireCertPrivateKey(); testGetPublicKeyLength(); }

1 0

Juan Lang : crypt32: Implement CertVerifyRevocation.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 5928c698ae57f6db41b1b0b1bbf3ecf2ac1c5cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5928c698ae57f6db41b1b0b1b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:59:43 2007 -0700 crypt32: Implement CertVerifyRevocation. --- dlls/crypt32/cert.c | 77 +++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/cert.c | 6 --- 2 files changed, 75 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index a95c2a5..976589b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1231,13 +1231,86 @@ PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE hCertStore, return ret; } +typedef struct _OLD_CERT_REVOCATION_STATUS { + DWORD cbSize; + DWORD dwIndex; + DWORD dwError; + DWORD dwReason; +} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS; + +typedef BOOL (WINAPI *CertVerifyRevocationFunc)(DWORD, DWORD, DWORD, + void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS); + BOOL WINAPI CertVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, DWORD cContext, void *rgpvContext[], DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) { - FIXME("(%08x, %d, %d, %p, %08x, %p, %p): stub\n", dwEncodingType, dwRevType, + BOOL ret; + + TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType, cContext, rgpvContext, dwFlags, pRevPara, pRevStatus); - return FALSE; + + if (pRevStatus->cbSize != sizeof(OLD_CERT_REVOCATION_STATUS) && + pRevStatus->cbSize != sizeof(CERT_REVOCATION_STATUS)) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (cContext) + { + static HCRYPTOIDFUNCSET set = NULL; + DWORD size; + + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_VERIFY_REVOCATION_FUNC, 0); + ret = CryptGetDefaultOIDDllList(set, dwEncodingType, NULL, &size); + if (ret) + { + if (size == 1) + { + /* empty list */ + SetLastError(CRYPT_E_NO_REVOCATION_DLL); + ret = FALSE; + } + else + { + LPWSTR dllList = CryptMemAlloc(size * sizeof(WCHAR)), ptr; + + if (dllList) + { + ret = CryptGetDefaultOIDDllList(set, dwEncodingType, + dllList, &size); + if (ret) + { + for (ptr = dllList; ret && *ptr; + ptr += lstrlenW(ptr) + 1) + { + CertVerifyRevocationFunc func; + HCRYPTOIDFUNCADDR hFunc; + + ret = CryptGetDefaultOIDFunctionAddress(set, + dwEncodingType, ptr, 0, (void **)&func, &hFunc); + if (ret) + { + ret = func(dwEncodingType, dwRevType, cContext, + rgpvContext, dwFlags, pRevPara, pRevStatus); + CryptFreeOIDFunctionAddress(hFunc, 0); + } + } + } + CryptMemFree(dllList); + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + } + } + } + else + ret = TRUE; + return ret; } PCRYPT_ATTRIBUTE WINAPI CertFindAttribute(LPCSTR pszObjId, DWORD cAttr, diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 3bea543..3c6aaa4 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2587,27 +2587,21 @@ static void testVerifyRevocation(void) */ SetLastError(0xdeadbeef); ret = CertVerifyRevocation(0, 0, 0, NULL, 0, NULL, &status); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); status.cbSize = sizeof(status); ret = CertVerifyRevocation(0, 0, 0, NULL, 0, NULL, &status); - todo_wine ok(ret, "CertVerifyRevocation failed: %08x\n", GetLastError()); ret = CertVerifyRevocation(0, 2, 0, NULL, 0, NULL, &status); - todo_wine ok(ret, "CertVerifyRevocation failed: %08x\n", GetLastError()); ret = CertVerifyRevocation(2, 0, 0, NULL, 0, NULL, &status); - todo_wine ok(ret, "CertVerifyRevocation failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CertVerifyRevocation(0, 0, 1, (void **)&cert, 0, NULL, &status); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_DLL, "Expected CRYPT_E_NO_REVOCATION_DLL, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CertVerifyRevocation(0, 2, 1, (void **)&cert, 0, NULL, &status); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_DLL, "Expected CRYPT_E_NO_REVOCATION_DLL, got %08x\n", GetLastError());

1 0

Alexander Nicolaysen Sørnes : Prevent ids getting lost during editing
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: 16d212c552e6f74075d9401eeab8c53667c80be5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=16d212c552e6f74075d9401e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 21:49:06 2007 +0200 Prevent ids getting lost during editing --- include/comment.php | 4 +++- include/distribution.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/comment.php b/include/comment.php index 8274ef1..ca29670 100644 --- a/include/comment.php +++ b/include/comment.php @@ -200,7 +200,9 @@ class Comment { $this->sSubject = $aClean['sSubject']; $this->sBody = $aClean['sBody']; $this->iParentId = $aClean['iThread']; - $this->iVersionId = $aClean['iVersionId']; + + if($aClean['iVersionId']) + $this->iVersionId = $aClean['iVersionId']; if(!$this->oOwner) $this->oOwner = $_SESSION['current']; diff --git a/include/distribution.php b/include/distribution.php index a51cdef..9dc45f6 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -443,7 +443,9 @@ class distribution { /* $aValues can be $_REQUEST or any array with the values from outputEditor() */ function GetOutputEditorValues($aValues) { - $this->iDistributionId = $aValues['iDistributionId']; + if($aClean['iDistributionId']) + $this->iDistributionId = $aValues['iDistributionId']; + $this->sName = $aValues['sDistribution']; $this->sUrl = $aValues['sUrl']; }

1 0

Alexander Nicolaysen Sørnes : comment: Set default subject when replying
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: d5b029fc613cf880c815450e9bfdde326617a3a4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d5b029fc613cf880c815450e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 13:25:44 2007 +0200 comment: Set default subject when replying --- include/comment.php | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/include/comment.php b/include/comment.php index e6646d7..8a5d1ba 100644 --- a/include/comment.php +++ b/include/comment.php @@ -232,19 +232,13 @@ class Comment { // body echo htmlify_urls($this->sBody), "<br /><br />\n"; - // only add RE: once - if(eregi("RE:", $this->sSubject)) - $sSubject = $this->sSubject; - else - $sSubject = "RE: ".$this->sSubject; - $oVersion = new version($this->iVersionId); $oM = new objectManager("comment", "Post new ocmment"); $oM->setReturnTo($oVersion->objectMakeUrl()); // reply post buttons echo " [<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId\"><small>post new</small></a>] \n"; - echo " [<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId&sSubject=". - urlencode("$sSubject")."&iThread=$this->iCommentId\"><small>reply to this</small></a>] \n"; + echo " [<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId". + "&iThread=$this->iCommentId\"><small>reply to this</small></a>] \n"; echo "</td></tr>\n"; @@ -605,6 +599,17 @@ class Comment { echo html_frame_start($oRow->subject,500); echo htmlify_urls($oRow->body), "<br /><br />\n"; echo html_frame_end(); + + /* Set default reply subject */ + if(!$this->sSubject) + { + // Only add RE: once + if(eregi("RE:", $oRow->subject)) + $this->sSubject = $oRow->subject; + else + $this->sSubject = "RE: ".$oRow->subject; + } + } }

1 0

Alexander Nicolaysen Sørnes : Allow users to view apps with no id
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: 0c47bd87a3ba556c794fb8e39926ae91f67b7aad URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0c47bd87a3ba556c794fb8e3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 13:35:06 2007 +0200 Allow users to view apps with no id --- include/user.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/user.php b/include/user.php index b30dee3..b23f005 100644 --- a/include/user.php +++ b/include/user.php @@ -632,6 +632,10 @@ class User { /* application permissions */ function canViewApplication($oApp) { + /* If there is no id the app is not in the database, which means the current user must have created the object */ + if(!$oApp->iAppId) + return true; + /* if the application isn't queued */ if($oApp->sQueued == 'false') return true;

1 0

Alexander Nicolaysen Sørnes : screenshot : Fix random screenshot function
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: 58ef8e62e55b740e8d97ca164289f2f6cd0096da URL: http://source.winehq.org/git/appdb.git/?a=commit;h=58ef8e62e55b740e8d97ca16… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 13:55:18 2007 +0200 screenshot: Fix random screenshot function --- include/screenshot.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 611b83b..81eec26 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -464,6 +464,7 @@ class screenshot $bFormatting = true) { // initialize variables to avoid notices when appending to them + $hResult = null; $sImgFile = ''; $sImg = ''; // we want a random screenshots for this app @@ -508,7 +509,7 @@ class screenshot $sZoomIcon = Screenshot::get_zoomicon_overlay(); /* we have screenshots */ - if(query_num_rows($hResult)) + if($hResult && query_num_rows($hResult)) { if($iVersionId) $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>View/Submit Screenshot</center></a>";

1 0

Alexander Nicolaysen Sørnes : Support previewing applications
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: fb13cd7c13a9aaf2c3fef4ce468baabb73cad48b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fb13cd7c13a9aaf2c3fef4ce… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 14:16:00 2007 +0200 Support previewing applications --- include/application.php | 13 ++++++++++++- include/application_queue.php | 12 ++++++++++++ include/version.php | 7 +++---- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/include/application.php b/include/application.php index 15bf660..386fd74 100644 --- a/include/application.php +++ b/include/application.php @@ -37,6 +37,7 @@ class Application { var $sSubmitTime; var $iSubmitterId; var $aVersionsIds; // an array that contains the versionId of every version linked to this app. + var $aVersions; // Array of version objects belonging to this app var $iMaintainerRequest; /* Temporary variable for tracking maintainer requests on app submission. Value denotes type of request */ @@ -45,6 +46,8 @@ class Application { */ public function Application($iAppId = null, $oRow = null) { + $this->aVersions = array(); // Should always be an array + // we are working on an existing application if(!$iAppId && !$oRow) return; @@ -500,6 +503,10 @@ class Application { mail_appdb($sEmail, $sSubject ,$sMsg); } + public function objectShowPreview() + { + return TRUE; + } /* output a html table and this applications values to the fields for editing */ public function outputEditor($sVendorName = "") @@ -801,7 +808,7 @@ class Application { echo html_frame_end("For more details and user comments, view the versions of this application."); // display versions - Version::displayList($this->aVersionsIds); + Version::displayList($this->getVersions()); // display bundle $this->displayBundle(); @@ -1070,6 +1077,10 @@ class Application { public function getVersions($bIncludeObsolete = TRUE) { + /* If no id is set we cannot query for the versions, but perhaps objects are already cached? */ + if(!$this->iAppId) + return $this->aVersions; + $aVersions = array(); $hResult = $this->_internal_retrieve_all_versions($bIncludeObsolete); diff --git a/include/application_queue.php b/include/application_queue.php index 3aa82cb..883e126 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -152,6 +152,14 @@ class application_queue return $this->oApp->objectGetMail($sAction, $bMailSubmitter, $bParentAction); } + public function objectShowPreview() + { + if($this->oApp->sName) + return TRUE; + + return FALSE; + } + function outputEditor() { /* We ask the user for the application name first so as to avoid duplicate @@ -291,6 +299,10 @@ class application_queue function display() { + /* Cache the version object if it is not in the database */ + if(!$this->oVersionQueue->objectGetId()) + $this->oApp->aVersions = array($this->oVersionQueue->oVersion); + $this->oApp->display(); } diff --git a/include/version.php b/include/version.php index 63a5e03..8d49bf3 100644 --- a/include/version.php +++ b/include/version.php @@ -1097,9 +1097,9 @@ class version { } // display the versions - public static function displayList($aVersionsIds) + public static function displayList($aVersions) { - if ($aVersionsIds) + if ($aVersions) { echo html_frame_start("","98%","",0); @@ -1137,9 +1137,8 @@ class version { $oTable->SetHeader($oTableRow); $c = 0; - foreach($aVersionsIds as $iVersionId) + foreach($aVersions as $oVersion) { - $oVersion = new Version($iVersionId); $oApp = new application($oVersion->iAppId); if ($oVersion->sQueued == $oApp->sQueued) {

1 0

Alexander Nicolaysen Sørnes : Improve help text on the confirm deletion page
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: ad73b6445f9072893eb8387b019ac290699522c1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ad73b6445f9072893eb8387b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 16:21:17 2007 +0200 Improve help text on the confirm deletion page --- include/objectManager.php | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 8c49d0c..b40a461 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -433,6 +433,22 @@ class ObjectManager return; } + /* Why the user should write an explanation for the deletion */ + if($oObject->objectGetSubmitterId() != $_SESSION['current']->iUserId) + { + $shWhyComment = "Please enter a reason why so that you don’t hurt the submitter’s". + " feelings."; + + $oUser = new user($oObject->objectGetSubmitterId()); + $sSubmitter = " (submitted by ".$oUser->objectMakeLink().")"; + } else + { + $shWhyComment = "Although you submitted it it might be useful for other users to know why ". + "you are deleting it."; + + $sSubmitter = ""; + } + $oTable = new Table(); $oTableRow = new TableRow(); $oTable->setAlign("center"); @@ -444,9 +460,8 @@ class ObjectManager "Confirm deletion". "</div>". '<div class="info_contents">'. - "Are you sure you wish to delete this entry?<br />". - "Please enter a reason why so that you don’t hurt the submitter’s". - " feelings.". + "Are you sure you wish to delete this entry".$sSubmitter."?<br />". + $shWhyComment. "</div>". "</div>".

1 0