Fossil

Check-in [426a3ba49e]
Login

Check-in [426a3ba49e]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a bug in windows that causes the menu on the wiki display pages to be omitted. Ticket [d6d9ee682eac7708b0a7aa31febc8ad47e4923b1].
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 426a3ba49ebb066c192e29e62b07a65854e840c7
User & Date: drh 2008-12-03 14:10:01.000
References
2008-12-27
18:17 • Ticket [500a94b9e5] link checkins and relevant tickets status still Review with 1 other change ... (artifact: 1711e8c780 user: kkinnell)
2008-12-03
14:11 • Fixed ticket [d6d9ee682e]: Can't edit wiki pages plus 2 other changes ... (artifact: 06b598de7e user: drh)
Context
2008-12-03
14:22
Add a 5 second busy timeout on the database connection. ... (check-in: 892c460b8e user: drh tags: trunk)
14:10
Fix a bug in windows that causes the menu on the wiki display pages to be omitted. Ticket [d6d9ee682eac7708b0a7aa31febc8ad47e4923b1]. ... (check-in: 426a3ba49e user: drh tags: trunk)
2008-11-27
22:58
Fix the Setup->Shunned->Rebuild button so that it works when the "fossil ui" command is run from within a check-out and without specifying the repository filename. ... (check-in: 8040619968 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/main.c.
︙︙
126
127
128
129
130
131
132


133
134
135
136
137
138
139

  /* For defense against Cross-site Request Forgery attacks */
  char zCsrfToken[12];    /* Value of the anti-CSRF token */
  int okCsrf;             /* Anti-CSRF token is present and valid */

  FILE *fDebug;           /* Write debug information here, if the file exists */
  int thTrace;            /* True to enable TH1 debugging output */
  Blob thLog;             /* Text of the TH1 debugging output */



  /* Storage for the aux() and/or option() SQL function arguments */
  int nAux;                    /* Number of distinct aux() or option() values */
  const char *azAuxName[MX_AUX]; /* Name of each aux() or option() value */
  char *azAuxParam[MX_AUX];      /* Param of each aux() or option() value */
  const char *azAuxVal[MX_AUX];  /* Value of each aux() or option() value */
  const char **azAuxOpt[MX_AUX]; /* Options of each option() value */








>
>








126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141

  /* For defense against Cross-site Request Forgery attacks */
  char zCsrfToken[12];    /* Value of the anti-CSRF token */
  int okCsrf;             /* Anti-CSRF token is present and valid */

  FILE *fDebug;           /* Write debug information here, if the file exists */
  int thTrace;            /* True to enable TH1 debugging output */
  Blob thLog;             /* Text of the TH1 debugging output */

  int isHome;             /* True if rendering the "home" page */

  /* Storage for the aux() and/or option() SQL function arguments */
  int nAux;                    /* Number of distinct aux() or option() values */
  const char *azAuxName[MX_AUX]; /* Name of each aux() or option() value */
  char *azAuxParam[MX_AUX];      /* Param of each aux() or option() value */
  const char *azAuxVal[MX_AUX];  /* Value of each aux() or option() value */
  const char **azAuxOpt[MX_AUX]; /* Options of each option() value */
︙︙
Changes to src/wiki.c.
︙︙
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98

  if( !g.okRdWiki ){
    cgi_redirectf("%s/login?g=%s/home", g.zBaseURL, g.zBaseURL);
  }
  if( zPageName ){
    login_check_credentials();
    g.zExtra = zPageName;
    cgi_set_parameter_nocopy("name", g.zExtra);
    g.argv[1] = "home";
    wiki_page();
    return;
  }
  style_header("Home");
  @ <p>This is a stub home-page for the project.
  @ To fill in this page, first go to
  @ <a href="%s(g.zBaseURL)/setup_config">setup/config</a>








|








84
85
86
87
88
89
90
91
92
93
94
95
96
97
98

  if( !g.okRdWiki ){
    cgi_redirectf("%s/login?g=%s/home", g.zBaseURL, g.zBaseURL);
  }
  if( zPageName ){
    login_check_credentials();
    g.zExtra = zPageName;
    cgi_set_parameter_nocopy("name", g.zExtra);
    g.isHome = 1;
    wiki_page();
    return;
  }
  style_header("Home");
  @ <p>This is a stub home-page for the project.
  @ To fill in this page, first go to
  @ <a href="%s(g.zBaseURL)/setup_config">setup/config</a>
︙︙
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133

  int rid = 0;
  int isSandbox;
  Blob wiki;
  Manifest m;
  const char *zPageName;
  char *zHtmlPageName;
  char *zBody = mprintf("%s","<i>Empty Page</i>");
  int isHome = g.argv[1][0]=='h';

  login_check_credentials();
  if( !g.okRdWiki ){ login_needed(); return; }
  zPageName = P("name");
  if( zPageName==0 ){
    style_header("Wiki");
    @ <ul>








<








119
120
121
122
123
124
125

126
127
128
129
130
131
132

  int rid = 0;
  int isSandbox;
  Blob wiki;
  Manifest m;
  const char *zPageName;
  char *zHtmlPageName;
  char *zBody = mprintf("%s","<i>Empty Page</i>");


  login_check_credentials();
  if( !g.okRdWiki ){ login_needed(); return; }
  zPageName = P("name");
  if( zPageName==0 ){
    style_header("Wiki");
    @ <ul>
︙︙
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182

      content_get(rid, &content);
      manifest_parse(&m, &content);
      if( m.type==CFTYPE_WIKI ){
        zBody = m.zWiki;
      }
    }
  }
  if( !isHome ){
    if( isSandbox || (rid && g.okWrWiki) || (!rid && g.okNewWiki) ){
      style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
           g.zTop, zPageName);
    }
    if( isSandbox || (rid && g.okApndWiki) ){
      style_submenu_element("Append", "Add A Comment", "%s/wikiappend?name=%T",
           g.zTop, zPageName);








|








167
168
169
170
171
172
173
174
175
176
177
178
179
180
181

      content_get(rid, &content);
      manifest_parse(&m, &content);
      if( m.type==CFTYPE_WIKI ){
        zBody = m.zWiki;
      }
    }
  }
  if( !g.isHome ){
    if( isSandbox || (rid && g.okWrWiki) || (!rid && g.okNewWiki) ){
      style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
           g.zTop, zPageName);
    }
    if( isSandbox || (rid && g.okApndWiki) ){
      style_submenu_element("Append", "Add A Comment", "%s/wikiappend?name=%T",
           g.zTop, zPageName);
︙︙