From 1139e1b368b4d471d4bea99dab40630c0a5abff3 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 19 Mar 2007 11:37:50 +0000
Subject: [PATCH] Made check for class method plInfo php4 compatible

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5818 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 include/class_pluglist.inc                   | 12 +++++++-----
 include/sieve/templates/element_size.tpl     |  1 -
 include/sieve/templates/select_test_type.tpl |  9 ++++++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index f6267beb2..8a354af6a 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -41,11 +41,13 @@ class pluglist {
 
                 /* Fill info part of pluglist */
                 $classes= get_declared_classes();
-                foreach (get_declared_classes() as $cname){
-                        if (method_exists($cname, 'plInfo')){
-                                $this->info[$cname]= @call_user_func(array($cname, 'plInfo'));
-                        }
-                }
+
+				foreach ($classes as $cname){
+					$cmethods = get_class_methods($cname);
+					if (in_array_ics('plInfo',$cmethods)){
+						$this->info[$cname]= @call_user_func(array($cname, 'plInfo'));
+					}
+				}
 
 		/* Provide field for 'all' */
 		$this->info['all']= array();
diff --git a/include/sieve/templates/element_size.tpl b/include/sieve/templates/element_size.tpl
index def994dff..aedb7c39e 100644
--- a/include/sieve/templates/element_size.tpl
+++ b/include/sieve/templates/element_size.tpl
@@ -19,7 +19,6 @@
 			<select name='Value_Unit_{$ID}' title='{t}Select value unit{/t}'>
 				{html_options options=$Units selected=$Value_Unit}
 			</select>
-			<input type='submit'>
 		</td>
 	</tr>
 </table>
diff --git a/include/sieve/templates/select_test_type.tpl b/include/sieve/templates/select_test_type.tpl
index 39ab2f7ca..e08fea0e2 100644
--- a/include/sieve/templates/select_test_type.tpl
+++ b/include/sieve/templates/select_test_type.tpl
@@ -4,4 +4,11 @@
 <select name='test_type_to_add_{$ID}'>
 	{html_options options=$test_types_to_add}
 </select>
-<input type='submit' name='add_type'>
+
+<p class='seperator'>&nbsp;</p>
+<br>
+<div class='seperator' style='text-align:right; width:100%;'>
+	<input type='submit' name='does_nothing' value='{t}Abort{/t}'>
+    	&nbsp;
+	<input type='submit' name='add_type' value='{t}Next{/t}'>
+</div>
-- 
2.30.2