From 771102f5555b9269e0ec312cd147b54ceb51c8cf Mon Sep 17 00:00:00 2001 From: psc Date: Wed, 27 May 2009 09:54:39 +0000 Subject: [PATCH] Undo previous commit git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13671 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/services/class_goService.inc | 23 ------------------- .../systems/locale/de/LC_MESSAGES/messages.po | 4 ---- trunk/gosa-plugins/systems/locale/messages.po | 4 ---- 3 files changed, 31 deletions(-) diff --git a/trunk/gosa-plugins/systems/admin/systems/services/class_goService.inc b/trunk/gosa-plugins/systems/admin/systems/services/class_goService.inc index f48649c98..1134f1cd7 100644 --- a/trunk/gosa-plugins/systems/admin/systems/services/class_goService.inc +++ b/trunk/gosa-plugins/systems/admin/systems/services/class_goService.inc @@ -257,29 +257,6 @@ class goService extends plugin{ $this->$flag = $attrs[$flag][0]; } } - - function allow_remove() - { - /* Check if the service is still in use */ - $ldap = $this->config->get_ldap_link(); - $ldap->cd($this->config->current['BASE']); - $cn = $ldap->getCn($this->dn); - $ldap->search("(&(|(objectClass=posixGroup)(objectClass=posixAccount))(gotoShare=$cn|*))", array("dn")); - - if($ldap->count()){ - /* Number of entries shown in warning */ - $i = 3; - $str = '

'; - while(($attrs = $ldap->fetch()) && $i >= 0){ - $i --; - if(isset($attrs['dn'])){ - $str .= '' . $attrs['dn']."
"; - } - } - $str .= '

'; - return(sprintf(_("Cannot remove share - it is still in use by these objects: %s"), $str)); - } - } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/trunk/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po b/trunk/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po index 1c25a6107..eb1a60566 100644 --- a/trunk/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po +++ b/trunk/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po @@ -280,10 +280,6 @@ msgstr "Leerer Dienst" msgid "Configuration error" msgstr "Konfigurationsfehler" -#: admin/systems/services/class_goService.inc:280 -msgid "Cannot remove share - it is still in use by these objects: %s" -msgstr "Freigabe kann nicht entfernt werden - sie wird noch von diesen Objekten benutzt: %s" - #: admin/systems/services/ServiceAddDialog.tpl:3 msgid "Adding a new service to the current server" msgstr "Hinzufügen eines neues Dienstes zum gewählten Server" diff --git a/trunk/gosa-plugins/systems/locale/messages.po b/trunk/gosa-plugins/systems/locale/messages.po index 958d05ddd..92e6f14a2 100644 --- a/trunk/gosa-plugins/systems/locale/messages.po +++ b/trunk/gosa-plugins/systems/locale/messages.po @@ -512,10 +512,6 @@ msgstr "" msgid "Restart" msgstr "" -#: admin/systems/services/class_goService.inc:280 -msgid "Cannot remove share - it is still in use by these objects: %s" -msgstr "" - #: admin/systems/class_serverService.inc:351 msgid "Information" msgstr "" -- 2.30.2