mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Implemented callback to get username after entered in NetLib's dialog during publishing. Finished removing old password saving in editor.

This commit is contained in:
cmanske%netscape.com 1998-10-02 22:18:24 +00:00
Родитель 082514a729
Коммит f9e70e729f
2 изменённых файлов: 98 добавлений и 89 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

60
lib/layout/editor.cpp
Просмотреть файл

@ -647,7 +647,8 @@ ED_FileError EDT_PublishFile( MWContext * pContext,
char * pDestFullURL, /* may not have trailing slash */
XP_Bool bKeepImagesWithDoc,
XP_Bool bAutoAdjustLinks,
XP_Bool bSavePassword ) {
XP_Bool /*bSavePassword*/ ) // Not used any more
{
GET_WRITABLE_EDIT_BUF_OR_RETURN(pContext, pEditBuffer) ED_ERROR_BLOCKED;
int type = NET_URL_Type(pDestFullURL);
@ -655,62 +656,53 @@ ED_FileError EDT_PublishFile( MWContext * pContext,
char *pLocation = NULL;
char *pUsername = NULL;
char *pPassword = NULL;
if (!NET_ParseUploadURL( pDestFullURL, &pLocation,
&pUsername, &pPassword )) {
// This also checks if the URL is complete garbage.
// This also checks if the URL is complete garbage.
if (!NET_ParseUploadURL( pDestFullURL, &pLocation, &pUsername, &pPassword ))
return ED_ERROR_BAD_URL;
}
// Assemble a URL that includes username, but not password and filename
char * pDestDirectory = EDT_ReplaceFilename(pLocation, NULL, TRUE);
if( pDestDirectory ){
// Save the location and username preferences
if( pDestDirectory )
{
char * pPrefLocation = NULL;
if (NET_MakeUploadURL(&pPrefLocation,pDestDirectory,pUsername,NULL)) {
if (NET_MakeUploadURL(&pPrefLocation, pDestDirectory, pUsername, NULL))
{
// Save as the "last location" in preferences
PREF_SetCharPref("editor.publish_last_loc", pPrefLocation);
// Save the password if user wants us to (and we have one!)
// Also set the preference we use for initial state of "save password" checkbox
if( pPassword && *pPassword ){
if( bSavePassword ){
// NOTE: Password remembering is now handled by "Single Signon" system
// All we do here is save the password in a pref so edt_SyncPublishingHistory
// can get it and pass
char * pass = HG99875(pPassword);
PREF_SetCharPref("editor.publish_last_pass",pass);
PREF_SetBoolPref("editor.publish_save_password",TRUE);
XP_FREE(pass);
} else {
PREF_SetBoolPref("editor.publish_save_password",FALSE);
}
}
}
XP_FREEIF(pPrefLocation);
}
// FTP
if (type == FTP_TYPE_URL) {
if (type == FTP_TYPE_URL)
{
// For ftp, set dest URL to ftp://username@path, so will edit
// properly. Explicitly put the username in the URL.
if (pUsername) {
if (pUsername)
{
char *pUsernameLocation = NULL;
if (NET_MakeUploadURL(&pUsernameLocation,pLocation,pUsername,NULL)) {
if (NET_MakeUploadURL(&pUsernameLocation, pLocation, pUsername,NULL))
{
XP_FREEIF(pLocation);
pLocation = pUsernameLocation;
}
}
retVal = pEditBuffer->PublishFile(finishedOpt,pSourceURL,ppIncludedFiles,
pLocation,pUsername,pPassword,
bKeepImagesWithDoc,bAutoAdjustLinks);
// Note that we rely on SingleSignon to supply a memorized password now
retVal = pEditBuffer->PublishFile(finishedOpt, pSourceURL, ppIncludedFiles,
pLocation, pUsername,0, bKeepImagesWithDoc,bAutoAdjustLinks);
}
// HTTP
else if (type == HTTP_TYPE_URL || type == SECURE_HTTP_TYPE_URL) {
retVal = pEditBuffer->PublishFile(finishedOpt,pSourceURL,ppIncludedFiles,
pLocation,pUsername,pPassword,
bKeepImagesWithDoc,bAutoAdjustLinks);
else if (type == HTTP_TYPE_URL || type == SECURE_HTTP_TYPE_URL)
{
retVal = pEditBuffer->PublishFile(finishedOpt, pSourceURL, ppIncludedFiles,
pLocation, pUsername, pPassword, bKeepImagesWithDoc,bAutoAdjustLinks);
}
else {
else
{
// We should have already made sure pDestURL is ftp or http before getting here.
XP_ASSERT(0);
retVal = ED_ERROR_BLOCKED;

127
lib/layout/edtutil.cpp
Просмотреть файл

@ -5524,9 +5524,13 @@ char * EDT_GetDefaultPublishURL(MWContext * pMWContext, char **ppFilename, char
char * pPasswordSingleSignon = NULL;
SI_RestoreOldSignonDataFromBrowser(
pMWContext, pURL, FALSE, &pUserNameSingleSignon, &pPasswordSingleSignon);
if (pUserNameSingleSignon) {
*ppUserName = pUserNameSingleSignon;
*ppPassword = pPasswordSingleSignon;
if (pUserNameSingleSignon)
{
if( ppUserName )
*ppUserName = pUserNameSingleSignon;
if( ppPassword )
*ppPassword = pPasswordSingleSignon;
// If we found a name, we assume the location part of
// URL is correct, so just return that
return EDT_ReplaceFilename(pURL, NULL, TRUE);
@ -5549,9 +5553,7 @@ char * EDT_GetDefaultPublishURL(MWContext * pMWContext, char **ppFilename, char
XP_Bool bUseDefault = FALSE;
if( bLastPublishFailed ){
// The publish destination should be saved to this at start of publishing (thus may not be "correct")
// The destination should also be saved to the first history pref (editor.publish_history_0)
// but only if publishing succeeded
// use the last location saved - this will be the location we failed at before
PREF_CopyCharPref("editor.publish_last_loc", &pPrefURL);
} else {
// Use the last successfully-used location saved in preferences
@ -5567,9 +5569,6 @@ char * EDT_GetDefaultPublishURL(MWContext * pMWContext, char **ppFilename, char
char * pLocation = 0;
char * pUserName = ppUserName ? *ppUserName : 0;
// Parse the preference string to extract Username
// (password is separate for security munging)
NET_ParseUploadURL( pPrefURL, &pLocation, &pUserName, NULL );
if (ppUserName)
@ -5601,11 +5600,20 @@ char * EDT_GetDefaultPublishURL(MWContext * pMWContext, char **ppFilename, char
// NOTE: CALLER MUST FREE THE RETURNED STRINGS
#define MAX_PUBLISH_LOCATIONS 20
#ifdef XP_WIN
XP_Bool
EDT_GetPublishingHistory(MWContext *pMWContext,
unsigned n,
char** ppLocation,
char** ppUsername,
char** ppPassword)
#else
XP_Bool
EDT_GetPublishingHistory(unsigned n,
char** location_r,
char** username_r,
char** password_r)
char** ppLocation,
char** ppUsername,
char** ppPassword)
#endif
{
char prefname[32];
char* prefvalue = NULL;
@ -5619,29 +5627,41 @@ EDT_GetPublishingHistory(unsigned n,
prefvalue == NULL || prefvalue[0] == '\0')
return FALSE;
if (location_r != NULL)
*location_r = NULL; /* else NET_ParseUploadURL() will try to free! */
if (username_r != NULL)
*username_r = NULL;
if (ppLocation != NULL)
*ppLocation = NULL; /* else NET_ParseUploadURL() will try to free! */
if (ppUsername != NULL)
*ppUsername = NULL;
XP_Bool return_value;
return_value = NET_ParseUploadURL(prefvalue, location_r, username_r, NULL);
XP_FREE(prefvalue); // done with this now.
return_value = NET_ParseUploadURL(prefvalue, ppLocation, ppUsername, NULL);
if (!return_value)
return FALSE;
{
XP_FREE(prefvalue);
return FALSE;
}
if (password_r != NULL) {
XP_SPRINTF(prefname, "editor.publish_password_%d", n);
if (ppPassword != NULL)
{
#ifdef XP_WIN
#if defined(SingleSignon)
// Check if we saved a username/password for this URL via SingleSignon
char * pUserNameSingleSignon = NULL;
char * pPasswordSingleSignon = NULL;
SI_RestoreOldSignonDataFromBrowser(
pMWContext, *ppLocation, FALSE, &pUserNameSingleSignon, &pPasswordSingleSignon);
if (PREF_CopyCharPref(prefname, &prefvalue) != -1 && prefvalue && *prefvalue) {
*password_r = HG99879(prefvalue);
} else {
*password_r = NULL;
}
if (prefvalue != NULL)
XP_FREE(prefvalue);
if (pUserNameSingleSignon)
{
if( ppUsername )
*ppUsername = pUserNameSingleSignon;
if( ppPassword )
*ppPassword = pPasswordSingleSignon;
}
#endif
#endif
}
XP_FREEIF(prefvalue);
return TRUE;
}
@ -5650,7 +5670,6 @@ void edt_SyncPublishingHistory(MWContext *pMWContext)
char prefname[32];
char* prefvalue = NULL;
char* pLastLoc = NULL;
char* pLastPass = NULL;
int i;
/*
@ -5661,19 +5680,7 @@ void edt_SyncPublishingHistory(MWContext *pMWContext)
if( PREF_CopyCharPref("editor.publish_last_loc", &pLastLoc) == -1 ||
!pLastLoc || !*pLastLoc )
return;
PREF_CopyCharPref("editor.publish_last_pass", &pLastPass);
#if defined(SingleSignon)
char *pLocation = NULL;
char *pUsername = NULL;
// Separate the location from the username
if( NET_ParseUploadURL( pLastLoc, &pLocation, &pUsername, NULL ))
{
SI_RememberSignonDataFromBrowser(
pMWContext, pLocation, pUsername, pLastPass);
}
#endif
/*
* First scan the list to find pref that matches new item
*/
@ -5700,28 +5707,15 @@ void edt_SyncPublishingHistory(MWContext *pMWContext)
XP_SPRINTF(prefname, "editor.publish_history_%d", i);
PREF_SetCharPref(prefname, prefvalue);
XP_FREEIF(prefvalue);
XP_SPRINTF(prefname, "editor.publish_password_%d", i-1);
PREF_CopyCharPref(prefname, &prefvalue);
XP_SPRINTF(prefname, "editor.publish_password_%d", i);
PREF_SetCharPref(prefname, prefvalue);
XP_FREEIF(prefvalue);
}
}
/*
* Now set the zero'th one.
*/
PREF_SetCharPref("editor.publish_history_0", pLastLoc);
PREF_SetCharPref("editor.publish_password_0", pLastPass);
XP_FREEIF(pLastLoc);
XP_FREEIF(pLastPass);
}
//
// This was placed in EDT.H so front ends can use it as well
// #define MAX_EDIT_HISTORY_LOCATIONS 10
// Cache the Edit History data
static char** ppEditHistoryURLs = NULL;
static char** ppEditHistoryTitles = NULL;
@ -6334,4 +6328,27 @@ XP_Bool EDT_AdjustTableRectForCaption(LO_TableStruct *pTable, XP_Rect *pRect)
return FALSE;
}
void EDT_SavePublishUsername(MWContext *pContext, char *pAddress, char *pUsername)
{
// Save the location and username given to us by NetLib
// when it prompts for a username and password
if( pContext && pAddress && *pAddress && pUsername )
{
GET_EDIT_BUF_OR_RETURN(pContext, pEditBuffer);
// Copy the address and strip off the filename from the supplied URL
char *pNewLocation = EDT_ReplaceFilename(pAddress, 0, TRUE);
if( pNewLocation )
{
char *pPrefLocation = 0;
// Insert the username into the location string and save in prefs
if( NET_MakeUploadURL(&pPrefLocation, pNewLocation, pUsername, 0) )
PREF_SetCharPref("editor.publish_last_loc", pPrefLocation);
XP_FREEIF(pPrefLocation);
XP_FREE(pNewLocation);
}
}
}
#endif // EDITOR