[Fmsystem-commits] [7712]

[Torstein]

Revision: 7712
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7712
Author:   vator
Date:     2011-09-23 06:50:36 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/model/class.control_area.inc.php
    trunk/controller/inc/model/class.control_item.inc.php
    trunk/controller/inc/model/class.model.inc.php
    trunk/controller/inc/model/class.procedure.inc.php

Modified: trunk/controller/inc/model/class.control_area.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_area.inc.php       2011-09-23 
06:14:27 UTC (rev 7711)
+++ trunk/controller/inc/model/class.control_area.inc.php       2011-09-23 
06:50:36 UTC (rev 7712)
@@ -41,34 +41,6 @@
                        );
                }
                
-       public function toArray()
-               {
-
-// Alternative 1
-//                     return get_object_vars($this);
-
-// Alternative 2
-                       $exclude = array
-                       (
-                               'get_field', // feiler (foreldreklassen)
-                               'get_so',//unødvendig 
-                       );
-                       
-                       $class_methods = get_class_methods($this);
-                       $control_item_arr = array();
-                       foreach ($class_methods as $class_method)
-                       {
-                               if( stripos($class_method , 'get_' ) === 0  && 
!in_array($class_method, $exclude))
-                               {
-                                       $_class_method_part = explode('get_', 
$class_method);
-                                       
$control_item_arr[$_class_method_part[1]] = $this->$class_method();
-                               }
-                       }
-
-//                     _debug_array($control_item_arr);
-                       return $control_item_arr;
-               }
-               
                /**
                 * Get a static reference to the storage object associated with 
this model object
                 * 

Modified: trunk/controller/inc/model/class.control_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_item.inc.php       2011-09-23 
06:14:27 UTC (rev 7711)
+++ trunk/controller/inc/model/class.control_item.inc.php       2011-09-23 
06:50:36 UTC (rev 7712)
@@ -101,33 +101,5 @@
                                                
                        return $result;
                }
-               
-       public function toArray()
-               {
-
-// Alternative 1
-//                     return get_object_vars($this);
-
-// Alternative 2
-                       $exclude = array
-                       (
-                               'get_field', // feiler (foreldreklassen)
-                               'get_so',//unødvendig 
-                       );
-                       
-                       $class_methods = get_class_methods($this);
-                       $control_item_arr = array();
-                       foreach ($class_methods as $class_method)
-                       {
-                               if( stripos($class_method , 'get_' ) === 0  && 
!in_array($class_method, $exclude))
-                               {
-                                       $_class_method_part = explode('get_', 
$class_method);
-                                       
$control_item_arr[$_class_method_part[1]] = $this->$class_method();
-                               }
-                       }
-
-//                     _debug_array($control_item_arr);
-                       return $control_item_arr;
-               }
-       }
+}
 ?>
\ No newline at end of file

Modified: trunk/controller/inc/model/class.model.inc.php
===================================================================
--- trunk/controller/inc/model/class.model.inc.php      2011-09-23 06:14:27 UTC 
(rev 7711)
+++ trunk/controller/inc/model/class.model.inc.php      2011-09-23 06:50:36 UTC 
(rev 7712)
@@ -63,5 +63,33 @@
                return true;
        }
        
+public function toArray()
+               {
+
+// Alternative 1
+//                     return get_object_vars($this);
+
+// Alternative 2
+                       $exclude = array
+                       (
+                               'get_field', // feiler (foreldreklassen)
+                               'get_so',//unødvendig 
+                       );
+                       
+                       $class_methods = get_class_methods($this);
+                       $control_item_arr = array();
+                       foreach ($class_methods as $class_method)
+                       {
+                               if( stripos($class_method , 'get_' ) === 0  && 
!in_array($class_method, $exclude))
+                               {
+                                       $_class_method_part = explode('get_', 
$class_method);
+                                       
$control_item_arr[$_class_method_part[1]] = $this->$class_method();
+                               }
+                       }
+
+//                     _debug_array($control_item_arr);
+                       return $control_item_arr;
+               }
+       
 }
 ?>

Modified: trunk/controller/inc/model/class.procedure.inc.php
===================================================================
--- trunk/controller/inc/model/class.procedure.inc.php  2011-09-23 06:14:27 UTC 
(rev 7711)
+++ trunk/controller/inc/model/class.procedure.inc.php  2011-09-23 06:50:36 UTC 
(rev 7712)
@@ -86,35 +86,7 @@
                        
                        return self::$so;
                }
-               
-               public function toArray()
-               {
-
-// Alternative 1
-//                     return get_object_vars($this);
-
-// Alternative 2
-                       $exclude = array
-                       (
-                               'get_field', // feiler (foreldreklassen)
-                               'get_so',//unødvendig 
-                       );
-                       
-                       $class_methods = get_class_methods($this);
-                       $procedure_arr = array();
-                       foreach ($class_methods as $class_method)
-                       {
-                               if( stripos($class_method , 'get_' ) === 0  && 
!in_array($class_method, $exclude))
-                               {
-                                       $_class_method_part = explode('get_', 
$class_method);
-                                       $procedure_arr[$_class_method_part[1]] 
= $this->$class_method();
-                               }
-                       }
-
-//                     _debug_array($procedure_arr);
-                       return $procedure_arr;
-               }
-               
+                               
                public function serialize()
                {
                        return array(