- Fixed FS#2968 - linux user and group deletion order is wrong when a clien...

ftimme

2013-06-11 0889fc96ec5788d598ad5bc6a69f27330797db44

- Fixed FS#2968 - linux user and group deletion order is wrong when a client gets deleted.

 interface/web/client/client_del.php

@@ -97,6 +97,7 @@
        }
        
        $app->tpl->setVar('id',$this->id);
        $app->tpl->setVar('number_records',$number);
        $app->tpl->setLoop('records', $table_list);
        
        //* load language file 

 interface/web/client/lib/lang/de_client_del.lng

@@ -3,4 +3,5 @@
$wb['delete_explanation'] = 'Diese Aktion wird folgende Anzahl an Datensätzen des Kunden löschen';
$wb['btn_save_txt'] = 'Kunden löschen';
$wb['btn_cancel_txt'] = 'Abbrechen, ohne den Kunden zu löschen';
$wb["confirm_client_delete_txt"] = 'Sind Sie sicher, daß Sie den Kunden löschen möchten?';
?>

 interface/web/client/lib/lang/en_client_del.lng

@@ -3,4 +3,5 @@
$wb["delete_explanation"] = 'This action will delete the following number of records associated with this client';
$wb["btn_save_txt"] = 'Delete the client';
$wb["btn_cancel_txt"] = 'Cancel without deleting the client';
$wb["confirm_client_delete_txt"] = 'Are you sure you want to delete this client?';
?>

 interface/web/client/templates/client_del.htm

@@ -6,10 +6,14 @@
    <div class="pnl_formsarea">

        <div id="OKMsg">
            <tmpl_if name='number_records'>
            <tmpl_var name="delete_explanation">:<br /><br />
                <tmpl_loop name="records">
                    <tmpl_var name="table">, 
                </tmpl_loop>
            </tmpl_else>
                <tmpl_var name="confirm_client_delete_txt">
            </tmpl_if>
        </div>

        <input type="checkbox" name="confirm" value="yes" /> <b><tmpl_var name="confirm_action_txt"></b>

 server/plugins-available/apache2_plugin.inc.php

@@ -2766,9 +2766,11 @@
                $app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG);
            }
            
            if($app->system->is_group('client'.$client_id)){
            $this->_exec('groupdel client'.$client_id);
            $app->log('Removed group client'.$client_id,LOGLEVEL_DEBUG);
        }
        }
        
    }


 server/plugins-available/nginx_plugin.inc.php

@@ -2526,9 +2526,11 @@
                $app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG);
            }
            
            if($app->system->is_group('client'.$client_id)){
            $this->_exec('groupdel client'.$client_id);
            $app->log('Removed group client'.$client_id,LOGLEVEL_DEBUG);
        }
        }
        
    }