32 files changed, 83 insertions, 1 deletions
diff --git a/cards/english/readme-edoko.txt b/cards/english/readme-edoko.txt
new file mode 100644
index 0000000..f1cafa9
--- /dev/null
+++ b/cards/english/readme-edoko.txt
@@ -0,0 +1,8 @@
+These images are generated from the original SVGs via inkscape.
+
+The originals can be found at:
+   http://svg-cards.sourceforge.net/
+
+The SVG are released under the GNU LESSER GENERAL PUBLIC LICENSE
+
+Arun
diff --git a/cards/english2/1.png b/cards/english2/1.png
new file mode 100644
index 0000000..eec8ee4
--- /dev/null
+++ b/cards/english2/1.png
diff --git a/cards/english2/11.png b/cards/english2/11.png
new file mode 100644
index 0000000..93a4b4d
--- /dev/null
+++ b/cards/english2/11.png
diff --git a/cards/english2/13.png b/cards/english2/13.png
new file mode 100644
index 0000000..379c3e7
--- /dev/null
+++ b/cards/english2/13.png
diff --git a/cards/english2/15.png b/cards/english2/15.png
new file mode 100644
index 0000000..e0a84d0
--- /dev/null
+++ b/cards/english2/15.png
diff --git a/cards/english2/17.png b/cards/english2/17.png
new file mode 100644
index 0000000..c72703a
--- /dev/null
+++ b/cards/english2/17.png
diff --git a/cards/english2/19.png b/cards/english2/19.png
new file mode 100644
index 0000000..8998f82
--- /dev/null
+++ b/cards/english2/19.png
diff --git a/cards/english2/21.png b/cards/english2/21.png
new file mode 100644
index 0000000..7d06e71
--- /dev/null
+++ b/cards/english2/21.png
diff --git a/cards/english2/23.png b/cards/english2/23.png
new file mode 100644
index 0000000..f1e271e
--- /dev/null
+++ b/cards/english2/23.png
diff --git a/cards/english2/25.png b/cards/english2/25.png
new file mode 100644
index 0000000..28b3dfe
--- /dev/null
+++ b/cards/english2/25.png
diff --git a/cards/english2/27.png b/cards/english2/27.png
new file mode 100644
index 0000000..8a195d1
--- /dev/null
+++ b/cards/english2/27.png
diff --git a/cards/english2/29.png b/cards/english2/29.png
new file mode 100644
index 0000000..d5e6090
--- /dev/null
+++ b/cards/english2/29.png
diff --git a/cards/english2/3.png b/cards/english2/3.png
new file mode 100644
index 0000000..2183c84
--- /dev/null
+++ b/cards/english2/3.png
diff --git a/cards/english2/31.png b/cards/english2/31.png
new file mode 100644
index 0000000..2da23f4
--- /dev/null
+++ b/cards/english2/31.png
diff --git a/cards/english2/33.png b/cards/english2/33.png
new file mode 100644
index 0000000..d981285
--- /dev/null
+++ b/cards/english2/33.png
diff --git a/cards/english2/35.png b/cards/english2/35.png
new file mode 100644
index 0000000..5f31e4b
--- /dev/null
+++ b/cards/english2/35.png
diff --git a/cards/english2/37.png b/cards/english2/37.png
new file mode 100644
index 0000000..bbf22ff
--- /dev/null
+++ b/cards/english2/37.png
diff --git a/cards/english2/39.png b/cards/english2/39.png
new file mode 100644
index 0000000..fea5490
--- /dev/null
+++ b/cards/english2/39.png
diff --git a/cards/english2/41.png b/cards/english2/41.png
new file mode 100644
index 0000000..bbaa81c
--- /dev/null
+++ b/cards/english2/41.png
diff --git a/cards/english2/43.png b/cards/english2/43.png
new file mode 100644
index 0000000..23d9ff5
--- /dev/null
+++ b/cards/english2/43.png
diff --git a/cards/english2/45.png b/cards/english2/45.png
new file mode 100644
index 0000000..5ebcfa8
--- /dev/null
+++ b/cards/english2/45.png
diff --git a/cards/english2/47.png b/cards/english2/47.png
new file mode 100644
index 0000000..ea87a9a
--- /dev/null
+++ b/cards/english2/47.png
diff --git a/cards/english2/5.png b/cards/english2/5.png
new file mode 100644
index 0000000..dee218f
--- /dev/null
+++ b/cards/english2/5.png
diff --git a/cards/english2/7.png b/cards/english2/7.png
new file mode 100644
index 0000000..e92a857
--- /dev/null
+++ b/cards/english2/7.png
diff --git a/cards/english2/9.png b/cards/english2/9.png
new file mode 100644
index 0000000..70538f4
--- /dev/null
+++ b/cards/english2/9.png
diff --git a/cards/english2/AUTHORS.txt b/cards/english2/AUTHORS.txt
new file mode 100644
index 0000000..e929dae
--- /dev/null
+++ b/cards/english2/AUTHORS.txt
@@ -0,0 +1,3 @@
+Vector Playing Card Library 1.3
+Chris Aguilar webmaster@totalnonsense.com
+              http://code.google.com/p/vectorized-playing-cards/
+\ No newline at end of file
diff --git a/cards/english2/Blue_Back.png b/cards/english2/Blue_Back.png
new file mode 100644
index 0000000..9165071
--- /dev/null
+++ b/cards/english2/Blue_Back.png
diff --git a/cards/english2/README.txt b/cards/english2/README.txt
new file mode 100644
index 0000000..ec7c0ac
--- /dev/null
+++ b/cards/english2/README.txt
@@ -0,0 +1,53 @@
+These files comprise the Vectorized Playing Cards 1.3 graphics library.
+
+Vectorized Playing Cards 1.3 Graphics Library is free software: you can
+redistribute it and/or modify it under the terms of the GNU Lesser General
+Public License as published by the Free Software Foundation, either version 3
+of the License, or (at your option) any later version.
+
+Vectorized Playing Cards 1.3 Library 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with the Vectorized Playing Cards 1.3 Graphics Library.
+If not, see <http://www.gnu.org/licenses/>.
+
+______________________________________________
+
+Vectorized Playing Cards 1.3
+http://code.google.com/p/vectorized-playing-cards/
+Copyright 2011 - Chris Aguilar
+
+Licensing terms can be found in the files "Copying.txt" and "COPYING.LESSER.txt"
+
+__________________________
+
+This complete set of 52 playing card faces is based off the standard set dating
+back to the late 1900's and in use in most modern decks today. The cards were
+initially scanned from a real deck at 600 DPI and then auto traced with Inkscape
+( www.inkscape.org ) as a starting point. Nearly every line/node was redrawn
+from this initial starting point and then optimized to decrease file size and
+create cleaner curves, sharper transitions, etc.
+
+For .SVG capable editors (Inkscape and Illustrator CS5 tested) the cards are
+offered individually (with and without crop marks) as a complete set of 52 (full
+color), as a complete set of 52 (gray-scale) and as a complete set of 52 (High
+contrast B/W). For those needing .eps, a complete conversion of all 52 faces (
+singly) plus the two backs is also offered. A template with various card
+elements (pips, numbers, etc.) is included for those who wish to use the
+discrete objects.
+
+There is now also a small set of ESP cards added.
+__________________________
+
+
+When using this library, please include with your project (be it a book,
+program, derivative work, etc) the following attribution/credit per the LGPL 3.0
+licensing terms:
+
+
+Vectorized Playing Cards 1.3- http://code.google.com/p/vectorized-playing-cards/
+Copyright 2011 - Chris Aguilar
+Licensed under LGPL 3 - www.gnu.org/copyleft/lesser.html
diff --git a/cards/english2/Red_Back.png b/cards/english2/Red_Back.png
new file mode 100644
index 0000000..3b15948
--- /dev/null
+++ b/cards/english2/Red_Back.png
diff --git a/cards/english2/readme-edoko.txt b/cards/english2/readme-edoko.txt
new file mode 100644
index 0000000..111af61
--- /dev/null
+++ b/cards/english2/readme-edoko.txt
@@ -0,0 +1,7 @@
+These images are generated from the original SVGs via inkscape.
+
+The originals can be found at:
+
+   http://code.google.com/p/vectorized-playing-cards/
+
+Arun
diff --git a/include/db.php b/include/db.php
index f9eb07a..2395908 100644
--- a/include/db.php
+++ b/include/db.php
@@ -808,6 +808,8 @@ function DB_get_PREF($myid)
       switch($pref[0])
 	{
 	case 'cardset':
+	  if($pref[1])
+	    $PREF['cardset'] = $pref[1];
 	  break;
 
 	case 'email':
diff --git a/include/preferences.php b/include/preferences.php
index f0b33da..a69fd56 100644
--- a/include/preferences.php
+++ b/include/preferences.php
@@ -472,7 +472,16 @@ echo " </td></tr>\n";
 
 echo '    <tr><td>'.('Card set').":              </td><td>\n";
 echo "         <select id=\"cards\" name=\"cards\" size=\"1\">\n";
-echo "           <option value=\"english\" selected=\"selected\">"._('English cards')."</option>\n";
+if($PREF['cardset']=="english2")
+  {
+    echo "           <option value=\"english\" >"._('English cards')."</option>\n";
+    echo "           <option value=\"english2\" selected=\"selected\">"._('English cards 2')."</option>\n";
+  }
+ else /* default */
+   {
+     echo "           <option value=\"english\" selected=\"selected\">"._('English cards')."</option>\n";
+     echo "           <option value=\"english2\" >"._('English cards 2')."</option>\n";
+   };
 echo "         </select>";
 if($changed_cards) echo _('changed');
 echo " </td></tr>\n";