Merge pull request #3 from sergey-dryabzhinsky/update-version-and-ini-file

Update version:

Author: Sergey

CHANGELOG

@@ -1,3 +1,8 @@
+1.7.3:
+- fix lvalue set for php >= 4.1
+- fix compilation warnings about line numbers format
+- add new option to suppress errors if context not found
+
 1.7:
 - contexts may now be assigned a value like if they were tags
 - removed "Tag doesn't exist" notice from tmpl_set()

php_templates.h

@@ -44,7 +44,7 @@ extern zend_module_entry templates_module_entry;
 #	define TMPL_PHP_4_3		1
 #endif
 
-#define TMPL_VERSION		"1.7"
+#define TMPL_VERSION		"1.7.3"
 
 #define TMPL_CACHE_ENABLED	0
 

templates.c

@@ -237,7 +237,7 @@ char	buf[TMPL_MAX_TAG_LEN*3];
 	DISPLAY_INI_ENTRIES();
 
 	php_info_print_table_start();
-	php_info_print_table_row(2,	"WWW", "http://php-templates.sourceforge.net/");
+	php_info_print_table_row(2,	"WWW", "https://github.com/sergey-dryabzhinsky/php-templates");
 	php_info_print_table_end();
 }
 /* }}} */

templates.ini

@@ -0,0 +1,27 @@
+extension=templates.so
+
+[Templates]
+
+; Open block tag left part (open)
+; templates.ctx_ol = "<tmpl:"
+
+; Open block tag right part (close)
+; templates.ctx_or = ">"
+
+; Close block tag left part (open)
+; templates.ctx_cl = "</tmpl:"
+
+; Close block tag right part (close)
+; templates.ctx_cr = ">"
+
+; Data key open tag
+; templates.left = "{"
+
+; Data key close tag
+; templates.right = "}"
+
+; Throw error if context not found
+; Set to 1 in dev environment
+; templates.ctx_eno = 1
+
+templates.ctx_eno = 0

tmpl_lib.c

@@ -112,7 +112,7 @@ register char	*start;
 		if(!(*p)) break; else nam[nam_len] = 0;
 
 		if('=' != *p) {
-			php_error(E_ERROR, "Invalid configuration tag parameter in template (line:%d)", php_tmpl_line_num(tmpl, p));
+			php_error(E_ERROR, "Invalid configuration tag parameter in template (line:%lu)", php_tmpl_line_num(tmpl, p));
 			TMPL_PRE_PARSE_CONFIG_CLEANUP;
 			return FAILURE;
 		}
@@ -125,7 +125,7 @@ register char	*start;
 		if(!(*p)) break; else val[val_len] = 0;
 
 		if(quote && quote != *p) {
-			php_error(E_ERROR, "Invalid parameter value in configuration tag in template (line:%d)", php_tmpl_line_num(tmpl, p));
+			php_error(E_ERROR, "Invalid parameter value in configuration tag in template (line:%lu)", php_tmpl_line_num(tmpl, p));
 			TMPL_PRE_PARSE_CONFIG_CLEANUP;
 			return FAILURE;
 		}
@@ -308,7 +308,7 @@ zval			**ztag;
 			buf[buf_len] = 0;
 
 			if(SUCCESS == zend_hash_find(Z_ARRVAL_P(tmpl->tags), buf, buf_len+1, (void*)&ztag)) {
-				php_error(E_ERROR, "Duplicate context \"%s\" in template (line: %d)", buf, php_tmpl_line_num(tmpl, p));
+				php_error(E_ERROR, "Duplicate context \"%s\" in template (line: %lu)", buf, php_tmpl_line_num(tmpl, p));
 				TMPL_PRE_PARSE_CLEANUP;
 				return FAILURE;
 			}
@@ -359,7 +359,7 @@ zval			**ztag;
 		}
 	}
 	if(buf_len != 1) {
-		php_error(E_ERROR, "Can't continue with an unterminated context \"%s\" in template (line:%d)", buf, php_tmpl_line_num(tmpl, ZV(tmpl->original) + context->loff));
+		php_error(E_ERROR, "Can't continue with an unterminated context \"%s\" in template (line:%lu)", buf, php_tmpl_line_num(tmpl, ZV(tmpl->original) + context->loff));
 		TMPL_PRE_PARSE_CLEANUP;
 		return FAILURE;
 	}