removed old glpi class

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2372 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/main.php b/html/main.php
index afebb93525cac33ce0b4a2a9b959fda6d6fd0629..c7e9e1d3fe6d763012ef794ccc32c69c48a6df30 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -318,7 +318,7 @@ $display= $header.$smarty->fetch(get_template_path('framework.tpl'));
 }
 */
 
-if ((isset($config->data['MAIN']['W3CTEST']) && preg_match('/true/i', $config->data['MAIN']['W3CTEST']))&&(!empty($display))) {
+if ((isset($config->data['MAIN']['W3CTEST']) && preg_match('/true/i', $config->data['MAIN']['W3CTEST']))&&(!empty($display))&&(is_callable("tidy_parse_string"))) {
   tidy_parse_string(utf8_decode($display));
   $err = nl2br(htmlentities(tidy_get_error_buffer()));
   

diff --git a/plugins/personal/connectivity/class_glpiAccount.inc b/plugins/personal/connectivity/class_glpiAccount.inc
deleted file mode 100644 (file)
index 60f314c..0000000
--- a/plugins/personal/connectivity/class_glpiAccount.inc
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/*
-  This code is part of GOsa (https://gosa.gonicus.de)
-  Copyright (C) 2005 Benoit Mortier
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-class glpiAccount extends plugin
-{
-  /* Definitions */
-  var $plHeadline= "GLPI";
-  var $plDescription= "This does something";
-
-  /* CLI vars */
-  var $cli_summary= "Manage users gpli account";
-  var $cli_description= "Some longer text\nfor help";
-  var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
-  /* attribute list for save action */
-  var $attributes= array();
-  var $objectclasses= array("glpiAccount");
-
-  function glpiAccount ($config, $dn= NULL)
-  {
-    plugin::plugin ($config, $dn);
-  }
-
-  function execute()
-  {
-       /* Call parent execute */
-       //plugin::execute();
-
-    /* Show tab dialog headers */
-    $display= "";
-
-    /* Show main page */
-    $smarty= get_smarty();
-
-    if ($this->is_account){
-      $smarty->assign("glpiState", "checked");
-    } else {
-      $smarty->assign("glpiState", "");
-      $smarty->assign("wstate", "disabled");
-    }
-
-    if ($this->parent != NULL){
-      $smarty->assign("tabbed", 1);
-    }
-
-    $smarty->assign('glpiACL', chkacl($this->acl, 'gosaglpi'));
-
-    $display.= $smarty->fetch (get_template_path('glpi.tpl', TRUE, dirname(__FILE__)));
-    return ($display);
-  }
-
-  function remove_from_parent()
-  {
-    /* Cancel if there's nothing to do here */
-    if (!$this->initially_was_account){
-      return;
-    }
-
-    plugin::remove_from_parent();
-    $ldap= $this->config->get_ldap_link();
-
-    $ldap->cd($this->dn);
-    @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
-        $this->attributes, "Save");
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
-
-    /* Optionally execute a command after we're done */
-    $this->handle_post_events('remove');
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* Do we need to flip is_account state? */
-    if (isset($_POST['connectivityTab'])){
-      if (isset($_POST['glpi'])){
-        if (!$this->is_account && $_POST['glpi'] == "B"){
-          $this->is_account= TRUE;
-        }
-      } else {
-        $this->is_account= FALSE;
-      }
-    }
-
-    plugin::save_object();
-    if (isset($_POST["glpiStatus"])){
-      $this->glpiStatus = "disabled";
-    } else {
-      $this->glpiStatus = "enabled";
-    }
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    plugin::save();
-
-    /* Write back to ldap */
-    $ldap= $this->config->get_ldap_link();
-    $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
-
-    /* Optionally execute a command after we're done */
-    if ($this->initially_was_account == $this->is_account){
-      if ($this->is_modified){
-        $this->handle_post_events("mofify");
-      }
-    } else {
-      $this->handle_post_events("add");
-    }
-
-  }
-
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>