[Fedora-directory-commits] dsgw cgiutil.c, 1.2, 1.3 dnedit.c, 1.2, 1.3 doauth.c, 1.1.1.1, 1.2 dsgwutil.c, 1.4, 1.5 entrydisplay.c, 1.1.1.1, 1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15920/dsgw

Modified Files:
	cgiutil.c dnedit.c doauth.c dsgwutil.c entrydisplay.c 
Log Message:
Still need to unescape some form vars
The edit CGI requires the template name to be prefixed with tmplname=



Index: cgiutil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/cgiutil.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cgiutil.c	14 Jan 2008 22:58:30 -0000	1.2
+++ cgiutil.c	15 Jan 2008 18:23:43 -0000	1.3
@@ -192,9 +192,8 @@
 void
 dsgw_form_unescape(char *str) 
 {
-    /* this is now a no-op - get/post_begin already unescapes
-       the values - we must use get/post_begin rather than
-       parsing URL/post arguments */
+    form_unescape(str);
+
     return;
 }
 
@@ -480,3 +479,11 @@
     ucnv_reset(utf8Converter);
     return -1;
 }
+
+/*
+  emacs settings
+  Local Variables:
+  indent-tabs-mode: t
+  tab-width: 8
+  End:
+*/


Index: dnedit.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dnedit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnedit.c	14 Jan 2008 22:58:30 -0000	1.2
+++ dnedit.c	15 Jan 2008 18:23:43 -0000	1.3
@@ -391,7 +391,7 @@
 	"<FRAMESET BORDER=1 FRAMEBORDER=1 ROWS=230,*,0,0 "
 	"SCROLLING=\"NO\" NORESIZE onLoad=\"genOutputFrame"
 	"(this.outputFrame, this.dnlist);\">\n" );
-    dsgw_emitf( "   <FRAME SRC=\"%s?%s&dn=%s&context=%s&DNATTR=%s&"
+    dsgw_emitf( "   <FRAME SRC=\"%s?tmplname=%s&dn=%s&context=%s&DNATTR=%s&"
 	     "DNDESC=%s\" NAME=\"controlFrame\" SCROLLING=\"no\">\n",
 	     dsgw_getvp( DSGW_CGINUM_EDIT ), tmplname, edn, context, attrname,
 	     attrdesc );


Index: doauth.c
===================================================================
RCS file: /cvs/dirsec/dsgw/doauth.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- doauth.c	1 Jun 2006 19:43:46 -0000	1.1.1.1
+++ doauth.c	15 Jan 2008 18:23:43 -0000	1.2
@@ -202,7 +202,7 @@
 
 	if( password_expiring != -1 ) {
 		if ( encodeddn != NULL && strlen( encodeddn ) > 0 ) {
-			dsgw_emitf( "var editdesturl = '%s?passwd&dn=%s&context=%s';\n",
+			dsgw_emitf( "var editdesturl = '%s?tmplname=passwd&dn=%s&context=%s';\n",
 				dsgw_getvp( DSGW_CGINUM_EDIT ), encodeddn, context );
 		} else {
 			dsgw_emitf( "var editdesturl=null;\n" );
@@ -415,3 +415,11 @@
     fflush( stdout );
     return;
 }
+
+/*
+  emacs settings
+  Local Variables:
+  indent-tabs-mode: t
+  tab-width: 4
+  End:
+*/


Index: dsgwutil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgwutil.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dsgwutil.c	14 Jan 2008 22:58:30 -0000	1.4
+++ dsgwutil.c	15 Jan 2008 18:23:43 -0000	1.5
@@ -1037,7 +1037,7 @@
 		"<!-- Hide from non-JavaScript browsers\n" );
 
 	if ( encodeddn != NULL && strlen( encodeddn ) > 0 ) {
-	    dsgw_emitf( "var editdesturl = '%s?passwd&dn=%s&context=%s';\n",
+	    dsgw_emitf( "var editdesturl = '%s?tmplname=passwd&dn=%s&context=%s';\n",
 		    dsgw_getvp( DSGW_CGINUM_EDIT ), encodeddn, context );
 	} else {
 	    dsgw_emitf( "var editdesturl=null;\n" );


Index: entrydisplay.c
===================================================================
RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- entrydisplay.c	1 Jun 2006 19:43:38 -0000	1.1.1.1
+++ entrydisplay.c	15 Jan 2008 18:23:43 -0000	1.2
@@ -831,7 +831,7 @@
 	if ( tip->dsti_entrydn != NULL ) {
 	    encodeddn = dsgw_strdup_escaped( tip->dsti_entrydn );
 	    dsgw_emits( "function EditEntryAs(template)\n{\n" );
-	    dsgw_emitf( "    newurl = '%s?' + template + '&context=%s&dn=%s';\n",
+	    dsgw_emitf( "    newurl = '%s?tmplname=' + template + '&context=%s&dn=%s';\n",
 		    dsgw_getvp( DSGW_CGINUM_EDIT ), context, encodeddn );
 	    dsgw_emits( "\twindow.location.href = newurl;\n}\n" );
 	}
@@ -2857,7 +2857,7 @@
 		    "document.writeln( \\'<FONT SIZE=+1>\\' + dsmodify_info +"
 		    " \\'</FONT>\\' );"
 		" else "
-		    "parent.document.location.href=\\'%s?%s"
+		    "parent.document.location.href=\\'%s?tmplname=%s"
 		    "&context=%s&dn=\\' + dsmodify_dn + \\'&info=\\' + escape(dsmodify_info)\">\n",
 		dsgw_getvp( DSGW_CGINUM_EDIT ), template, context );
     }