load_template signature changed

diff --git a/cgi.h b/cgi.h
index d0b067c..c792def 100644 (file)
--- a/cgi.h
+++ b/cgi.h
@@ -1,6 +1,6 @@
 #ifndef CGI_H_INCLUDED
 #define CGI_H_INCLUDED
 #ifndef CGI_H_INCLUDED
 #define CGI_H_INCLUDED

-#define CGI_H_VERSION "$Id: cgi.h,v 1.24 2002/03/26 22:29:54 swa Exp $"
+#define CGI_H_VERSION "$Id: cgi.h,v 1.25 2002/04/08 20:50:25 swa Exp $"

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.h,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.h,v $


@@ -38,6 +38,9 @@
  *
  * Revisions   :
  *    $Log: cgi.h,v $
  *
  * Revisions   :
  *    $Log: cgi.h,v $

+ *    Revision 1.25  2002/04/08 20:50:25  swa
+ *    fixed JB spelling
+ *

  *    Revision 1.24  2002/03/26 22:29:54  swa
  *    we have a new homepage!
  *
  *    Revision 1.24  2002/03/26 22:29:54  swa
  *    we have a new homepage!
  *


@@ -172,7 +175,7 @@ extern jb_err map_block_keep   (struct map *exports, const char *name);
 extern jb_err map_conditional  (struct map *exports, const char *name, int choose_first);
 
 extern jb_err template_load(struct client_state *csp, char ** template_ptr, 
 extern jb_err map_conditional  (struct map *exports, const char *name, int choose_first);
 
 extern jb_err template_load(struct client_state *csp, char ** template_ptr, 

-                            const char *templatename);
+                            const char *templatename, int recursive);

 extern jb_err template_fill(char ** template_ptr, const struct map *exports);
 extern jb_err template_fill_for_cgi(struct client_state *csp,
                                     const char *templatename,
 extern jb_err template_fill(char ** template_ptr, const struct map *exports);
 extern jb_err template_fill_for_cgi(struct client_state *csp,
                                     const char *templatename,

diff --git a/cgiedit.c b/cgiedit.c
index 9619c1d..923f19a 100644 (file)
--- a/cgiedit.c
+++ b/cgiedit.c
@@ -1,4 +1,4 @@
-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.28 2002/03/27 12:30:29 oes Exp $";
+const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.29 2002/04/08 16:59:08 oes Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgiedit.c,v $


@@ -42,6 +42,9 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.28 2002/03/27 12:30:29 oes Exp $"
  *
  * Revisions   :
  *    $Log: cgiedit.c,v $
  *
  * Revisions   :
  *    $Log: cgiedit.c,v $

+ *    Revision 1.29  2002/04/08 16:59:08  oes
+ *    Fixed comment
+ *

  *    Revision 1.28  2002/03/27 12:30:29  oes
  *    Deleted unsused variable
  *
  *    Revision 1.28  2002/03/27 12:30:29  oes
  *    Deleted unsused variable
  *


@@ -2556,7 +2559,7 @@ jb_err cgi_edit_actions_list(struct client_state *csp,
 
    /* Should do all global exports above this point */
 
 
    /* Should do all global exports above this point */
 

-   err = template_load(csp, &section_template, "edit-actions-list-section");
+   err = template_load(csp, &section_template, "edit-actions-list-section", 0);

    if (err)
    {
       edit_free_file(file);
    if (err)
    {
       edit_free_file(file);


@@ -2568,7 +2571,7 @@ jb_err cgi_edit_actions_list(struct client_state *csp,
       return err;
    }
 
       return err;
    }
 

-   err = template_load(csp, &url_template, "edit-actions-list-url");
+   err = template_load(csp, &url_template, "edit-actions-list-url", 0);

    if (err)
    {
       free(section_template);
    if (err)
    {
       free(section_template);


@@ -2942,7 +2945,7 @@ jb_err cgi_edit_actions_for_url(struct client_state *csp,
       int index = 0;
       char * filter_template;
 
       int index = 0;
       char * filter_template;
 

-      err = template_load(csp, &filter_template, "edit-actions-for-url-filter");
+      err = template_load(csp, &filter_template, "edit-actions-for-url-filter", 0);

       if (err)
       {
          edit_free_file(file);
       if (err)
       {
          edit_free_file(file);

diff --git a/cgisimple.c b/cgisimple.c
index 60feef9..962a9de 100644 (file)
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.27 2002/04/05 15:50:48 oes Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.28 2002/04/07 15:42:12 jongfoster Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $


@@ -36,6 +36,10 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.27 2002/04/05 15:50:48 oes Ex
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $

+ *    Revision 1.28  2002/04/07 15:42:12  jongfoster
+ *    Fixing send-banner?type=auto when the image-blocker is
+ *    a redirect to send-banner
+ *

  *    Revision 1.27  2002/04/05 15:50:48  oes
  *    added send-stylesheet CGI
  *
  *    Revision 1.27  2002/04/05 15:50:48  oes
  *    added send-stylesheet CGI
  *


@@ -556,7 +560,7 @@ jb_err cgi_send_stylesheet(struct client_state *csp,
    assert(csp);
    assert(rsp);
 
    assert(csp);
    assert(rsp);
 

-   err = template_load(csp, &rsp->body, "cgi-style.css");
+   err = template_load(csp, &rsp->body, "cgi-style.css", 0);

 
    if (err == JB_ERR_FILE)
    {
 
    if (err == JB_ERR_FILE)
    {