Index: cgi-shared/Plugins/Variables.pm =================================================================== RCS file: /home/users/cvs/selfforum/cgi-shared/Plugins/Variables.pm,v retrieving revision 1.5 diff -u -r1.5 Variables.pm --- cgi-shared/Plugins/Variables.pm 25 Nov 2002 18:09:34 -0000 1.5 +++ cgi-shared/Plugins/Variables.pm 25 Jan 2003 11:26:45 -0000 @@ -72,6 +72,19 @@ $tpl->setVar('ImageUrl',$user_config->{ImageUrl}->[0]->[0]) if exists $user_config->{ImageUrl} && !defined $cgi->param('ImageUrl'); $tpl->setVar('HomepageUrl',$user_config->{HomepageUrl}->[0]->[0]) if exists $user_config->{HomepageUrl} && !defined $cgi->param('HomepageUrl'); + if (exists $user_config->{ShowFAQLinks}) { + if ($user_config->{ShowFAQLinks}->[0]->[0] eq "yes") { + $tpl->setVar('showfaqlinks','1'); + } + } + else { + if (exists $fo_view_conf->{ShowFAQLinks}) { + if ($fo_view_conf->{ShowFAQLinks}->[0]->[0] eq "yes") { + $tpl->setVar('showfaqlinks','1'); + } + } + } + if($user_config->{TextBox}) { $tpl->setVar('twidth',$user_config->{TextBox}->[0]->[0]) if $user_config->{TextBox}->[0]->[0]; $tpl->setVar('theight',$user_config->{TextBox}->[0]->[1]) if $user_config->{TextBox}->[0]->[1]; Index: cgi-shared/config/templates/tpl_html4/forum_posting.html =================================================================== RCS file: /home/users/cvs/selfforum/cgi-shared/config/templates/tpl_html4/forum_posting.html,v retrieving revision 1.34 diff -u -r1.34 forum_posting.html --- cgi-shared/config/templates/tpl_html4/forum_posting.html 27 Nov 2002 14:50:21 -0000 1.34 +++ cgi-shared/config/templates/tpl_html4/forum_posting.html 25 Jan 2003 11:26:46 -0000 @@ -104,6 +104,9 @@ Vorschau generieren {endif} +{if $showfaqlinks} + FAQ-Links + {endif} {if $previewswitchtype == "button"} {endif}
Index: cgi-shared/config/templates/tpl_html4/thread.html =================================================================== RCS file: /home/users/cvs/selfforum/cgi-shared/config/templates/tpl_html4/thread.html,v retrieving revision 1.9 diff -u -r1.9 thread.html --- cgi-shared/config/templates/tpl_html4/thread.html 19 Nov 2002 15:24:03 -0000 1.9 +++ cgi-shared/config/templates/tpl_html4/thread.html 25 Jan 2003 11:26:46 -0000 @@ -96,6 +96,9 @@ Vorschau generieren checked<$ endif; $>> <$ endif; $> +<$ if $showfaqlinks then $> + FAQ-Links + <$ endif; $> <$ if $previewswitchtype == "button" then $> <$ endif; $>
Index: cgi-shared/config/templates/tpl_xhtml10/forum_posting.html =================================================================== RCS file: /home/users/cvs/selfforum/cgi-shared/config/templates/tpl_xhtml10/forum_posting.html,v retrieving revision 1.2 diff -u -r1.2 forum_posting.html --- cgi-shared/config/templates/tpl_xhtml10/forum_posting.html 19 Nov 2002 20:34:09 -0000 1.2 +++ cgi-shared/config/templates/tpl_xhtml10/forum_posting.html 25 Jan 2003 11:26:47 -0000 @@ -139,6 +139,9 @@ Vorschau generieren {endif} +{if $showfaqlinks} + FAQ-Links + {endif} {if $previewswitchtype == "button"} {endif} Index: cgi-shared/config/templates/tpl_xhtml10/thread.html =================================================================== RCS file: /home/users/cvs/selfforum/cgi-shared/config/templates/tpl_xhtml10/thread.html,v retrieving revision 1.1 diff -u -r1.1 thread.html --- cgi-shared/config/templates/tpl_xhtml10/thread.html 19 Nov 2002 17:11:21 -0000 1.1 +++ cgi-shared/config/templates/tpl_xhtml10/thread.html 25 Jan 2003 11:26:47 -0000 @@ -96,6 +96,9 @@ Vorschau generieren checked<$ endif; $>> <$ endif; $> +<$ if $showfaqlinks then $> + FAQ-Links + <$ endif; $> <$ if $previewswitchtype == "button" then $> <$ endif; $>
Index: src/modules/flt_posting.c =================================================================== RCS file: /home/users/cvs/selfforum/src/modules/flt_posting.c,v retrieving revision 1.43 diff -u -r1.43 flt_posting.c --- src/modules/flt_posting.c 3 Dec 2002 23:41:52 -0000 1.43 +++ src/modules/flt_posting.c 25 Jan 2003 11:26:50 -0000 @@ -156,7 +156,8 @@ char *ActiveColorB; int Preview; int PreviewSwitchType; -} Cfg = { 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0 }; + int ShowFAQLinks; +} Cfg = { 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0 }; t_message *get_parent_message(t_message *msgs,t_message *tmsg) { t_message *msg,*bmsg = NULL; @@ -252,6 +253,10 @@ else if(Cfg.PreviewSwitchType == 1) { tpl_cf_setvar(tpl,"previewswitchtype","button",6); } + + if (Cfg.ShowFAQLinks) { + tpl_cf_setvar(tpl,"showfaqlinks","1",1); + } if(Cfg.ActiveColorF && *Cfg.ActiveColorF) { tpl_cf_setvar(tpl,"activecolorf",Cfg.ActiveColorF,strlen(Cfg.ActiveColorF)); @@ -686,6 +691,13 @@ return 0; } +int handle_faqlinks(t_configfile *cfile,t_conf_opt *opt,const char *arg1,const char *arg2,const char *arg3) { + Cfg.ShowFAQLinks = strcmp(arg1,"yes") == 0; + + return 0; +} + + int handle_prevt(t_configfile *cfile,t_conf_opt *opt,const char *arg1,const char *arg2,const char *arg3) { if(strcmp(arg1,"button") == 0) { Cfg.PreviewSwitchType = 1; @@ -734,6 +746,7 @@ { "TextBox", TAKE2, { ARG_STR, ARG_STR, ARG_NONE }, handle_box, NULL }, { "GeneratePreview", TAKE1, { ARG_YESNO, ARG_NONE, ARG_NONE }, handle_prev, NULL }, { "PreviewSwitchType", TAKE1, { ARG_STR, ARG_NONE, ARG_NONE }, handle_prevt, NULL }, + { "ShowFAQLinks", TAKE1, { ARG_STR, ARG_NONE, ARG_NONE }, handle_faqlinks, NULL }, { "ActivePostingColor", TAKE2, { ARG_STR, ARG_STR, ARG_NONE }, handle_actpcol, NULL }, { NULL } }; Index: cgi-shared/config/modconf/modules.xml =================================================================== RCS file: /home/users/cvs/selfforum/cgi-shared/config/modconf/modules.xml,v retrieving revision 1.33 diff -u -r1.33 modules.xml --- cgi-shared/config/modconf/modules.xml 26 Nov 2002 04:11:34 -0000 1.33 +++ cgi-shared/config/modconf/modules.xml 25 Jan 2003 11:30:59 -0000 @@ -96,6 +96,17 @@ + + + ^(?:yes|no)$ + Möchten Sie neben dem Submit-Button für Postings Links auf die FAQ angezeigt haben? + Bitte geben Sie 'ja' oder 'nein' an! + + Ja + Nein + + +