Moved dak

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

diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa
index cd04c55d9fb7d2c8bdc8eea85137ececd558f261..daca244002b09b16a9ed32a3c53f6a1122b4c2f0 100755 (executable)
--- a/gosa-core/dh-make-gosa
+++ b/gosa-core/dh-make-gosa
@@ -14,6 +14,10 @@ load_dsc() {
     for dep in $TDEPENDS; do
       PL_DEPENDS="gosa-plugin-$dep, $PL_DEPENDS"
     done
+    TCONFLICTS=$(sed -n 's/"//g;s/^conflicts\s*=\s*\(.*\)$/\1/p' "$1")
+    for dep in $TCONFLICTS; do
+      PL_CONFLICTS="gosa-plugin-$dep, $PL_CONFLICTS"
+    done
     PL_DESCRIPTION=$(sed -n 's/"//g;s/^description\s*=\s*\(.*\)$/\1/p' "$1")
     PL_AUTHOR=$(sed -n 's/"//g;s/^author\s*=\s*\([^<]*\).*$/\1/p' "$1")
     PL_MAIL=$(sed -n 's/"//g;s/^author\s*=[^<].*<\([^>]*\).*$/\1/p' "$1")
@@ -124,6 +128,7 @@ echo "Plugin:       $PL_NAME"
 echo "Version:      $PL_VERSION"
 echo "Description:  $PL_DESCRIPTION"
 echo "Depends:      $PL_DEPENDS"
+echo "Conflicts:    $PL_CONFLICTS"
 echo "Author name:  $PL_AUTHOR"
 echo "Author email: $PL_MAIL"
 echo
@@ -180,7 +185,14 @@ sed -i '/^Upstream/,/^$/d' debian/copyright
 # Adapt control
 sed -i 's/^Section: unknown/Section: web/g' debian/control
 sed -i 's/^Architecture: any/Architecture: all/g' debian/control
-sed -i 's/^Depends: .*$/Depends: gosa/g' debian/control
+if [ "$PL_DEPENDS" ]; then
+       sed -i 's/^Depends: .*$/Depends: gosa, $PL_DEPENDS/g' debian/control
+else
+       sed -i 's/^Depends: .*$/Depends: gosa/g' debian/control
+fi
+if [ "$PL_CONFLICTS" ]; then
+       sed "11Conflicts: $PL_CONFLICTS" debian/control
+fi
 sed -i 's/^\(Build-Depends: .*\)$/\1, dpatch/g' debian/control
 sed -i "s/^Description: .*$/Description: $PL_NAME plugin for GOsa/g" debian/control
 sed -i "s/^ <.*$/ %DESCRIPTION%/g" debian/control

diff --git a/gosa-core/include/class_socketClient.inc b/gosa-core/include/class_socketClient.inc
index dda0f6ec200667dffc501507809ac265f34a9eba..4442e1c5017729efdbccdfd6513655a279c079e7 100644 (file)
--- a/gosa-core/include/class_socketClient.inc
+++ b/gosa-core/include/class_socketClient.inc
@@ -105,7 +105,7 @@ class Socket_Client
     $this->handle = @fsockopen($this->host, $this->port, $this->errno, $this->errstr, $this->timeout);
     if(!$this->handle){
       $this->handle = NULL;
-      $this->set_error(sprintf(_("Socket connection to host '%s:%s' failed with error: %s."),$this->host,$this->port,$this->errstr));
+      $this->set_error(sprintf(_("Socket connection to host '%s:%s' failed: %s"),$this->host,$this->port,$this->errstr));
     }else{
       $this->b_data_send = TRUE;
 

diff --git a/gosa-core/plugins/addons/dak/class_dak_keyring.inc b/gosa-core/plugins/addons/dak/class_dak_keyring.inc
deleted file mode 100644 (file)
index b867d2f..0000000
--- a/gosa-core/plugins/addons/dak/class_dak_keyring.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- * This code is part of GOsa (http://www.gosa-project.org)
- * Copyright (C) 2003-2008 GONICUS GmbH
- *
- * ID: $$Id: class_gotomasses.inc 10967 2008-05-20 13:18:12Z hickert $$
- *
- * 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 dak_keyring extends plugin
-{
-  public function __construct()
-  {
-
-  }
-
-  public function execute()
-  {
-    $smarty= get_smarty();
-    return($smarty->fetch (get_template_path('dak_queue.tpl', TRUE, dirname(__FILE__))));
-  }
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>

diff --git a/gosa-core/plugins/addons/dak/class_dak_queue.inc b/gosa-core/plugins/addons/dak/class_dak_queue.inc
deleted file mode 100644 (file)
index 8e7f377..0000000
--- a/gosa-core/plugins/addons/dak/class_dak_queue.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- * This code is part of GOsa (http://www.gosa-project.org)
- * Copyright (C) 2003-2008 GONICUS GmbH
- *
- * ID: $$Id: class_gotomasses.inc 10967 2008-05-20 13:18:12Z hickert $$
- *
- * 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 dak_queue extends plugin
-{
-  public function __construct()
-  {
-
-  }
-
-  public function execute()
-  {
-    $smarty= get_smarty();
-    return($smarty->fetch (get_template_path('dak_queue.tpl', TRUE, dirname(__FILE__))));
-  }
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>

diff --git a/gosa-core/plugins/addons/dak/class_dak_repository.inc b/gosa-core/plugins/addons/dak/class_dak_repository.inc
deleted file mode 100644 (file)
index 614fff3..0000000
--- a/gosa-core/plugins/addons/dak/class_dak_repository.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/*
- * This code is part of GOsa (http://www.gosa-project.org)
- * Copyright (C) 2003-2008 GONICUS GmbH
- *
- * ID: $$Id: class_gotomasses.inc 10967 2008-05-20 13:18:12Z hickert $$
- *
- * 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 dak_repository extends plugin
-{
-  public function __construct()
-  {
-
-  }
-
-  public function execute()
-  {
-    $smarty= get_smarty();
-    return($smarty->fetch (get_template_path('dak_queue.tpl', TRUE, dirname(__FILE__))));
-  }
-
-
-  static function plInfo()
-  {
-    return (array(
-          "plShortName"   => _("Repository"),
-          "plDescription" => _("DAK repository"),
-          "plSelfModify"  => FALSE,
-          "plDepends"     => array(),
-          "plPriority"    => 0,
-          "plSection"       => array("addon"),
-          "plCategory"      => array("dak"       => array("objectClass" => "none", "description" => _("DAK"))),
-          "plProvidedAcls"  => array("Comment"   => _("Description")) 
-          ));
-  }
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>

diff --git a/gosa-core/plugins/addons/dak/main.inc b/gosa-core/plugins/addons/dak/main.inc
deleted file mode 100644 (file)
index 287cd09..0000000
--- a/gosa-core/plugins/addons/dak/main.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
-  This code is part of GOsa (https://gosa.gonicus.de)
-  Copyright (C) 2003  Cajus Pollmeier
-
-  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
-*/
-if (!$remove_lock){
-       if (!session::is_set('dak_tabs') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-               session::set('dak_tabs',new dak_tabs($config, $config->data['TABS']['DAK_TABS'],""));
-       }
-       $dak_tabs = session::get('dak_tabs');
-
-       /* Execute formular */
-#      $display= $dak_tabs->save_object();
-       $display= $dak_tabs->execute ();
-       $display.= "<input type=\"hidden\" name=\"ignore\">\n";
-
-       /* Page header*/
-       $display= print_header(get_template_path('images/dak.png'), _("DAK")).$display;
-
-       /* Store changes  in session */
-       session::set('dak_tabs',$dak_tabs);
-}
-?>

diff --git a/gosa-core/plugins/addons/dak/tabs_dak.inc b/gosa-core/plugins/addons/dak/tabs_dak.inc
deleted file mode 100644 (file)
index b64676d..0000000
--- a/gosa-core/plugins/addons/dak/tabs_dak.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-class dak_tabs extends tabs
-{
-  var $plHeadline   = "DAK";
-  var $plDescription= "This does something";
-
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index ffef24b70779c2791a15b2a8aff15d1579dbe917..b26e61fdccb9c65de055337797823bcb31af3b15 100644 (file)
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -1146,7 +1146,7 @@ class user extends plugin
       foreach($temp['name'] as $id => $name){
         if($name == $this->pw_storage){
           if($temp['is_configurable'][$id] && !$this->pwObject instanceof $temp[$name] ){
-            $message[] = _("The selected password method a requires initial configuration.");
+            $message[] = _("The selected password method requires initial configuration!");
           }
           break;
         }