Fossil SCM

Improved error messages from the forum when the forum artifact ID is incorrect.

drh 2020-11-18 14:47 trunk
Commit 93a5d659b350fd9d0f60a4d39aaf565fc42512eaa38a33fc88baef4e417b537c
Parent 2b1c5bc8fe80f70…
2 files changed +8 -3 +19
~ src/forum.c ~ src/style.c
M src/forum.c
+8 -3
--- src/forum.c
+++ src/forum.c
@@ -287,11 +287,11 @@
287287
 fpid = symbolic_name_to_rid(zName, "f");
288288
 if( fpid<=0 ){
289289
 fpid = db_int(0, "SELECT rid FROM blob WHERE rid=%d", atoi(zName));
290290
 }
291291
 if( fpid<=0 ){
292
- fossil_fatal("Unknown or ambiguous forum id: \"%s\"", zName);
292
+ fossil_fatal("unknown or ambiguous forum id: \"%s\"", zName);
293293
 }
294294
 froot = db_int(0, "SELECT froot FROM forumpost WHERE fpid=%d", fpid);
295295
 if( froot==0 ){
296296
 fossil_fatal("Not a forum post: \"%s\"", zName);
297297
 }
@@ -813,15 +813,20 @@
813813
 if( zName==0 ){
814814
 webpage_error("Missing \"name=\" query parameter");
815815
 }
816816
 fpid = symbolic_name_to_rid(zName, "f");
817817
 if( fpid<=0 ){
818
- webpage_error("Unknown or ambiguous forum id: \"%s\"", zName);
818
+ if( fpid==0 ){
819
+ webpage_notfound_error("Unknown forum id: \"%s\"", zName);
820
+ }else{
821
+ ambiguous_page();
822
+ }
823
+ return;
819824
 }
820825
 froot = db_int(0, "SELECT froot FROM forumpost WHERE fpid=%d", fpid);
821826
 if( froot==0 ){
822
- webpage_error("Not a forum post: \"%s\"", zName);
827
+ webpage_notfound_error("Not a forum post: \"%s\"", zName);
823828
 }
824829
 if( fossil_strcmp(g.zPath,"forumthread")==0 ) fpid = 0;
825830
826831
 /* Decode the mode parameters. */
827832
 if( bRaw ){
828833
--- src/forum.c
+++ src/forum.c
@@ -287,11 +287,11 @@
287 fpid = symbolic_name_to_rid(zName, "f");
288 if( fpid<=0 ){
289 fpid = db_int(0, "SELECT rid FROM blob WHERE rid=%d", atoi(zName));
290 }
291 if( fpid<=0 ){
292 fossil_fatal("Unknown or ambiguous forum id: \"%s\"", zName);
293 }
294 froot = db_int(0, "SELECT froot FROM forumpost WHERE fpid=%d", fpid);
295 if( froot==0 ){
296 fossil_fatal("Not a forum post: \"%s\"", zName);
297 }
@@ -813,15 +813,20 @@
813 if( zName==0 ){
814 webpage_error("Missing \"name=\" query parameter");
815 }
816 fpid = symbolic_name_to_rid(zName, "f");
817 if( fpid<=0 ){
818 webpage_error("Unknown or ambiguous forum id: \"%s\"", zName);
 
 
 
 
 
819 }
820 froot = db_int(0, "SELECT froot FROM forumpost WHERE fpid=%d", fpid);
821 if( froot==0 ){
822 webpage_error("Not a forum post: \"%s\"", zName);
823 }
824 if( fossil_strcmp(g.zPath,"forumthread")==0 ) fpid = 0;
825
826 /* Decode the mode parameters. */
827 if( bRaw ){
828
--- src/forum.c
+++ src/forum.c
@@ -287,11 +287,11 @@
287 fpid = symbolic_name_to_rid(zName, "f");
288 if( fpid<=0 ){
289 fpid = db_int(0, "SELECT rid FROM blob WHERE rid=%d", atoi(zName));
290 }
291 if( fpid<=0 ){
292 fossil_fatal("unknown or ambiguous forum id: \"%s\"", zName);
293 }
294 froot = db_int(0, "SELECT froot FROM forumpost WHERE fpid=%d", fpid);
295 if( froot==0 ){
296 fossil_fatal("Not a forum post: \"%s\"", zName);
297 }
@@ -813,15 +813,20 @@
813 if( zName==0 ){
814 webpage_error("Missing \"name=\" query parameter");
815 }
816 fpid = symbolic_name_to_rid(zName, "f");
817 if( fpid<=0 ){
818 if( fpid==0 ){
819 webpage_notfound_error("Unknown forum id: \"%s\"", zName);
820 }else{
821 ambiguous_page();
822 }
823 return;
824 }
825 froot = db_int(0, "SELECT froot FROM forumpost WHERE fpid=%d", fpid);
826 if( froot==0 ){
827 webpage_notfound_error("Not a forum post: \"%s\"", zName);
828 }
829 if( fossil_strcmp(g.zPath,"forumthread")==0 ) fpid = 0;
830
831 /* Decode the mode parameters. */
832 if( bRaw ){
833
M src/style.c
+19
--- src/style.c
+++ src/style.c
@@ -1226,10 +1226,29 @@
12261226
 void webpage_assert_page(const char *zFile, int iLine, const char *zExpr){
12271227
 fossil_warning("assertion fault at %s:%d - %s", zFile, iLine, zExpr);
12281228
 cgi_reset_content();
12291229
 webpage_error("assertion fault at %s:%d - %s", zFile, iLine, zExpr);
12301230
 }
1231
+
1232
+/*
1233
+** Issue a 404 Not Found error for a webpage
1234
+*/
1235
+void webpage_notfound_error(const char *zFormat, ...){
1236
+ char *zMsg;
1237
+ va_list ap;
1238
+ if( zFormat ){
1239
+ va_start(ap, zFormat);
1240
+ zMsg = vmprintf(zFormat, ap);
1241
+ va_end(ap);
1242
+ }else{
1243
+ zMsg = "Not Found";
1244
+ }
1245
+ style_header("Not Found");
1246
+ @ <p>%h(zMsg)</p>
1247
+ cgi_set_status(404, "Not Found");
1248
+ style_finish_page("enotfound");
1249
+}
12311250
12321251
 #if INTERFACE
12331252
 # define webpage_assert(T) if(!(T)){webpage_assert_page(__FILE__,__LINE__,#T);}
12341253
 #endif
12351254
12361255
--- src/style.c
+++ src/style.c
@@ -1226,10 +1226,29 @@
1226 void webpage_assert_page(const char *zFile, int iLine, const char *zExpr){
1227 fossil_warning("assertion fault at %s:%d - %s", zFile, iLine, zExpr);
1228 cgi_reset_content();
1229 webpage_error("assertion fault at %s:%d - %s", zFile, iLine, zExpr);
1230 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1231
1232 #if INTERFACE
1233 # define webpage_assert(T) if(!(T)){webpage_assert_page(__FILE__,__LINE__,#T);}
1234 #endif
1235
1236
--- src/style.c
+++ src/style.c
@@ -1226,10 +1226,29 @@
1226 void webpage_assert_page(const char *zFile, int iLine, const char *zExpr){
1227 fossil_warning("assertion fault at %s:%d - %s", zFile, iLine, zExpr);
1228 cgi_reset_content();
1229 webpage_error("assertion fault at %s:%d - %s", zFile, iLine, zExpr);
1230 }
1231
1232 /*
1233 ** Issue a 404 Not Found error for a webpage
1234 */
1235 void webpage_notfound_error(const char *zFormat, ...){
1236 char *zMsg;
1237 va_list ap;
1238 if( zFormat ){
1239 va_start(ap, zFormat);
1240 zMsg = vmprintf(zFormat, ap);
1241 va_end(ap);
1242 }else{
1243 zMsg = "Not Found";
1244 }
1245 style_header("Not Found");
1246 @ <p>%h(zMsg)</p>
1247 cgi_set_status(404, "Not Found");
1248 style_finish_page("enotfound");
1249 }
1250
1251 #if INTERFACE
1252 # define webpage_assert(T) if(!(T)){webpage_assert_page(__FILE__,__LINE__,#T);}
1253 #endif
1254
1255

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button