- Fixed: handling of template_additional when used by remoting api in the o...

mcramer

2013-08-12 bc22d559b1ed3d74570ec8154825b9f0dce8e7e2

 interface/lib/classes/remoting.inc.php

@@ -1103,7 +1103,40 @@
      }
      $app->uses('remoting_lib');
      $app->remoting_lib->loadFormDef('../client/form/client.tform.php');
      return $app->remoting_lib->getDataRecord($client_id);
      $data = $app->remoting_lib->getDataRecord($client_id);
        
        // we need to get the new-style templates for backwards-compatibility - maybe we remove this in a later version
        if(is_array($data) && count($data) > 0) {
            if(isset($data['client_id'])) {
                // this is a single record
                if($data['template_additional'] == '') {
                    $tpls = $app->db->queryAllRecords('SELECT CONCAT(`assigned_template_id`, \':\', `client_template_id`) as `item` FROM `client_template_assigned` WHERE `client_id` = ' . $data['client_id']);
                    $tpl_arr = array();
                    if($tpls) {
                        foreach($tpls as $tpl) $tpl_arr[] = $tpl['item'];
                    }
                    $data['template_additional'] = implode('/', $tpl_arr);
                    unset($tpl_arr);
                    unset($tpls);
                }
            } elseif(isset($data[0]['client_id'])) {
                // multiple client records
                foreach($data as $index => $client) {
                    if($client['template_additional'] == '') {
                        $tpls = $app->db->queryAllRecords('SELECT CONCAT(`assigned_template_id`, \':\', `client_template_id`) as `item` FROM `client_template_assigned` WHERE `client_id` = ' . $client['client_id']);
                        $tpl_arr = array();
                        if($tpls) {
                            foreach($tpls as $tpl) $tpl_arr[] = $tpl['item'];
                        }
                        $data[$index]['template_additional'] = implode('/', $tpl_arr); // dont use the $client array here - changes would not be returned to soap
                    }
                    unset($tpl_arr);
                    unset($tpls);
                }
            }
        }
        
        return $data;
   }
   
   public function client_get_id($session_id, $sys_userid)
@@ -1169,6 +1202,32 @@
               $this->server->fault('permission_denied','You do not have the permissions to access this function.');
               return false;
         }
            
            $app->uses('remoting_lib');
            $old_rec = $app->remoting_lib->getDataRecord($client_id);
            
            // we need the previuos templates assigned here
            $this->oldTemplatesAssigned = $app->db->queryAllRecords('SELECT * FROM `client_template_assigned` WHERE `client_id` = ' . $client_id);
            if(!is_array($this->oldTemplatesAssigned) || count($this->oldTemplatesAssigned) < 1) {
                // check previous type of storing templates
                $tpls = explode('/', $old_rec['template_additional']);
                $this->oldTemplatesAssigned = array();
                foreach($tpls as $item) {
                    $item = trim($item);
                    if(!$item) continue;
                    $this->oldTemplatesAssigned[] = array('assigned_templated_id' => 0, 'client_template_id' => $item, 'client_id' => $client_id);
                }
                unset($tpls);
            }
            if(isset($params['template_additional'])) {
                $app->uses('client_templates');
                $templates = explode('/', $params['template_additional']);
                $params['template_additional'] = '';
                $app->client_templates->update_client_templates($client_id, $templates);
                unset($templates);
            }

            
            if(!isset($params['parent_client_id']) || $params['parent_client_id'] == 0) $params['parent_client_id'] = $reseller_id;
         $affected_rows = $this->updateQuery('../client/form/' . (isset($params['limit_client']) && $params['limit_client'] > 0 ? 'reseller' : 'client') . '.tform.php', $reseller_id, $client_id, $params, 'client:' . ($reseller_id ? 'reseller' : 'client') . ':on_after_update');