Undo previous commit

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13671 594d385d-05f5-0310-b6e9-bd551577e9d8

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 f48649c984a5f7de70f560c67c0fc1ae42ba31a7..1134f1cd7fc3927a1297dda5570c10732b632f3e 100644 (file)
--- 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  = '<p>';
-      while(($attrs = $ldap->fetch()) && $i >= 0){
-        $i --;
-        if(isset($attrs['dn'])){
-          $str .= '<i>' . $attrs['dn']."</i><br/>";
-        }
-      }
-      $str .= '</p>';
-      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 1c25a6107a6072b1ed6b1581d875b855ada8c67b..eb1a60566e9c212518d0ed5c98b2b48cd212c746 100644 (file)
--- 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 958d05dddbb635e47695abdce73e2896bc134a8c..92e6f14a26de0fd0b586efeecb88c5b7c65afb10 100644 (file)
--- 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 ""