Bugfix: _ispconfig_pw_crypted was ignored (stripped off in encoding method)

mcramer

2012-11-27 7990f8881b085279269d35cf9dd2787b88ae1c08

 interface/lib/classes/client_templates.inc.php

@@ -12,6 +12,8 @@
   function apply_client_templates($clientId) {
        global $app;
        
        include('../client/form/client.tform.php');
        
        /*
         * Get the master-template for the client
         */
@@ -42,11 +44,14 @@
            if (trim($item) != ''){
                $sql = "SELECT * FROM client_template WHERE template_id = " . $app->functions->intval($item);
                $addLimits = $app->db->queryOneRecord($sql);
                $app->log('Template processing subtemplate ' . $item . ' for client ' . $clientId, LOGLEVEL_DEBUG);
                /* maybe the template is deleted in the meantime */
                if (is_array($addLimits)){
                    foreach($addLimits as $k => $v){
                        /* we can remove this condition, but it is easier to debug with it (don't add ids and other non-limit values) */
                        if (strpos($k, 'limit') !== false){
                        if (strpos($k, 'limit') !== false or $k == 'ssh_chroot' or $k == 'web_php_options' or $k == 'force_suexec'){
                            $app->log('Template processing key ' . $k . ' for client ' . $clientId, LOGLEVEL_DEBUG);

                            /* process the numerical limits */
                            if (is_numeric($v)){
                                /* switch for special cases */
@@ -71,7 +76,7 @@
                            }
                            /* process the string limits (CHECKBOXARRAY, SELECT etc.) */
                            elseif (is_string($v)){
                                switch ($app->tform->formDef["tabs"]["limits"]["fields"][$k]['formtype']){
                                switch ($form["tabs"]["limits"]["fields"][$k]['formtype']){
                                case 'CHECKBOXARRAY':
                                    if (!isset($limits[$k])){
                                        $limits[$k] = array();
@@ -79,20 +84,34 @@

                                    $limits_values = $limits[$k];
                                    if (is_string($limits[$k])){
                                        $limits_values = explode($app->tform->formDef["tabs"]["limits"]["fields"][$k]["separator"],$limits[$k]);
                                        $limits_values = explode($form["tabs"]["limits"]["fields"][$k]["separator"],$limits[$k]);
                                    }
                                    $additional_values = explode($app->tform->formDef["tabs"]["limits"]["fields"][$k]["separator"],$v);

                                    $additional_values = explode($form["tabs"]["limits"]["fields"][$k]["separator"],$v);
                                    $app->log('Template processing key ' . $k . ' type CHECKBOXARRAY, lim / add: ' . implode(',', $limits_values) . ' / ' . implode(',', $additional_values) . ' for client ' . $clientId, LOGLEVEL_DEBUG);
                                    /* unification of limits_values (master template) and additional_values (additional template) */
                                    $limits_unified = array();
                                    foreach($app->tform->formDef["tabs"]["limits"]["fields"][$k]["value"] as $key => $val){
                                    foreach($form["tabs"]["limits"]["fields"][$k]["value"] as $key => $val){
                                        if (in_array($key,$limits_values) || in_array($key,$additional_values)) $limits_unified[] = $key;
                                    }
                                    $limits[$k] = implode($app->tform->formDef["tabs"]["limits"]["fields"][$k]["separator"],$limits_unified);
                                    $limits[$k] = implode($form["tabs"]["limits"]["fields"][$k]["separator"],$limits_unified);
                                break;
                                
                                case 'CHECKBOX':
                                    if($k == 'force_suexec') {
                                        // 'n' is less limited than y
                                        if (!isset($limits[$k])){
                                            $limits[$k] = 'y';
                                        }
                                        if($limits[$k] == 'n' || $v == 'n') $limits[$k] = 'n';
                                    } else {
                                        // 'y' is less limited than n
                                        if (!isset($limits[$k])){
                                            $limits[$k] = 'n';
                                        }
                                        if($limits[$k] == 'y' || $v == 'y') $limits[$k] = 'y';
                                    }
                                break;
                                case 'SELECT':
                                    $limit_values = array_keys($app->tform->formDef["tabs"]["limits"]["fields"][$k]["value"]);
                                    $limit_values = array_keys($form["tabs"]["limits"]["fields"][$k]["value"]);
                                    /* choose the lower index of the two SELECT items */
                                    $limits[$k] = $limit_values[min(array_search($limits[$k], $limit_values), array_search($v, $limit_values))];
                                break;
@@ -114,9 +133,11 @@
                $update .= '`' . $k . "`='" . $v . "'";
            }
        }
        $app->log('Template processed for client ' . $clientId . ', update string: ' . $update, LOGLEVEL_DEBUG);
        if($update != '') {
            $sql = 'UPDATE client SET ' . $update . " WHERE client_id = " . $app->functions->intval($clientId);
            $app->db->query($sql);
        }
        unset($form);
    }
}