sciret-svn

[Sciret-svn] SF.net SVN: sciret:[770] trunk/classes/template.php

[<al...@us...>]

Revision: 770
          http://sciret.svn.sourceforge.net/sciret/?rev=770&view=rev
Author:   alpeb
Date:     2008-10-28 12:08:02 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
removed some old code

Modified Paths:
--------------
    trunk/classes/template.php

Modified: trunk/classes/template.php
===================================================================
--- trunk/classes/template.php	2008-10-27 22:16:49 UTC (rev 769)
+++ trunk/classes/template.php	2008-10-28 12:08:02 UTC (rev 770)
@@ -47,9 +47,6 @@
 		/* last error message is retained here */
 		var $last_error = '';
 
-		// if true change all phpGroupWare into eGroupWare in set_var
-		var $egroupware_hack = True;
-
 		/***************************************************************************/
 		/* public: Constructor.
 		 * root:     template directory.
@@ -183,10 +180,7 @@
 						echo "<p>Template::set_var('$k','$v')</p>\n";
 					}
 					$this->varkeys[$k] = $this->varname($k);
-					$this->varvals[$k] = $this->egroupware_hack ? str_replace(
-						array('phpGroupWare','www.phpgroupware.org'),
-						array('eGroupWare','www.eGroupWare.org'),$v
-					) : $v;
+					$this->varvals[$k] = $v;
 				}
 			}
 		}
@@ -469,8 +463,6 @@
 			{
 				echo('<b>Halted.</b>');
 			}
-
-			$GLOBALS['phpgw']->common->phpgw_exit(True);
 		}
 
 		/* public, override: haltmsg($msg)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret:[771] trunk/classes/template.php

[<al...@us...>]

Revision: 771
          http://sciret.svn.sourceforge.net/sciret/?rev=771&view=rev
Author:   alpeb
Date:     2008-10-30 14:08:13 +0000 (Thu, 30 Oct 2008)

Log Message:
-----------
added possibility to define variable delimiters using a class variable

Modified Paths:
--------------
    trunk/classes/template.php

Modified: trunk/classes/template.php
===================================================================
--- trunk/classes/template.php	2008-10-28 12:08:02 UTC (rev 770)
+++ trunk/classes/template.php	2008-10-30 14:08:13 UTC (rev 771)
@@ -47,6 +47,9 @@
 		/* last error message is retained here */
 		var $last_error = '';
 
+        var $left_delimiter = '{';
+        var $right_delimiter = '}';
+
 		/***************************************************************************/
 		/* public: Constructor.
 		 * root:     template directory.
@@ -149,7 +152,7 @@
 				// return False;
 			}
 			$this->set_var($handle,$match[1]);
-			$this->set_var($parent,preg_replace($reg, '{' . "$name}",$str));
+			$this->set_var($parent,preg_replace($reg, $this->left_delimiter . $name . $this->right_delimiter,$str));
 		}
 
 		/* public: set_var(array $values)
@@ -343,7 +346,7 @@
 				case 'keep':
 					break;
 				case 'remove':
-					$str = preg_replace('/{[^ \t\r\n}]+}/', '', $str);
+					$str = preg_replace('/' . preg_quote($this->left_delimiter) . '[^ \t\r\n' . preg_quote($this->right_delimiter). ']+ ' . preg_quote($this->right_delimiter) . '/', '', $str);
 					break;
 				case 'comment':
 					$str = preg_replace('/{([^ \t\r\n}]+)}/', "<!-- Template $handle: Variable \\1 undefined -->", $str);
@@ -407,7 +410,7 @@
 		 */
 		function varname($varname)
 		{
-			return '{'.$varname.'}';
+			return $this->left_delimiter . $varname . $this->right_delimiter;
 		}
 
 		/* private: loadfile(string $handle)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.