missed file

Author: Enterprise Systems DevOps

inc/template.inc

@@ -116,8 +116,7 @@ class Template {
       }
       $this->file[$varname] = $this->filename($filename);
     } else {
-      reset($varname);
-      while(list($v, $f) = each($varname)) {
+      foreach($varname as $v=>$f) {
         if ($f == "") {
           $this->halt("set_file: For varname $v filename is empty.");
           return false;
@@ -170,8 +169,7 @@ class Template {
         $this->varvals[$varname] = $value;
       }
     } else {
-      reset($varname);
-      while(list($k, $v) = each($varname)) {
+      foreach($varname as $k=>$v) {
         if (!empty($k)) {
           if ($this->debug) print "array: set *$k* to *$v*<br>\n";
           $v = preg_replace(array('/\$([0-9])/', '/\\\\([0-9])/'), array('&#36;\1', '&#92;\1'), $v);
@@ -226,8 +224,7 @@ class Template {
         $this->set_var($target, $str);
       }
     } else {
-      reset($varname);
-      while(list($i, $v) = each($varname)) {
+      foreach ($varname as $i=>$v) {
         $str = $this->subst($v);
         $this->set_var($target, $str);
       }
@@ -249,8 +246,7 @@ class Template {
    * return all variables as an array (mostly for debugging)
    */
   function get_vars() {
-    reset($this->varkeys);
-    while(list($k, $v) = each($this->varkeys)) {
+    foreach ( $this->varkeys as $k => $v ) {
       $result[$k] = $this->get_var($k);
     }
     return $result;
@@ -273,8 +269,7 @@ class Template {
       }
       return $str;
     } else {
-      reset($varname);
-      while(list($k, $v) = each($varname)) {
+      foreach ($varname as $k => $v) {
         if (isset($this->varvals[$v])) {
           $str = $this->varvals[$v];
         } else {
@@ -303,8 +298,7 @@ class Template {
       return false;
     }
 
-    reset($m);
-    while(list($k, $v) = each($m)) {
+    foreach ($m as $k => $v) {
       if (!isset($this->varkeys[$v])) {
         $result[$v] = $v;
       }