Forks/open-source-search-engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix coll passwords link

Browse Source
This commit is contained in:
Matt 2014-10-28 20:39:30 -06:00
parent a92ff328ae
commit fbb7e4fe44
2 changed files with 13 additions and 9 deletions

7
Pages.cpp

@ -171,9 +171,9 @@ static WebPage s_pages[] = {
PG_ROOTADMIN},
{ PAGE_COLLPASSWORDS2,//BASIC_SECURITY,
"admin/collectionpasswords", 0,"collection passwords",0,0,
"admin/collectionpasswords2", 0,"collection passwords",0,0,
"passwords", sendPageGeneric , 0 ,NULL,NULL,
PG_COLLADMIN},
PG_COLLADMIN|PG_NOAPI},
{ PAGE_ROOTPASSWORDS, "admin/rootpasswords",
@ -3415,9 +3415,6 @@ bool printApiForPage ( SafeBuf *sb , long PAGENUM , CollectionRec *cr ) {
// dup page fix. so we should 'masterpwd' and 'masterip'
// in the list now.
//if ( pageNum ==PAGE_SECURITY ) pageNum = PAGE_BASIC_SECURITY;
if ( pageNum == PAGE_COLLPASSWORDS2 )
pageNum = PAGE_COLLPASSWORDS;
if ( pageNum != PAGENUM ) continue;

15
Parms.cpp

@ -1302,6 +1302,10 @@ bool Parms::printParmTable ( SafeBuf *sb , TcpSocket *s , HttpRequest *r ) {
"}\n"
"</script>");
*/
if ( page == PAGE_COLLPASSWORDS2 )
page = PAGE_COLLPASSWORDS;
// print the start of the table
char *tt = "None";
if ( page == PAGE_LOG ) tt = "Log Controls";
@ -1757,14 +1761,17 @@ bool Parms::printParms2 ( SafeBuf* sb ,
//if ( page == PAGE_COLLPASSWORDS )
// page = PAGE_ROOTPASSWORDS;
if ( page == PAGE_COLLPASSWORDS2 )
page = PAGE_COLLPASSWORDS;
GigablastRequest gr;
g_parms.setToDefault ( (char *)&gr , OBJ_GBREQUEST , NULL);
// Begin "parms":[]
if (format == FORMAT_JSON ) {
sb->safePrintf ("\"parms\":[\n");
}
// Begin "parms":[]
if (format == FORMAT_JSON ) {
sb->safePrintf ("\"parms\":[\n");
}
// find in parms list
for ( long i = 0 ; i < m_numParms ; i++ ) {