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 5271dbf46274739de6ac45a4d8b1d186e49f3765..33a345c763429b0a16eb18feceda101851372ce9 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 11a83e6dbfff214bf25ede25f438f33def4e4fc3..f683beba29402686e4e93a057139cd63787b0bd3 100644 (file)
--- 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 a6267bb42ec718fb072d834ec0316d566b60c622..48019878df2d5c623f91d3c7971aaf4083564b85 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -451,10 +451,7 @@ function output_footer()
     "  <a href=\"http://www.dreamhost.com/green.cgi\"><p>\n".
     "  <img class=\"right\" alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
     " src=\"pics/green1.gif\" height=\"32\" width=\"100\" /></a>\n";
-  echo "  <p class=\"left\"> copyright 2006-2013 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\n".
-    "  Verwendung der [deutschen] Kartenbilder mit Genehmigung <br />der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger <br />\n".
-    "  - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH <br />\n".
-    "  a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com</p>\n";
+  echo "  <p class=\"left\"> copyright 2006-2013 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\n";
   echo "</footer>\n\n";
 
   echo '<script src="'.autoversion('js/jquery.min.js').             '"></script>';

diff --git a/include/preferences.php b/include/preferences.php
index 0089c432ff2e8d9a5999c80489eba3e0da571643..5aafcd35235d8b61fcc97217a825f008cc6ea27b 100644 (file)
--- a/include/preferences.php
+++ b/include/preferences.php
@@ -472,16 +472,7 @@ echo " </td></tr>\n";
 
 echo '    <tr><td>'.('Card set').":              </td><td>\n";
 echo "         <select id=\"cards\" name=\"cards\" size=\"1\">\n";
-if($PREF['cardset']=="altenburg")
-  {
-    echo "           <option value=\"altenburg\" selected=\"selected\">"._('German cards')."</option>\n";
-    echo "           <option value=\"english\">"._('English cards')."</option>\n";
-  }
- else
-   {
-     echo "           <option value=\"altenburg\">"._('German cards')."</option>\n";
-     echo "           <option value=\"english\" selected=\"selected\">"._('English cards')."</option>\n";
-   }
+echo "           <option value=\"english\" selected=\"selected\">"._('English cards')."</option>\n";
 echo "         </select>";
 if($changed_cards) echo _('changed');
 echo " </td></tr>\n";