October 2007 - Wine-commits

Detlef Riekenberg : spoolss/test: Add a test for BuildOtherNamesFromMachineName.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: a1323b6b7f246830122b62a70dabf3937896cdb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1323b6b7f246830122b62a70… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 19 23:11:20 2007 +0200 spoolss/test: Add a test for BuildOtherNamesFromMachineName. --- dlls/spoolss/tests/spoolss.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/spoolss/tests/spoolss.c b/dlls/spoolss/tests/spoolss.c index 3797785..602b925 100644 --- a/dlls/spoolss/tests/spoolss.c +++ b/dlls/spoolss/tests/spoolss.c @@ -33,6 +33,7 @@ static HMODULE hwinspool; static HMODULE hspl; +static BOOL (WINAPI * pBuildOtherNamesFromMachineName)(LPWSTR **, LPDWORD); static DWORD (WINAPI * pSplInitializeWinSpoolDrv)(LPVOID *); #define WINSPOOL_TABLESIZE 16 @@ -51,6 +52,10 @@ static LPCSTR load_functions(void) hspl = LoadLibraryA(ptr); if (!hspl) return ptr; + ptr = "BuildOtherNamesFromMachineName"; + pBuildOtherNamesFromMachineName = (void *) GetProcAddress(hspl, ptr); + if (!pBuildOtherNamesFromMachineName) return ptr; + ptr = "SplInitializeWinSpoolDrv"; pSplInitializeWinSpoolDrv = (void *) GetProcAddress(hspl, ptr); if (!pSplInitializeWinSpoolDrv) return ptr; @@ -90,6 +95,33 @@ static LPCSTR load_functions(void) /* ########################### */ +static void test_BuildOtherNamesFromMachineName(void) +{ + LPWSTR *buffers; + DWORD numentries; + DWORD res; + + buffers = NULL; + numentries = 0; + + SetLastError(0xdeadbeef); + res = pBuildOtherNamesFromMachineName(&buffers, &numentries); + + /* An array with 3 stringpointer is returned: + entry_#0: "" (empty String) + entry_#1: <hostname> (this is the same as the computernam) + entry_#2: <ip-address> (string with the ip-address of <hostname>) + */ + todo_wine + ok( res && (buffers != NULL) && (numentries == 3) && (buffers[0] != NULL) && (buffers[0][0] == '\0'), + "got %u with %u and %p,%u (%p:%d)\n", res, GetLastError(), buffers, numentries, + ((numentries > 0) && buffers) ? buffers[0] : NULL, + ((numentries > 0) && buffers && buffers[0]) ? lstrlenW(buffers[0]) : -1); + +} + +/* ########################### */ + static void test_SplInitializeWinSpoolDrv(VOID) { DWORD res; @@ -124,6 +156,7 @@ START_TEST(spoolss) return; } + test_BuildOtherNamesFromMachineName(); test_SplInitializeWinSpoolDrv(); }

1 0

Juan Lang : crypt32: Simplify I_CertUpdateStore.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: a762ffbe1408f83dbfd51b3fe9e268ba785e344d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a762ffbe1408f83dbfd51b3fe… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 21:22:58 2007 -0700 crypt32: Simplify I_CertUpdateStore. --- dlls/crypt32/store.c | 86 +++++++++++++++++++++---------------------------- 1 files changed, 37 insertions(+), 49 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 57a2bd8..6be49bc 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -117,6 +117,43 @@ void CRYPT_FreeStore(PWINECRYPT_CERTSTORE store) CryptMemFree(store); } +BOOL WINAPI I_CertUpdateStore(HCERTSTORE store1, HCERTSTORE store2, DWORD unk0, + DWORD unk1) +{ + static BOOL warned = FALSE; + const WINE_CONTEXT_INTERFACE * const interfaces[] = { pCertInterface, + pCRLInterface, pCTLInterface }; + DWORD i; + + TRACE("(%p, %p, %08x, %08x)\n", store1, store2, unk0, unk1); + if (!warned) + { + FIXME("semi-stub\n"); + warned = TRUE; + } + + /* Poor-man's resync: empty first store, then add everything from second + * store to it. + */ + for (i = 0; i < sizeof(interfaces) / sizeof(interfaces[0]); i++) + { + const void *context; + + do { + context = interfaces[i]->enumContextsInStore(store1, NULL); + if (context) + interfaces[i]->deleteFromStore(context); + } while (context); + do { + context = interfaces[i]->enumContextsInStore(store2, context); + if (context) + interfaces[i]->addContextToStore(store1, context, + CERT_STORE_ADD_ALWAYS, NULL); + } while (context); + } + return TRUE; +} + static BOOL CRYPT_MemAddCert(PWINECRYPT_CERTSTORE store, void *cert, void *toReplace, const void **ppStoreContext) { @@ -199,55 +236,6 @@ static BOOL CRYPT_MemDeleteCrl(PWINECRYPT_CERTSTORE store, void *pCrlContext) return TRUE; } -static void CRYPT_EmptyStore(HCERTSTORE store) -{ - PCCERT_CONTEXT cert; - PCCRL_CONTEXT crl; - - do { - cert = CertEnumCertificatesInStore(store, NULL); - if (cert) - CertDeleteCertificateFromStore(cert); - } while (cert); - do { - crl = CertEnumCRLsInStore(store, NULL); - if (crl) - CertDeleteCRLFromStore(crl); - } while (crl); -} - -BOOL WINAPI I_CertUpdateStore(HCERTSTORE store1, HCERTSTORE store2, DWORD unk0, - DWORD unk1) -{ - static BOOL warned = FALSE; - PCCERT_CONTEXT cert = NULL; - PCCRL_CONTEXT crl = NULL; - - TRACE("(%p, %p, %08x, %08x)\n", store1, store2, unk0, unk1); - if (!warned) - { - FIXME("semi-stub\n"); - warned = TRUE; - } - - /* Poor-man's resync: empty first store, then add everything from second - * store to it. - */ - CRYPT_EmptyStore(store1); - do { - cert = CertEnumCertificatesInStore(store2, cert); - if (cert) - CertAddCertificateContextToStore(store1, cert, - CERT_STORE_ADD_ALWAYS, NULL); - } while (cert); - do { - crl = CertEnumCRLsInStore(store2, crl); - if (crl) - CertAddCRLContextToStore(store1, crl, CERT_STORE_ADD_ALWAYS, NULL); - } while (crl); - return TRUE; -} - static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { WINE_MEMSTORE *store = (WINE_MEMSTORE *)hCertStore;

1 0

Juan Lang : crypt32: Initialize mask when allocating it.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: d0e7aaf1be5be27125d3197ff7ab60ed9fccec8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e7aaf1be5be27125d3197ff… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 13:36:03 2007 -0700 crypt32: Initialize mask when allocating it. --- dlls/crypt32/cert.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2451973..d356c40 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1939,7 +1939,10 @@ static void CRYPT_SetBitInField(struct BitField *field, DWORD bit) else field->indexes = CryptMemAlloc(sizeof(DWORD)); if (field->indexes) + { + field->indexes[indexIndex] = 0; field->cIndexes = indexIndex + 1; + } } if (field->indexes) field->indexes[indexIndex] |= 1 << (bit % BITS_PER_DWORD);

1 0

Juan Lang : cryptnet: Fix a leak.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 25c21e5bff210d1952c75721fc6a134c6a746a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c21e5bff210d1952c75721f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 10:23:24 2007 -0700 cryptnet: Fix a leak. --- dlls/cryptnet/tests/cryptnet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 25ad872..8862d16 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -146,6 +146,7 @@ static void test_getObjectUrl(void) NULL); ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + CertFreeCertificateContext(cert); } cert = CertCreateCertificateContext(X509_ASN_ENCODING, certWithCRLDistPoint, sizeof(certWithCRLDistPoint));

1 0

Gerald Pfeifer : gdi32: Add a set of braces to silence a GCC 3.4 warning.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: d594c1eab4de46da98720af3c62bab8ae259209d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d594c1eab4de46da98720af3c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Oct 19 21:55:33 2007 +0200 gdi32: Add a set of braces to silence a GCC 3.4 warning. --- dlls/gdi32/bidi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index cac9453..037387b 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -1107,6 +1107,7 @@ BOOL BIDI_Reorder( baselevel = 0; if (dwWineGCP_Flags & WINE_GCPW_LOOSE_MASK) + { for (j = 0; j < i; ++j) if (chartype[j] == L) { @@ -1118,6 +1119,7 @@ BOOL BIDI_Reorder( baselevel = 1; break; } + } /* resolve explicit */ resolveExplicit(baselevel, N, chartype, levels, i, 0);

1 0

Jacek Caban : itss: Fixed memory freeing.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 7939297ceb50a9b631ab87a9b463c24e22aff36c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7939297ceb50a9b631ab87a9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 21 14:36:38 2007 +0200 itss: Fixed memory freeing. --- dlls/itss/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index d7f3f42..8571174 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -223,10 +223,10 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, strrchrW(object_name, '/')+1); - HeapFree(GetProcessHeap(), 0, file_name); /* FIXME: Native doesn't use FindMimeFromData */ hres = FindMimeFromData(NULL, object_name, NULL, 0, NULL, 0, &mime, 0); + HeapFree(GetProcessHeap(), 0, file_name); if(SUCCEEDED(hres)) { IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, mime); CoTaskMemFree(mime);

1 0

Juan Lang : crypt32: Remove tests that cause memory corruption.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: dbefd907b6a2cdef74ea35e8edce8bde568a0aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbefd907b6a2cdef74ea35e8e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 06:45:33 2007 -0700 crypt32: Remove tests that cause memory corruption. --- dlls/crypt32/tests/cert.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 879438b..34c313f 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1416,13 +1416,6 @@ static void testGetIssuerCert(void) ok(parent == cert1, "Expected cert1 to be the second issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected no more than two issuers\n"); - /* It's possible to start enumerating from any certificate in the store */ - parent = CertGetIssuerCertificateFromStore(store, child, cert1, &flags); - ok(parent == NULL, "Expected no issuer\n"); - parent = CertGetIssuerCertificateFromStore(store, child, cert2, &flags); - ok(parent == cert1, "Expected cert1 to be the second issuer\n"); - parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); - ok(parent == NULL, "Expected no more than two issuers\n"); CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); @@ -1457,13 +1450,6 @@ static void testGetIssuerCert(void) ok(parent == cert1, "Expected cert1 to be the second issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected no more than two issuers\n"); - /* It's possible to start enumerating from any certificate in the store */ - parent = CertGetIssuerCertificateFromStore(store, child, cert1, &flags); - ok(parent == NULL, "Expected no issuer\n"); - parent = CertGetIssuerCertificateFromStore(store, child, cert2, &flags); - ok(parent == cert1, "Expected cert1 to be the second issuer\n"); - parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); - ok(parent == NULL, "Expected no more than two issuers\n"); CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2);

1 0

Juan Lang : crypt32: Add more missing definitions.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 207feb97c16c69d58fe5763c2cd93c474166f1e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=207feb97c16c69d58fe5763c2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 12:35:08 2007 -0700 crypt32: Add more missing definitions. --- include/wincrypt.h | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index e45a38b..e913f6b 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1223,6 +1223,28 @@ typedef HANDLE HCRYPTASYNC, *PHCRYPTASYNC; typedef void (WINAPI *PFN_CRYPT_ASYNC_PARAM_FREE_FUNC)(LPSTR pszParamOid, LPVOID pvParam); +#define CRYPT_PARAM_ASYNC_RETRIEVAL_COMPLETION ((LPCSTR)1) +#define CRYPT_PARAM_CANCEL_ASYNC_RETRIEVAL ((LPCSTR)2) + +typedef void (WINAPI *PFN_CRYPT_ASYNC_RETRIEVAL_COMPLETION_FUNC)( + void *pvCompletion, DWORD dwCompletionCode, LPCSTR pszURL, LPSTR pszObjectOid, + void *pvObject); + +typedef struct _CRYPT_ASYNC_RETRIEVAL_COMPLETION +{ + PFN_CRYPT_ASYNC_RETRIEVAL_COMPLETION_FUNC pfnCompletion; + void *pvCompletion; +} CRYPT_ASYNC_RETRIEVAL_COMPLETION, *PCRYPT_ASYNC_RETRIEVAL_COMPLETION; + +typedef BOOL (WINAPI *PFN_CANCEL_ASYNC_RETRIEVAL_FUNC)( + HCRYPTASYNC hAsyncRetrieve); + +typedef struct _CRYPT_BLOB_ARRAY +{ + DWORD cBlob; + PCRYPT_DATA_BLOB rgBlob; +} CRYPT_BLOB_ARRAY, *PCRYPT_BLOB_ARRAY; + typedef struct _CRYPT_CREDENTIALS { DWORD cbSize; LPCSTR pszCredentialsOid; @@ -1254,7 +1276,26 @@ typedef struct _CRYPT_RETRIEVE_AUX_INFO { DWORD dwMaxUrlRetrievalByteCount; } CRYPT_RETRIEVE_AUX_INFO, *PCRYPT_RETRIEVE_AUX_INFO; +typedef void (WINAPI *PFN_FREE_ENCODED_OBJECT_FUNC)(LPCSTR pszObjectOid, + PCRYPT_BLOB_ARRAY pObject, void *pvFreeContext); + +#define SCHEME_OID_RETRIEVE_ENCODED_OBJECT_FUNC \ + "SchemeDllRetrieveEncodedObject" +#define SCHEME_OID_RETRIEVE_ENCODED_OBJECTW_FUNC \ + "SchemeDllRetrieveEncodedObjectW" +/* The signature of SchemeDllRetrieveEncodedObjectW is: +BOOL WINAPI SchemeDllRetrieveEncodedObjectW(LPCWSTR pwszUrl, + LPCSTR pszObjectOid, DWORD dwRetrievalFlags, DWORD dwTimeout, + PCRYPT_BLOB_ARRAY pObject, PFN_FREE_ENCODED_OBJECT_FUNC *ppfnFreeObject, + void **ppvFreeContext, HCRYPTASYNC hAsyncRetrieve, + PCRYPT_CREDENTIALS pCredentials, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo); + */ + #define CONTEXT_OID_CREATE_OBJECT_CONTEXT_FUNC "ContextDllCreateObjectContext" +/* The signature of ContextDllCreateObjectContext is: +BOOL WINAPI ContextDllCreateObjectContext(LPCSTR pszObjectOid, + DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContxt); + */ #define CONTEXT_OID_CERTIFICATE ((LPCSTR)1) #define CONTEXT_OID_CRL ((LPCSTR)2) @@ -1284,6 +1325,31 @@ typedef struct _CRYPT_RETRIEVE_AUX_INFO { #define CRYPT_CHECK_FRESHNESS_TIME_VALIDITY 0x00000400 #define CRYPT_ACCUMULATIVE_TIMEOUT 0x00000800 +typedef BOOL (WINAPI *PFN_CRYPT_CANCEL_RETRIEVAL)(DWORD dwFlags, void *pvArg); + +typedef struct _CERT_CRL_CONTEXT_PAIR +{ + PCCERT_CONTEXT pCertContext; + PCCRL_CONTEXT pCrlContext; +} CERT_CRL_CONTEXT_PAIR, *PCERT_CRL_CONTEXT_PAIR; +typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; + +#define TIME_VALID_OID_GET_OBJECT_FUNC "TimeValidDllGetObject" + +#define TIME_VALID_OID_GET_CTL ((LPCSTR)1) +#define TIME_VALID_OID_GET_CRL ((LPCSTR)2) +#define TIME_VALID_OID_GET_CRL_FROM_CERT ((LPCSTR)3) +#define TIME_VALID_OID_GET_FRESHEST_CRL_FROM_CERT ((LPCSTR)4) +#define TIME_VALID_OID_GET_FRESHEST_CRL_FROM_CRL ((LPCSTR)5) + +#define TIME_VALID_OID_FLUSH_OBJECT_FUNC "TimeValidDllFlushObject" + +#define TIME_VALID_OID_FLUSH_CTL ((LPCSTR)1) +#define TIME_VALID_OID_FLUSH_CRL ((LPCSTR)2) +#define TIME_VALID_OID_FLUSH_CRL_FROM_CERT ((LPCSTR)3) +#define TIME_VALID_OID_FLUSH_FRESHEST_CRL_FROM_CERT ((LPCSTR)4) +#define TIME_VALID_OID_FLUSH_FRESHEST_CRL_FROM_CRL ((LPCSTR)5) + /* OID group IDs */ #define CRYPT_HASH_ALG_OID_GROUP_ID 1 #define CRYPT_ENCRYPT_ALG_OID_GROUP_ID 2 @@ -4069,10 +4135,24 @@ BOOL WINAPI CryptVerifyDetachedMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, DWORD *pcbComputedHash); /* cryptnet.dll functions */ +BOOL WINAPI CryptCancelAsyncRetrieval(HCRYPTASYNC hAsyncRetrieval); + BOOL WINAPI CryptGetObjectUrl(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved); +BOOL WINAPI CryptGetTimeValidObject(LPCSTR pszTimeValidOid, void *pvPara, + PCCERT_CONTEXT pIssuer, LPFILETIME pftValidFor, DWORD dwFlags, DWORD dwTimeout, + void **ppvObject, PCRYPT_CREDENTIALS pCredentials, void *pvReserved); + +BOOL WINAPI CryptFlushTimeValidObject(LPCSTR pszFlushTimeValidOid, void *pvPara, + PCCERT_CONTEXT pIssuer, DWORD dwFlags, void *pvReserved); + +BOOL WINAPI CryptInstallCancelRetrieval(PFN_CRYPT_CANCEL_RETRIEVAL pfnCancel, + const void *pvArg, DWORD dwFlags, void *pvReserved); + +BOOL WINAPI CryptUninstallCancelRetrieval(DWORD dwFlags, void *pvReserved); + BOOL WINAPI CryptRetrieveObjectByUrlA(LPCSTR pszURL, LPCSTR pszObjectOid, DWORD dwRetrievalFlags, DWORD dwTimeout, LPVOID *ppvObject, HCRYPTASYNC hAsyncRetrieve, PCRYPT_CREDENTIALS pCredentials, LPVOID pvVerify,

1 0

Juan Lang : crypt32: Replace a private type with a public one.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 9568cead65154a44888e16415269d7d570f64d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9568cead65154a44888e16415… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 19 12:36:06 2007 -0700 crypt32: Replace a private type with a public one. --- dlls/crypt32/encode.c | 138 +++++++++++++++++++++++------------------------- 1 files changed, 66 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9568cead65154a44888e1…

1 0

Alexander Nicolaysen Sørnes : objectManager: Preserve page title when processing entries from a list
by Chris Morgan 21 Oct '07

21 Oct '07

Module: appdb Branch: master Commit: d90ce3d8ef159a3e119d77e769b6f1a0c37faa6c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d90ce3d8ef159a3e119d77e7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Oct 21 15:42:29 2007 +0200 objectManager: Preserve page title when processing entries from a list --- include/objectManager.php | 17 ++++++++++++++++- objectManager.php | 3 +++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 9212633..249dc69 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -13,6 +13,7 @@ class ObjectManager private $iId; private $bIsRejected; private $sReturnTo; + private $sReturnToTitle; /* Used to preserve the title when processing entries from a queue list, for instance */ private $oMultiPage; private $oTableRow; private $oObject; /* Store an instance of the object of the class @@ -65,6 +66,11 @@ class ObjectManager $this->sReturnTo = $sReturnTo; } + public function setReturnToTitle($sTitle) + { + $this->sReturnToTitle = $sTitle; + } + public function setIsRejected($bIsRejected) { $this->bIsRejected = $bIsRejected; @@ -210,6 +216,9 @@ class ObjectManager /* Output header cells */ $this->outputHeader("color4"); + /* Preserve the page title */ + $this->setReturnToTitle($this->sTitle); + /* output each entry */ for($iCount = 0; $oRow = query_fetch_object($hResult); $iCount++) { @@ -990,7 +999,7 @@ class ObjectManager /* Displaying the entire un-queued list for a class is not a good idea, so only do so for queued data */ if($this->bIsQueue) - $sRedirectLink = $this->makeUrl("view", false, "$this->sClass list"); + $sRedirectLink = $this->makeUrl("view", false, $this->sReturnToTitle ? $this->sReturnToTitle : "$this->sClass list"); else $sRedirectLink = APPDB_ROOT; @@ -1022,6 +1031,9 @@ class ObjectManager if(!$sTitle) $sTitle = $this->sTitle; + if($this->sReturnToTitle) + $sUrl .= "&sReturnToTitle=".$this->sReturnToTitle; + $sUrl .= "&sTitle=".urlencode($sTitle); if($this->oMultiPage->bEnabled) @@ -1055,6 +1067,9 @@ class ObjectManager $this->oMultiPage->iPage."\" />\n"; } + if($this->sReturnToTitle) + $sReturn .= "<input type=\"hidden\" name=\"sReturnToTitle\" value=\"".$this->sReturnToTitle."\" />\n"; + return $sReturn; } diff --git a/objectManager.php b/objectManager.php index 6d35efe..7d5b0ad 100644 --- a/objectManager.php +++ b/objectManager.php @@ -48,6 +48,9 @@ if(isset($aClean['bIsQueue']) && $aClean['bIsQueue'] == 'true') else $oObject->setIsQueue(false); +if(isset($aClean['sReturnToTitle'])) + $oObject->setReturnToTitle($aClean['sReturnToTitle']); + if(isset($aClean['sReturnTo'])) $oObject->setReturnTo($aClean['sReturnTo']);

1 0