From: Arun Persaud Date: Thu, 17 Jan 2013 05:38:08 +0000 (-0800) Subject: remove Altenburger Spielkarten, their copyright notice, etc. since the licence expired X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=commitdiff_plain;h=be205de31c62e22c4347e2c3514efe945645d946;ds=sidebyside remove Altenburger Spielkarten, their copyright notice, etc. since the licence expired They changed their company police and won't give out a free licence agreement anymore, so might as well remove it completely. --- diff --git a/README b/README index 5271dbf..33a345c 100644 --- a/README +++ b/README @@ -1,5 +1,2 @@ This is eDoKo a browser based Doppelkopf implementation with email -notification. All files are under GPL, the only expection are the -images of the german card deck. These have been provided by ASS -Altenburg GmbH (email: info@spielkarten.com) under a free (as in beer) -license. If you want to use them too you need to email them and sign a license! +notification. All files are under GPL. \ No newline at end of file diff --git a/cards/altenburg/0.png b/cards/altenburg/0.png deleted file mode 100644 index 1ece76f..0000000 Binary files a/cards/altenburg/0.png and /dev/null differ diff --git a/cards/altenburg/1.png b/cards/altenburg/1.png deleted file mode 100644 index 789f52c..0000000 Binary files a/cards/altenburg/1.png and /dev/null differ diff --git a/cards/altenburg/11.png b/cards/altenburg/11.png deleted file mode 100644 index 2face0c..0000000 Binary files a/cards/altenburg/11.png and /dev/null differ diff --git a/cards/altenburg/13.png b/cards/altenburg/13.png deleted file mode 100644 index 3cbeb63..0000000 Binary files a/cards/altenburg/13.png and /dev/null differ diff --git a/cards/altenburg/15.png b/cards/altenburg/15.png deleted file mode 100644 index a221b30..0000000 Binary files a/cards/altenburg/15.png and /dev/null differ diff --git a/cards/altenburg/17.png b/cards/altenburg/17.png deleted file mode 100644 index 7857059..0000000 Binary files a/cards/altenburg/17.png and /dev/null differ diff --git a/cards/altenburg/19.png b/cards/altenburg/19.png deleted file mode 100644 index 4f6e5f8..0000000 Binary files a/cards/altenburg/19.png and /dev/null differ diff --git a/cards/altenburg/21.png b/cards/altenburg/21.png deleted file mode 100644 index b9946b8..0000000 Binary files a/cards/altenburg/21.png and /dev/null differ diff --git a/cards/altenburg/23.png b/cards/altenburg/23.png deleted file mode 100644 index f61adab..0000000 Binary files a/cards/altenburg/23.png and /dev/null differ diff --git a/cards/altenburg/25.png b/cards/altenburg/25.png deleted file mode 100644 index bb85235..0000000 Binary files a/cards/altenburg/25.png and /dev/null differ diff --git a/cards/altenburg/27.png b/cards/altenburg/27.png deleted file mode 100644 index a8773a5..0000000 Binary files a/cards/altenburg/27.png and /dev/null differ diff --git a/cards/altenburg/29.png b/cards/altenburg/29.png deleted file mode 100644 index 63638f9..0000000 Binary files a/cards/altenburg/29.png and /dev/null differ diff --git a/cards/altenburg/3.png b/cards/altenburg/3.png deleted file mode 100644 index 048b474..0000000 Binary files a/cards/altenburg/3.png and /dev/null differ diff --git a/cards/altenburg/31.png b/cards/altenburg/31.png deleted file mode 100644 index 6ec77c8..0000000 Binary files a/cards/altenburg/31.png and /dev/null differ diff --git a/cards/altenburg/33.png b/cards/altenburg/33.png deleted file mode 100644 index 12af7d1..0000000 Binary files a/cards/altenburg/33.png and /dev/null differ diff --git a/cards/altenburg/35.png b/cards/altenburg/35.png deleted file mode 100644 index c7f4c7c..0000000 Binary files a/cards/altenburg/35.png and /dev/null differ diff --git a/cards/altenburg/37.png b/cards/altenburg/37.png deleted file mode 100644 index e224e72..0000000 Binary files a/cards/altenburg/37.png and /dev/null differ diff --git a/cards/altenburg/39.png b/cards/altenburg/39.png deleted file mode 100644 index b35fa2b..0000000 Binary files a/cards/altenburg/39.png and /dev/null differ diff --git a/cards/altenburg/41.png b/cards/altenburg/41.png deleted file mode 100644 index dffb68a..0000000 Binary files a/cards/altenburg/41.png and /dev/null differ diff --git a/cards/altenburg/43.png b/cards/altenburg/43.png deleted file mode 100644 index 2f78ffb..0000000 Binary files a/cards/altenburg/43.png and /dev/null differ diff --git a/cards/altenburg/45.png b/cards/altenburg/45.png deleted file mode 100644 index 4a7a6b4..0000000 Binary files a/cards/altenburg/45.png and /dev/null differ diff --git a/cards/altenburg/47.png b/cards/altenburg/47.png deleted file mode 100644 index 242f0d1..0000000 Binary files a/cards/altenburg/47.png and /dev/null differ diff --git a/cards/altenburg/5.png b/cards/altenburg/5.png deleted file mode 100644 index df3ed39..0000000 Binary files a/cards/altenburg/5.png and /dev/null differ diff --git a/cards/altenburg/7.png b/cards/altenburg/7.png deleted file mode 100644 index 982a8e8..0000000 Binary files a/cards/altenburg/7.png and /dev/null differ diff --git a/cards/altenburg/9.png b/cards/altenburg/9.png deleted file mode 100644 index 738d144..0000000 Binary files a/cards/altenburg/9.png and /dev/null differ diff --git a/cards/altenburg/License b/cards/altenburg/License deleted file mode 100644 index 303db83..0000000 --- a/cards/altenburg/License +++ /dev/null @@ -1,12 +0,0 @@ -You need to a license from - -Spielkartenfabrik Altenburg GmbH, - -ASS Altenburger -Leipziger Strasse 7, 04600 Altenburg - -Email: info@spielkarten.com -internet: www.spielkarten.com - -for these images. This involves some paperwork, but was free for non-commercial purposes. - diff --git a/include/db.php b/include/db.php index 11a83e6..f683beb 100644 --- a/include/db.php +++ b/include/db.php @@ -812,9 +812,6 @@ function DB_get_PREF($myid) switch($pref[0]) { case 'cardset': - /* licence only valid until then */ - if($pref[1]=='altenburg' && (time()-strtotime( '2012-12-31 23:59:59')<0) ) - $PREF['cardset']='altenburg'; break; case 'email': diff --git a/include/output.php b/include/output.php index a6267bb..4801987 100644 --- a/include/output.php +++ b/include/output.php @@ -451,10 +451,7 @@ function output_footer() "

\n". " \"Green\n"; - echo "

copyright 2006-2013 Arun Persaud, et al.
\n". - " Verwendung der [deutschen] Kartenbilder mit Genehmigung
der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger
\n". - " - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH
\n". - " a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com

\n"; + echo "

copyright 2006-2013 Arun Persaud, et al.
\n"; echo "\n\n"; echo ''; diff --git a/include/preferences.php b/include/preferences.php index 0089c43..5aafcd3 100644 --- a/include/preferences.php +++ b/include/preferences.php @@ -472,16 +472,7 @@ echo " \n"; echo ' '.('Card set').": \n"; echo " "; if($changed_cards) echo _('changed'); echo " \n";