Changeset 891

Timestamp:

04/26/2005 08:39:21 AM (4 years ago)

Author:

ckruse

Message:

merged back changes from trunk

Location:

cforum/branches/3.3

Files:

• ChangeLog (modified) (1 diff)
• conf/modules.de.xml (modified) (1 diff)
• src/defines.h (modified) (1 diff)
• src/fo_post.c (modified) (1 diff)
• src/modules/flt_noanswer.c (modified) (1 diff)
• src/parsetpl/parsetpl.lex (modified) (7 diffs)

cforum/branches/3.3/ChangeLog

@@ -1 @@
-2005-04-22 Christian Kruse <ckruse@wwwtech.de>
-        * conf/modules.de.xml: Added LinkInvisible
-        * src/perl/Plugins/ImportExport.pm: Added support for submitting a string
-                rather than a file
-        * src/clientlib.[ch]: Added support for static URI flags
-        * src/modules/flt_cgiconfig.c: Now sets readmode=value and showthread=value to
-                static uri flags if set
-        * src/modules/flt_admin.c: Now sets aaf=1 to static uri flags
-        * src/modules/flt_link.c: Added support to link to invisible postings in admin
-                mode
+2005-04-26 Christian Kruse <ckruse@wwwtech.de>
+        * src/fo_post.c: Fixed #787
+        * src/defines.h: Changed CF_BUFSIZ to BUFSIZ (#define CF_BUFSIZ BUFSIZ),
+                changed version number
 
+2005-04-24 Christian Seiler <self@christian-seiler.de>
+        * src/parsetpl/parsetpl.lex: Added {iws} and {endiws} tags.
+

cforum/branches/3.3/conf/modules.de.xml

@@ -1021 +1021 @@
           <validate>^(yes|no)$</validate>
           <question>Sollen Link-Tags im Administrator-Modus auf gelöschte/unsichtbare Postings zeigen?</question>
-          <error>Sollen Link-Tags im Administrator-Modus auf gelöschte/unsichtbare Postings zeigen? Bitte geben Sie &quo;ja&quot; oder &quot;nein&quot; an!</error>
+          <error>Sollen Link-Tags im Administrator-Modus auf gelöschte/unsichtbare Postings zeigen? Bitte geben Sie &quot;ja&quot; oder &quot;nein&quot; an!</error>
           <formvalues>
             <value val="yes">Ja</value>

cforum/branches/3.3/src/defines.h

@@ -23 +23 @@
 #define CF_SORT_NEWESTFIRST 3
 
-#define CF_VERSION "3.3.4"
+#define CF_VERSION "3.3.5"
 
-#define CF_BUFSIZ 2048
+#define CF_BUFSIZ BUFSIZ
 
 #define CF_ERR (1<<1) /**< Used by the logging function. Log an error. */

cforum/branches/3.3/src/fo_post.c

@@ -538 +538 @@
       case '\015':
         if(*(ptr+1) == '\012') ++ptr;
+
+      case '\012':
         str_char_append(str,'\012');
 

cforum/branches/3.3/src/modules/flt_noanswer.c

@@ -156 +156 @@
   t_cf_post_flag *flag;
 
-  if((flag = cf_flag_by_name(&msg->flags,"no-answer")) != NULL) cf_tpl_hashvar_setvalue(hash,"na",TPL_VARIABLE_INT,1);
+  if((flag = cf_flag_by_name(&msg->flags,"no-answer")) != NULL && si == 0) cf_tpl_hashvar_setvalue(hash,"na",TPL_VARIABLE_INT,1);
 
   return FLT_OK;

cforum/branches/3.3/src/parsetpl/parsetpl.lex

@@ -49 +49 @@
 #define PARSETPL_TOK_HASHASSIGNMENT      0x23
 #define PARSETPL_TOK_CONCAT              0x24
+#define PARSETPL_TOK_IWS_START           0x25
+#define PARSETPL_TOK_IWS_END             0x26
 
 #define PARSETPL_INCLUDE_EXT     ".html"
@@ -83 +85 @@
 static int  uses_loopassign          = 0;
 static int  uses_tmpstring           = 0;
+static int  iws                      = 0;
 
 /*
@@ -104 +107 @@
 \n   {
   ++lineno; /* count line numbers */
-  str_char_append(&content,'\n');
+  if (!iws) {
+    str_char_append(&content,'\n');
+  }
 }
 
@@ -222 +227 @@
     return PARSETPL_TOK_ENDFOREACH;
   }
+  iws                 {
+    str_chars_append(&content_backup,yytext,yyleng);
+    return PARSETPL_TOK_IWS_START;
+  }
+  endiws              {
+    str_chars_append(&content_backup,yytext,yyleng);
+    return PARSETPL_TOK_IWS_END;
+  }
   <<EOF>>        {
     str_chars_append(&content_backup,yytext,yyleng);
@@ -279 +292 @@
     str_chars_append(&content_backup,yytext,yyleng);
     str_char_append(&string,*yytext);
+  }
+}
+
+[ \r\t] {
+  if (!iws) {
+    str_char_append(&content,*yytext);
   }
 }
@@ -2200 +2219 @@
   rtype = ((t_token*)array_element_at(data,0))->type;
   
-  if(rtype == PARSETPL_TOK_VARIABLE) {
+  if(rtype == PARSETPL_TOK_IWS_START && data->elements == 1) {
+    iws = 1;
+    return 0;
+  }
+  else if(rtype == PARSETPL_TOK_IWS_END && data->elements == 1) {
+    iws = 0;
+    return 0;
+  }
+  else if(rtype == PARSETPL_TOK_VARIABLE) {
     variable = (t_token *)array_shift(data);
     // 2 possibilities:
@@ -2318 +2345 @@
   str_chars_append(&output_name,".c",2);
   p = strrchr(basename,'/');
-  if(!p) p = basename;
+  if(!p)
+    p = basename;
+  else
+    p++;
   str_char_set(&current_file,p,strlen(p));
   free(basename);