summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2012-07-24 21:04:32 +0000
committerMatti Bickel <mabi@gentoo.org>2012-07-24 21:04:32 +0000
commita44aa6ef0cd40728f76fe23dc17c41c23f905d41 (patch)
tree21aac57b398a90abc7e55387362d00f9a5bd9017 /www-apps
parentwhitespace (diff)
downloadhistorical-a44aa6ef0cd40728f76fe23dc17c41c23f905d41.tar.gz
historical-a44aa6ef0cd40728f76fe23dc17c41c23f905d41.tar.bz2
historical-a44aa6ef0cd40728f76fe23dc17c41c23f905d41.zip
removing phpgroupware, use egroupware instead
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/phpgroupware/ChangeLog309
-rw-r--r--www-apps/phpgroupware/Manifest7
-rw-r--r--www-apps/phpgroupware/files/phpgroupware-SA35519.patch145
-rw-r--r--www-apps/phpgroupware/files/postinstall-en.txt10
-rw-r--r--www-apps/phpgroupware/metadata.xml5
-rw-r--r--www-apps/phpgroupware/phpgroupware-0.9.16.012-r1.ebuild39
-rw-r--r--www-apps/phpgroupware/phpgroupware-0.9.16.012.ebuild37
7 files changed, 0 insertions, 552 deletions
diff --git a/www-apps/phpgroupware/ChangeLog b/www-apps/phpgroupware/ChangeLog
deleted file mode 100644
index 945bb9b7852e..000000000000
--- a/www-apps/phpgroupware/ChangeLog
+++ /dev/null
@@ -1,309 +0,0 @@
-# ChangeLog for www-apps/phpgroupware
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/ChangeLog,v 1.39 2009/08/27 20:33:18 beandog Exp $
-
- 27 Aug 2009; Steve Dibb <beandog@gentoo.org>
- phpgroupware-0.9.16.012-r1.ebuild:
- amd64 stable, bug 278864
-
- 25 Aug 2009; Tobias Klausmann <klausman@gentoo.org>
- phpgroupware-0.9.16.012-r1.ebuild:
- Stable on alpha, bug #278864
-
- 23 Aug 2009; nixnut <nixnut@gentoo.org> phpgroupware-0.9.16.012-r1.ebuild:
- ppc stable #278864
-
-*phpgroupware-0.9.16.012-r1 (12 Aug 2009)
-
- 12 Aug 2009; Alex Legler <a3li@gentoo.org>
- +files/phpgroupware-SA35519.patch, +phpgroupware-0.9.16.012-r1.ebuild:
- Non-maintainer commit: Version bump for security bug 278864.
-
- 23 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
- phpgroupware-0.9.16.012.ebuild:
- ebuild cleanup wrt #208584
-
- 10 Sep 2007; <wrobel@gentoo.org> -phpgroupware-0.9.16.008.ebuild,
- -phpgroupware-0.9.16.010.ebuild, -phpgroupware-0.9.16.011.ebuild:
- Removed insecure versions (see #189253).
-
- 07 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org>
- phpgroupware-0.9.16.012.ebuild:
- ppc stable, bug #189253
-
- 05 Sep 2007; Christoph Mende <angelos@gentoo.org>
- phpgroupware-0.9.16.012.ebuild:
- Stable on amd64 wrt security bug #189253
-
- 04 Sep 2007; Raúl Porcel <armin76@gentoo.org>
- phpgroupware-0.9.16.012.ebuild:
- alpha stable wrt security #189253
-
-*phpgroupware-0.9.16.012 (04 Sep 2007)
-
- 04 Sep 2007; <wrobel@gentoo.org> +phpgroupware-0.9.16.012.ebuild:
- Added phpgroupware-0.9.16.012 to the tree (response to #189253)
-
- 22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
- Redigest for Manifest2
-
- 03 Sep 2006; Thomas Cort <tcort@gentoo.org>
- phpgroupware-0.9.16.011.ebuild:
- Stable on alpha wrt security Bug #145706.
-
- 03 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org>
- phpgroupware-0.9.16.011.ebuild:
- ppc stable, bug #145706
-
- 02 Sep 2006; <blubb@gentoo.org> phpgroupware-0.9.16.011.ebuild:
- stable on amd64 wrt bug 145706
-
-*phpgroupware-0.9.16.011 (02 Sep 2006)
-
- 02 Sep 2006; Renat Lumpau <rl03@gentoo.org>
- +phpgroupware-0.9.16.011.ebuild:
- Version bump, bug #145706.
-
-*phpgroupware-0.9.16.010 (18 Dec 2005)
-
- 18 Dec 2005; Renat Lumpau <rl03@gentoo.org>
- +phpgroupware-0.9.16.010.ebuild:
- Version bump
-
- 16 Sep 2005; Aron Griffis <agriffis@gentoo.org>
- phpgroupware-0.9.16.008.ebuild:
- Mark 0.9.16.008 stable on alpha
-
- 28 Aug 2005; Renat Lumpau <rl03@gentoo.org>
- -phpgroupware-0.9.16.006.ebuild, -phpgroupware-0.9.16.007.ebuild:
- Removing vulnerable versions
-
- 28 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
- phpgroupware-0.9.16.008.ebuild:
- Stable on ppc.
-
- 28 Aug 2005; Luis Medinas <metalgod@gentoo.org>
- phpgroupware-0.9.16.008.ebuild:
- Marked Stable on AMD64. Fixes bug #102379.
-
-*phpgroupware-0.9.16.008 (27 Aug 2005)
-
- 27 Aug 2005; Renat Lumpau <rl03@gentoo.org>
- +phpgroupware-0.9.16.008.ebuild:
- Version bump wrt security bug #102379
-
-*phpgroupware-0.9.16.007 (24 Aug 2005)
-
- 24 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
- +phpgroupware-0.9.16.007.ebuild:
- Version bump wrt security bug #102379
-
- 22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
- Housekeeping
-
- 22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
- phpgroupware-0.9.16.006.ebuild:
- Housekeeping
-
- 06 Jul 2005; Simon Stelling <blubb@gentoo.org>
- -phpgroupware-0.9.16.004.ebuild, -phpgroupware-0.9.16.005.ebuild:
- removing old versions per comment #7 in bug 97460
-
- 06 Jul 2005; Simon Stelling <blubb@gentoo.org>
- phpgroupware-0.9.16.006.ebuild:
- marked stable on amd64 wrt bug 97460
-
- 06 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
- phpgroupware-0.9.16.006.ebuild:
- Stable on ppc.
-
-*phpgroupware-0.9.16.006 (06 Jul 2005)
-
- 06 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
- -phpgroupware-0.9.16.003.ebuild, +phpgroupware-0.9.16.006.ebuild:
- Version bump for security bug 97460.
-
- 06 Jan 2005; Lars Weiler <pylon@gentoo.org>
- phpgroupware-0.9.16.004.ebuild:
- Stable on ppc, bug #74487.
-
- 05 Jan 2005; Simon Stelling <blubb@gentoo.org>
- phpgroupware-0.9.16.005.ebuild:
- stable on amd64; bug #74487
-
-*phpgroupware-0.9.16.005 (04 Jan 2005)
-
- 04 Jan 2005; Martin Holzer <mholzer@gentoo.org>
- +phpgroupware-0.9.16.005.ebuild:
- Version bumped.
-
-*phpgroupware-0.9.16.004 (02 Jan 2005)
-
- 02 Jan 2005; Martin Holzer <mholzer@gentoo.org>
- +phpgroupware-0.9.16.004.ebuild:
- Version bumped. Security bump. See 74487
-
- 15 Sep 2004; Danny van Dyk <kugelfang@gentoo.org>
- phpgroupware-0.9.16.003.ebuild:
- Marked stable on amd64.
-
-*phpgroupware-0.9.16.003 (08 Sep 2004)
-
- 08 Sep 2004; Renat Lumpau <rl03@gentoo.org> +phpgroupware-0.9.16.003.ebuild:
- Version bump, see bug #63063.
-
- 05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
- Fixed ChangeLog header.
-
- 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
- phpgroupware-0.9.16.000.ebuild, phpgroupware-0.9.16.001.ebuild,
- phpgroupware-0.9.16.002-r1.ebuild, phpgroupware-0.9.16.002.ebuild:
- Masked phpgroupware-0.9.16.002.ebuild stable for ppc
-
- 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
- phpgroupware-0.9.16.000.ebuild, phpgroupware-0.9.16.001.ebuild,
- phpgroupware-0.9.16.002-r1.ebuild:
- Masked phpgroupware-0.9.16.002-r1.ebuild stable for ppc
-
- 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
- phpgroupware-0.9.16.000.ebuild, phpgroupware-0.9.16.001.ebuild:
- Masked phpgroupware-0.9.16.001.ebuild stable for ppc
-
- 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
- phpgroupware-0.9.16.000.ebuild:
- Masked phpgroupware-0.9.16.000.ebuild stable for ppc
-
- 30 Aug 2004; Renat Lumpau <rl03@gentoo.org>
- phpgroupware-0.9.16.002-r1.ebuild:
- Fixed DEPEND/RDEPEND, removed unneeded src_compile
-
-*phpgroupware-0.9.16.002-r1 (19 Aug 2004)
-
- 19 Aug 2004; Renat Lumpau <rl03@gentoo.org> +files/postinstall-en.txt,
- +phpgroupware-0.9.16.002-r1.ebuild:
- Updated for webapp.eclass (bug #58376)
-
-*phpgroupware-0.9.16.002 (19 Aug 2004)
-
- 19 Aug 2004; Renat Lumpau <rl03@gentoo.org> +metadata.xml,
- +phpgroupware-0.9.16.000.ebuild, +phpgroupware-0.9.16.001.ebuild,
- +phpgroupware-0.9.16.002.ebuild:
- Moved from dev-php/phpgroupware to www-apps/phpgroupware.
-
-*phpgroupware-0.9.16.002 (27 Jul 2004)
-
- 27 Jul 2004; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.16.002.ebuild:
- Version bumped.
-
-*phpgroupware-0.9.16.001 (21 Jul 2004)
-
- 21 Jul 2004; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.16.001.ebuild:
- Version bumped.
-
- 26 May 2004; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.16.000.ebuild:
- removing mysql from depend. closes 52104
-
- 17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
- phpgroupware-0.9.14.007.ebuild, phpgroupware-0.9.16.000.ebuild:
- Added IUSE, unstable on amd64.
-
- 21 Mar 2004; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.16.000.ebuild:
- x86 stable.
-
- 19 Mar 2004; Daniel Ahlberg <aliz@gentoo.org>
- phpgroupware-0.9.14.007.ebuild:
- Unmask on amd64.
-
-*phpgroupware-0.9.16.000 (04 Mar 2004)
-
- 04 Mar 2004; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.16.000.ebuild:
- Version bumped.
-
- 08 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
- phpgroupware-0.9.14.007.ebuild:
- remove mips and arm KEYWORDS due to lack of support, ready for new repoman.
-
- 07 Jan 2004; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.007.ebuild:
- chaning depend. Closes 37361
-
- 15 Dec 2003; Stuart Herbert <stuart@gentoo.org>
- phpgroupware-0.9.14.007.ebuild:
- Fix for bug #32636
-
- 05 Dec 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.007.ebuild:
- changing chown. closes #35127.
-
- 09 Nov 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.007.ebuild:
- Added webapps-apache.
-
- 22 Oct 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.007.ebuild:
- adding RESTRICT="nomirror"
-
-*phpgroupware-0.9.14.007 (18 Oct 2003)
-
- 18 Oct 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.007.ebuild:
- Version bumped. Security one.
-
- 13 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
- add metadata.xml
-
- 19 Sep 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.006.ebuild:
- Fixed docs. Closes #29040.
-
- 12 Aug 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.006.ebuild:
- Marked x86 stable.
-
-*phpgroupware-0.9.14.006 (25 Jul 2003)
-
- 25 Jul 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.006.ebuild:
- Version bumped.
-
-*phpgroupware-0.9.14.005 (07 Jul 2003)
-
- 07 Jul 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.005.ebuild:
- Version bumped.
-
-*phpgroupware-0.9.14.004 (05 Jul 2003)
-
- 05 Jul 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.004.ebuild:
- Version bumped. Closes #23962.
-
-*phpgroupware-0.9.14.003 (28 Jun 2003)
-
- 28 Jun 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.001.ebuild, phpgroupware-0.9.14.003.ebuild:
- Version bumped.
-
-*phpgroupware-0.9.14.001 (11 Dec 2002)
-
- 07 Apr 2003; Martin Holzer <mholzer@gentoo.org>
- phpgroupware-0.9.14.001.ebuild:
- fixed ebuild to install correct. Closes #15274.
-
- 25 Mar 2003; Aron Griffis <agriffis@gentoo.org>
- phpgroupware-0.9.14.001.ebuild:
- Add ~alpha to KEYWORDS
-
- 15 Feb 2003; Mark Guertin <gerk@gentoo.org> phpgroupware-0.9.14.001.ebuild :
- set ~ppc in keywords
-
- 11 Dec 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
-
- Author: Justin Juff
- New package
-
diff --git a/www-apps/phpgroupware/Manifest b/www-apps/phpgroupware/Manifest
deleted file mode 100644
index 0b01b555899e..000000000000
--- a/www-apps/phpgroupware/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX phpgroupware-SA35519.patch 6215 RMD160 40134788cff795cf6de10c7b9ae6e134b54f94a1 SHA1 454534f8a5a06d2d24d7083f7602e16775318dab SHA256 f6efbcbcb146ec0326de7f7bf9633c2ac17e4e9dd4be39a1bd8d69a72b1583f7
-AUX postinstall-en.txt 248 RMD160 a56204721b190068783f9aa4aa599ea6e0d09d46 SHA1 5753bf91399cbe4eac46db544640e2b4051f68bd SHA256 0ce558319b821129d64318042b2c6025a28cac6668e081828f2429750449cb73
-DIST phpgroupware-0.9.16.012.tar.bz2 17264335 RMD160 cec6560393f71c92f0ffa7b9f0c5071b865aa0a5 SHA1 027de72dae589586c2e82b6a6fceaacdbf665fcf SHA256 195335edcfa05cd20d7f55e26ef9dfbef545c973718c823ded0b4649815c384a
-EBUILD phpgroupware-0.9.16.012-r1.ebuild 894 RMD160 26a341fd209154d423d8c0abc53f416371ff9f12 SHA1 f2e07ea8cd97e018f419f0398a37770eeb7e7481 SHA256 a576375caed962c3661aa535befbdc2bcbe06629ca41bf1f04963e6e2de0d1f1
-EBUILD phpgroupware-0.9.16.012.ebuild 847 RMD160 8d973fcf32dd33aeab3f15767e0b0f722172e95a SHA1 abfaa0e86d20167901aba9f3c8a118d66b258183 SHA256 de5281c9f18edbd989f5345fe0f8f3062d6b05f3aff84085904c3d32d8af55c9
-MISC ChangeLog 9487 RMD160 396acda115a3fa972871289bdcb0fa8b7b001970 SHA1 95a28a7d11adae2e8f0fe94184d810ab355bec31 SHA256 7da8282e1a09c4cc8abf8c00257799cc5ea08b9fac2def5028f1f77bf02e7d14
-MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
diff --git a/www-apps/phpgroupware/files/phpgroupware-SA35519.patch b/www-apps/phpgroupware/files/phpgroupware-SA35519.patch
deleted file mode 100644
index f4cfdda81217..000000000000
--- a/www-apps/phpgroupware/files/phpgroupware-SA35519.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Fix security issues described in Secunia Advisory SA35519. Bug 278864.
-svn diff directly from upstream SVN.
-
-Index: phpgwapi/doc/CHANGELOG
-===================================================================
---- phpgwapi/doc/CHANGELOG (revision 19116)
-+++ phpgwapi/doc/CHANGELOG (revision 19117)
-@@ -1,3 +1,22 @@
-+[0.9.16.014]
-+ Security Release with bug fixes
-+ * Remote File Disclosure in /addressbook/csv_import.php
-+ * SQL injection in /login.php
-+ * XSS in /login.php
-+ * Local file inclusion and Remote file execution in
-+ /addressbook/inc/class.uiXport.inc.php
-+ All via Secunia - see SA35519
-+
-+ 0.9.14 -> 0.916 upgrade fixes
-+
-+ Addressbook usability fixes
-+
-+[0.9.16.013]
-+ No release (stupid superstitious reasons)
-+
-+[0.9.16.012]
-+ Upgrade phpsysinfo
-+
- [0.9.16.011]
- Security Release with bug fixes
- - Fix for Vulnerability in Calendar
-Index: phpgwapi/inc/class.auth_sql.inc.php
-===================================================================
---- phpgwapi/inc/class.auth_sql.inc.php (revision 19116)
-+++ phpgwapi/inc/class.auth_sql.inc.php (revision 19117)
-@@ -40,11 +40,15 @@
-
- if ($passwd_type == 'md5')
- {
-+ if(!preg_match('/^[0-9a-f]*$/', $passwd))
-+ {
-+ return False;
-+ }
- $_passwd = $passwd;
- }
-
- $db->query("SELECT * FROM phpgw_accounts WHERE account_lid = '$username' AND "
-- . "account_pwd='" . $_passwd . "' AND account_status ='A'",__LINE__,__FILE__);
-+ . "account_pwd='$_passwd' AND account_status ='A'",__LINE__,__FILE__);
- $db->next_record();
-
- if ($db->f('account_lid'))
-Index: login.php
-===================================================================
---- login.php (revision 19116)
-+++ login.php (revision 19117)
-@@ -329,7 +329,7 @@
- {
- if (ereg('phpgw_',$name))
- {
-- $extra_vars .= '&' . $name . '=' . urlencode($value);
-+ $extra_vars .= '&' . urlencode($name) . '=' . urlencode($value);
- }
- }
-
-Index: addressbook/inc/class.uiXport.inc.php
-===================================================================
---- addressbook/inc/class.uiXport.inc.php (revision 19116)
-+++ addressbook/inc/class.uiXport.inc.php (revision 19117)
-@@ -73,7 +73,8 @@
-
- function import()
- {
-- if ($_REQUEST['convert']) //&& ($_FILES['tsvfile']['error'] == UPLOAD_ERR_OK))
-+ $conv_type_a = $GLOBALS['phpgw']->session->appsession('conv_type_values_i', 'addressbook');
-+ if ($_REQUEST['convert'] && is_array($conv_type_a) && in_array($_REQUEST['conv_type'], $conv_type_a)) //&& ($_FILES['tsvfile']['error'] == UPLOAD_ERR_OK))
- {
- $buffer = $this->bo->import($_FILES['tsvfile']['tmp_name'],$_REQUEST['conv_type'],$_REQUEST['private'],$_REQUEST['fcat_id']);
-
-@@ -130,7 +131,7 @@
- $fname = ereg_replace('_',' ',$myfilearray[$i]);
- $conv .= '<OPTION VALUE="' . $myfilearray[$i].'">' . $fname . '</OPTION>';
- }
--
-+ $GLOBALS['phpgw']->session->appsession('conv_type_values_i', 'addressbook', $myfilearray);
- $this->template->set_var('lang_cancel',lang('Cancel'));
- $this->template->set_var('lang_cat',lang('Select Category'));
- $this->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
-@@ -173,7 +174,8 @@
-
- //$entries = $this->bo->$get_data_function($fields, $this->limit, $this->start, $this->order, $this->sort, '', $criteria);
-
-- if ($_REQUEST['convert'])
-+ $conv_type_a = $GLOBALS['phpgw']->session->appsession('conv_type_values_e', 'addressbook');
-+ if ($_REQUEST['convert'] && is_array($conv_type_a) && in_array($_REQUEST['conv_type'], $conv_type_a))
- {
- if ($_REQUEST['conv_type'] == 'none')
- {
-@@ -248,6 +250,7 @@
- $conv .= ' <option value="'.$myfilearray[$i].'">'.$fname.'</option>'."\n";
- }
-
-+ $GLOBALS['phpgw']->session->appsession('conv_type_values_e', 'addressbook', $myfilearray);
- $this->template->set_var('lang_cancel',lang('Cancel'));
- $this->template->set_var('lang_cat',lang('Select Category'));
- $this->template->set_var('cat_link',$this->cat_option($this->cat_id,False,False));
-Index: addressbook/csv_import.php
-===================================================================
---- addressbook/csv_import.php (revision 19116)
-+++ addressbook/csv_import.php (revision 19117)
-@@ -31,12 +31,20 @@
- $GLOBALS['phpgw']->template->set_block('import','ffooter','ffooterhandle');
- $GLOBALS['phpgw']->template->set_block('import','imported','importedhandle');
-
-- $csvfile = isset($_POST['csvfile']) ? $_POST['csvfile'] : $_FILES['csvfile']['tmp_name'];
-+ $csvfile = $_FILES['csvfile']['tmp_name'];
-
- if($_POST['action'] == 'download' && (!$_POST['fieldsep'] || !$csvfile || !($fp=fopen($csvfile,'rb'))))
- {
- $_POST['action'] = '';
- }
-+ if($_POST['action'] == 'import')
-+ {
-+ $csvfile = $GLOBALS['phpgw']->session->appsession('import_data', 'addressbook');
-+ if(!file_exists($csvfile))
-+ {
-+ $_POST['action'] = '';
-+ }
-+ }
- $GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/addressbook/csv_import.php'));
-
- $PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in trans
-@@ -175,9 +183,10 @@
- $GLOBALS['phpgw']->template->set_var('max',200);
- $GLOBALS['phpgw']->template->parse('ffooterhandle','ffooter');
- fclose($fp);
-- $old = $csvfile; $csvfile = $GLOBALS['phpgw_info']['server']['temp_dir'].'/addrbook_import_'.basename($csvfile);
-- rename($old,$csvfile);
-- $hiddenvars .= '<input type="hidden" name="csvfile" value="'.$csvfile.'">';
-+ $old = $csvfile; $csvfile = $GLOBALS['phpgw_info']['server']['temp_dir'].'/addrbook_import_'.$GLOBALS['phpgw_info']['user']['account_id'].'_'.basename($csvfile);
-+ rename($old,$csvfile);
-+ $GLOBALS['phpgw']->session->appsession('import_data', 'addressbook', $csvfile);
-+ //$hiddenvars .= '<input type="hidden" name="csvfile" value="'.$csvfile.'">';
- $mktime_lotus = "${PSep}0?([0-9]+)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*).*$ASep@mktime(${VPre}4,${VPre}5,${VPre}6,${VPre}2,${VPre}3,${VPre}1)";
- $help_on_trans = "<a name=\"help\"></a><b>How to use Translation's</b><p>".
- "Translations enable you to change / adapt the content of each CSV field for your needs. <br />".
diff --git a/www-apps/phpgroupware/files/postinstall-en.txt b/www-apps/phpgroupware/files/postinstall-en.txt
deleted file mode 100644
index 68de45f6c1fb..000000000000
--- a/www-apps/phpgroupware/files/postinstall-en.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-You are almost done!
-
-1. Restart your webserver and your database daemon.
-
-2. Point your browser to the URL http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
-and follow the install script.
-
-Don't forget to read the installation manual!
-
-Enjoy phpgroupware!
diff --git a/www-apps/phpgroupware/metadata.xml b/www-apps/phpgroupware/metadata.xml
deleted file mode 100644
index 6632069b5aff..000000000000
--- a/www-apps/phpgroupware/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>web-apps</herd>
-</pkgmetadata>
diff --git a/www-apps/phpgroupware/phpgroupware-0.9.16.012-r1.ebuild b/www-apps/phpgroupware/phpgroupware-0.9.16.012-r1.ebuild
deleted file mode 100644
index fccc8beb1a8c..000000000000
--- a/www-apps/phpgroupware/phpgroupware-0.9.16.012-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.012-r1.ebuild,v 1.4 2009/08/27 20:33:18 beandog Exp $
-
-inherit webapp eutils depend.php
-
-DESCRIPTION="intranet/groupware tool and application framework"
-HOMEPAGE="http://www.phpgroupware.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ppc ~sparc ~x86"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${PN}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- ecvs_clean
-
- epatch "${FILESDIR}/${PN}-SA35519.patch"
-}
-
-src_install() {
- webapp_src_preinst
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
- dohtml ${PN}/doc/en_US/html/admin/*.html
-
- webapp_serverowned "${MY_HTDOCSDIR}"/fudforum
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_src_install
-}
diff --git a/www-apps/phpgroupware/phpgroupware-0.9.16.012.ebuild b/www-apps/phpgroupware/phpgroupware-0.9.16.012.ebuild
deleted file mode 100644
index 2906ef8d4f08..000000000000
--- a/www-apps/phpgroupware/phpgroupware-0.9.16.012.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.012.ebuild,v 1.5 2008/02/23 21:15:05 hollow Exp $
-
-inherit webapp eutils depend.php
-
-DESCRIPTION="intranet/groupware tool and application framework"
-HOMEPAGE="http://www.phpgroupware.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ppc ~sparc ~x86"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${PN}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- ecvs_clean
-}
-
-src_install() {
- webapp_src_preinst
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
- dohtml ${PN}/doc/en_US/html/admin/*.html
-
- webapp_serverowned "${MY_HTDOCSDIR}"/fudforum
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_src_install
-}