From b26a41b85053ec5af0c00d7b0c37d13b458237a8 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 23 Apr 2008 12:46:50 +0000 Subject: [PATCH] Fixed wrong msg_dialog handling git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10651 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../addressbook/addons/addressbook/class_addressbook.inc | 4 ++-- .../goto/admin/systems/goto/class_terminalService.inc | 2 +- .../goto/admin/systems/goto/class_terminalStartup.inc | 2 +- .../goto/admin/systems/goto/class_workstationService.inc | 2 +- .../goto/admin/systems/goto/class_workstationStartup.inc | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc index e60b48f78..7e05dc721 100644 --- a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc +++ b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc @@ -211,7 +211,7 @@ class addressbook extends plugin /* Normally this shouldn't be reached, send some extra logs to notify the administrator */ - msg_dialog::permDelete($this->dn); + msg_dialog::display(_("Permission"),permDelete($this->dn),ERROR_DIALOG); new log("remove","addressbook/".get_class($this),$this->dn,array(),"Warning: '".$this->ui->uid."' tried to trick address book deletion."); } @@ -319,7 +319,7 @@ class addressbook extends plugin /* Obviously the user isn't allowed to delete. Show message and clean session. */ - msg_dialog::permDelete($this->dn); + msg_dialog::display(_("Permission"),permDelete($this->dn),ERROR_DIALOG); } } session::set('show_info',"ADD"); diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc index 286b07cdb..1fec80d9c 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc @@ -107,7 +107,7 @@ class termservice extends plugin } } }else{ - msg_dialog(_("Configuration error"), msgPool::cannotReadFile($file), WARNING_DIALOG); + msg_dialog::display(_("Configuration error"), msgPool::cannotReadFile($file), WARNING_DIALOG); } } diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc index 32176e7d0..ad5616739 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc @@ -204,7 +204,7 @@ class termstartup extends plugin if(isset($_POST['gotoShareAdd']) && $this->acl_is_writeable("gotoShare")){ /* We assign a share to this user, if we don't know where to mount the share */ if((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))||(preg_match("/[\|]/i",$_POST['gotoShareMountPoint']))){ - msg_dialog(_("Error"), msgPool::invalid(_("Mount point")), WARNING_DIALOG); + msg_dialog::display(_("Error"), msgPool::invalid(_("Mount point")), WARNING_DIALOG); }else{ $a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']]; $s_mount = $_POST['gotoShareMountPoint']; diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc index dcd5704e1..c7b73b6d0 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc @@ -76,7 +76,7 @@ class workservice extends plugin } //natcasesort($this->gotoXResolutions); }else{ - msg_dialog(_("Configuration error"), msgPool::cannotReadFile($file), WARNING_DIALOG); + msg_dialog::display(_("Configuration error"), msgPool::cannotReadFile($file), WARNING_DIALOG); } } diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc index 91ffbb1d0..b138c10b3 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc @@ -371,7 +371,7 @@ class workstartup extends plugin } if((isset($this->FAIclassInfo[$_POST['FAIclassesSel']]['FAIpartitionTable']))&&($found>0)){ - msg_dialog(_("Error"), _("There is already a profile containing a partition table in your configuration!") , ERROR_DIALOG); + msg_dialog::display(_("Error"), _("There is already a profile containing a partition table in your configuration!") , ERROR_DIALOG); }else{ $this->FAIclass[$_POST['FAIclassesSel']]=$_POST['FAIclassesSel']; } @@ -479,7 +479,7 @@ class workstartup extends plugin if((isset($_POST['gotoShareAdd'])) && ($this->acl_is_writeable("gotoShare"))) { /* We assign a share to this user, if we don't know where to mount the share */ if((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))||(preg_match("/[\|]/i",$_POST['gotoShareMountPoint']))){ - msg_dialog(_("Error"), msgPool::required(_("Mount point")), ERROR_DIALOG); + msg_dialog::display(_("Error"), msgPool::required(_("Mount point")), ERROR_DIALOG); }else{ if(count($this->gotoAvailableShares)){ $a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']]; @@ -1320,9 +1320,9 @@ class workstartup extends plugin $res = shell_exec($cmd); $res2 = trim($res); if((!$res)){ - msg_dialog(_("Configuration error"), msgPool::cmdexecfailed("REPOSITORY_HOOK", $cmd), ERROR_DIALOG); + msg_dialog::display(_("Configuration error"), msgPool::cmdexecfailed("REPOSITORY_HOOK", $cmd), ERROR_DIALOG); }elseif(empty($res2)){ - msg_dialog(_("Configuration error"), _("REPOSITORY_HOOK returned no result!"), ERROR_DIALOG); + msg_dialog::display(_("Configuration error"), _("REPOSITORY_HOOK returned no result!"), ERROR_DIALOG); }else{ $tmp = split("\n",$res); foreach($tmp as $line){ -- 2.30.2