diff --git a/plugins/admin/systems/class_serverService.inc b/plugins/admin/systems/class_serverService.inc
index f0360e9a16cb95800abd23fee6b0faf2925330a6..57138cca822a692c1887f988ebdad9f2e9fb58f0 100644 (file)
define("START_SERVICE",1);
define("STOP_SERVICE",2);
-define("RESET_SERVICE",3);
+define("RESTART_SERVICE",3);
-define("SERVICE_STOPPED","stopped");
-define("SERVICE_STARTED","started");
-define("SERVICE_RESETTED","resetted");
+define("SERVICE_STOPPED",_("Stop"));
+define("SERVICE_STARTED",_("Start"));
+define("SERVICE_RESTARTED",_("Restart"));
define("ALL_SERVICES",100);
var $current = "";
var $backup = NULL;
var $acl ;
+ var $cn;
function ServerService ($config, $dn)
{
$PossiblePosts = array("addNewService" => "",
"startServices" => "",
"stopServices" => "",
- "resetServices" => "",
+ "restartServices" => "",
"removeServices" => "",
"StartSingleService" => "/^StartSingleService_(.*)_[xy]$/",
"StopSingleService" => "/^StopSingleService_(.*)_[xy]$/",
- "ResetSingleService" => "/^ResetSingleService_(.*)_[xy]$/",
+ "RestartSingleService" => "/^RestartSingleService_(.*)_[xy]$/",
"RemoveSingleService" => "/^RemoveSingleService_(.*)_[xy]$/",
"EditSingleService" => "/^EditSingleService_(.*)_[xy]$/");
/* Handle state changes for services */
$map = array( "startServices" => array("type" => START_SERVICE , "service" => ALL_SERVICES),
"stopServices" => array("type" => STOP_SERVICE , "service" => ALL_SERVICES),
- "resetServices" => array("type" => RESET_SERVICE , "service" => ALL_SERVICES),
- "StartSingleService" => array("type" => START_SERVICE , "service" => $s_entry),
+ "restartServices" => array("type" => RESTART_SERVICE , "service" => ALL_SERVICES), "StartSingleService" => array("type" => START_SERVICE , "service" => $s_entry),
"StopSingleService" => array("type" => STOP_SERVICE , "service" => $s_entry),
- "ResetSingleService" => array("type" => RESET_SERVICE , "service" => $s_entry));
+ "RestartSingleService" => array("type" => RESTART_SERVICE , "service" => $s_entry));
if(isset($map[$s_action])){
$type = $map[$s_action]['type'];
$service = $map[$s_action]['service'];
/* Abort dialog */
if(isset($_POST['SaveService'])){
-
+ $this->dialog->save_object();
$msgs = $this->dialog->check();
if(count($msgs)){
foreach($msgs as $msg){
}
}else{
$this->plugins[$this->current] = $this->dialog;
+ $tmp = get_object_vars($this->dialog);
+ foreach($tmp as $name => $value){
+ $this->plugins[$this->current]->$name = $value;
+ }
$this->current = "";
$this->dialog = NULL;
$this->backup = NULL;
/* Abort dialog */
- if(isset($_POST['SaveServiceAdd'])){
+ if((isset($_POST['SaveServiceAdd'])) && (!empty($_POST['ServiceName']))){
$serv = $_POST['ServiceName'];
$this->plugins[$serv]->is_account = true;
$this->dialog = $this->plugins[$serv];
/* Dispaly services overview */
$this->divList->execute();
$list = array();
+
foreach($this->plugins as $name => $obj){
if($obj->is_account){
- $list[$name] = $obj->getListEntry();
+ $list[$name] = $this->plugins[$name]->getListEntry();
}
}
$this->divList -> setEntries($list);
$action = SERVICE_STARTED;
}elseif($method== STOP_SERVICE){
$action = SERVICE_STOPPED;
- }elseif($method == RESET_SERVICE){
- $action = SERVICE_RESETTED;
+ }elseif($method == RESTART_SERVICE){
+ $action = SERVICE_RESTARTED;
}else{
print_red(sprintf(_("The specified method '%s' can't executed for services."),$action));
return;
}
+ $caseVars = array("cn","dn");
if($service == ALL_SERVICES){
foreach($this->plugins as $name => $obj){
- if($this->plugins[$name]->is_account){
- $this->plugins[$name]->setStatus($action);
+ foreach($caseVars as $var){
+ if(isset($this->$var)){
+ $this->plugins[$name]->$var = $this->$var;
+ }
+ }
+
+ /* check if services can be restarted */
+ $map =array(SERVICE_STARTED=> "AllowStart" ,
+ SERVICE_STOPPED => "AllowStop",
+ SERVICE_RESTARTED => "AllowRestart");
+
+ /* get plugins informations, restart/start/stop actions allowed ?*/
+ $tmp = $this->plugins[$name]->getListEntry();
+
+ /* Check if given action is allowed for this service */
+ if($tmp[$map[$action]]){
+ if($this->plugins[$name]->initially_was_account && $this->plugins[$name]->is_account){
+ $this->plugins[$name]->setStatus($action);
+ }
}
}
}else{
+ foreach($caseVars as $var){
+ if(isset($this->$var)){
+ $this->plugins[$service]->$var = $this->$var;
+ }
+ }
if($this->plugins[$service]->is_account){
$this->plugins[$service]->setStatus($action);
}