@@ -12,6 +12,8 @@ class client_templates {
1212 function apply_client_templates ($ clientId ) {
1313 global $ app ;
1414
15+ include ('../client/form/client.tform.php ' );
16+
1517 /*
1618 * Get the master-template for the client
1719 */
@@ -71,28 +73,28 @@ function apply_client_templates($clientId) {
7173 }
7274 /* process the string limits (CHECKBOXARRAY, SELECT etc.) */
7375 elseif (is_string ($ v )){
74- switch ($ app -> tform -> formDef ["tabs " ]["limits " ]["fields " ][$ k ]['formtype ' ]){
76+ switch ($ form ["tabs " ]["limits " ]["fields " ][$ k ]['formtype ' ]){
7577 case 'CHECKBOXARRAY ' :
7678 if (!isset ($ limits [$ k ])){
7779 $ limits [$ k ] = array ();
7880 }
7981
8082 $ limits_values = $ limits [$ k ];
8183 if (is_string ($ limits [$ k ])){
82- $ limits_values = explode ($ app -> tform -> formDef ["tabs " ]["limits " ]["fields " ][$ k ]["separator " ],$ limits [$ k ]);
84+ $ limits_values = explode ($ form ["tabs " ]["limits " ]["fields " ][$ k ]["separator " ],$ limits [$ k ]);
8385 }
84- $ additional_values = explode ($ app -> tform -> formDef ["tabs " ]["limits " ]["fields " ][$ k ]["separator " ],$ v );
86+ $ additional_values = explode ($ form ["tabs " ]["limits " ]["fields " ][$ k ]["separator " ],$ v );
8587
8688 /* unification of limits_values (master template) and additional_values (additional template) */
8789 $ limits_unified = array ();
88- foreach ($ app -> tform -> formDef ["tabs " ]["limits " ]["fields " ][$ k ]["value " ] as $ key => $ val ){
90+ foreach ($ form ["tabs " ]["limits " ]["fields " ][$ k ]["value " ] as $ key => $ val ){
8991 if (in_array ($ key ,$ limits_values ) || in_array ($ key ,$ additional_values )) $ limits_unified [] = $ key ;
9092 }
91- $ limits [$ k ] = implode ($ app -> tform -> formDef ["tabs " ]["limits " ]["fields " ][$ k ]["separator " ],$ limits_unified );
93+ $ limits [$ k ] = implode ($ form ["tabs " ]["limits " ]["fields " ][$ k ]["separator " ],$ limits_unified );
9294 break ;
9395
9496 case 'SELECT ' :
95- $ limit_values = array_keys ($ app -> tform -> formDef ["tabs " ]["limits " ]["fields " ][$ k ]["value " ]);
97+ $ limit_values = array_keys ($ form ["tabs " ]["limits " ]["fields " ][$ k ]["value " ]);
9698 /* choose the lower index of the two SELECT items */
9799 $ limits [$ k ] = $ limit_values [min (array_search ($ limits [$ k ], $ limit_values ), array_search ($ v , $ limit_values ))];
98100 break ;
@@ -118,5 +120,6 @@ function apply_client_templates($clientId) {
118120 $ sql = 'UPDATE client SET ' . $ update . " WHERE client_id = " . $ app ->functions ->intval ($ clientId );
119121 $ app ->db ->query ($ sql );
120122 }
123+ unset($ form );
121124 }
122125}
0 commit comments