From 3e46a9775c31d2ed6984ad11e58f9ffd1323b8ee Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Sun, 19 Aug 2007 22:02:23 +0000
Subject: licence updates, Thx porthose

---
 activate.php                           |  5 ++---
 admin/access.php                       |  5 ++---
 admin/catalog.php                      |  5 ++---
 admin/index.php                        |  5 ++---
 admin/mail.php                         |  5 ++---
 admin/system.php                       |  5 ++---
 admin/users.php                        |  5 ++---
 artists.php                            |  5 ++---
 bin/catalog_update.inc                 |  5 ++---
 bin/print_tags.inc                     |  5 ++---
 browse.php                             |  5 ++---
 flag.php                               |  5 ++---
 genre.php                              |  5 ++---
 lib/album.lib.php                      | 16 ++++++++++++++++
 lib/artist.lib.php                     |  5 ++---
 lib/batch.lib.php                      |  5 ++---
 lib/class/access.class.php             |  5 ++---
 lib/class/browse.class.php             |  5 ++---
 lib/class/catalog.class.php            |  5 ++---
 lib/class/error.class.php              | 18 ++++++++++++++++++
 lib/class/genre.class.php              |  5 ++---
 lib/class/localplay.class.php          |  5 ++---
 lib/class/song.class.php               |  5 ++---
 lib/class/stats.class.php              |  5 ++---
 lib/class/update.class.php             |  5 ++---
 lib/class/vainfo.class.php             |  5 ++---
 lib/class/view.class.php               |  5 ++---
 lib/debug.lib.php                      |  5 ++---
 lib/general.lib.php                    |  5 ++---
 lib/gettext.php                        |  5 ++---
 lib/install.php                        |  5 ++---
 lib/javascript-base.js                 |  6 +++---
 lib/log.lib.php                        |  5 ++---
 lib/playlist.lib.php                   |  5 ++---
 lib/preferences.php                    |  5 ++---
 lib/rss.php                            |  5 ++---
 lib/search.php                         |  5 ++---
 lib/song.php                           |  5 ++---
 lib/stream.lib.php                     |  5 ++---
 lib/themes.php                         |  5 ++---
 lib/ui.lib.php                         |  5 ++---
 login.php                              |  5 ++---
 logout.php                             |  5 ++---
 modules/catalog.php                    | 15 +++++++++++++++
 modules/prototype/prototype.js         | 17 ++++++++++++++++-
 modules/vauth/auth.lib.php             |  5 ++---
 modules/vauth/init.php                 |  5 ++---
 modules/vauth/session.lib.php          |  5 ++---
 preferences.php                        |  5 ++---
 radio.php                              |  5 ++---
 ratings.php                            |  5 ++---
 rss.php                                |  5 ++---
 search.php                             |  5 ++---
 server/xml.server.php                  |  5 ++---
 server/xmlrpc.server.php               |  5 ++---
 test.php                               |  5 ++---
 themes/burgundy/templates/default.css  |  7 +++----
 themes/burgundy/theme.cfg.php          | 17 ++++++++++++++++-
 themes/classic/theme.cfg.php           | 17 ++++++++++++++++-
 themes/greyblock/templates/default.css |  7 +++----
 60 files changed, 208 insertions(+), 167 deletions(-)

diff --git a/activate.php b/activate.php
index d4c6fa2d..cbac089f 100644
--- a/activate.php
+++ b/activate.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/admin/access.php b/admin/access.php
index 74f13d6b..b2ea30b9 100644
--- a/admin/access.php
+++ b/admin/access.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/admin/catalog.php b/admin/catalog.php
index d65b2c76..bf66e884 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/admin/index.php b/admin/index.php
index 3fd759af..2e4d957e 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/admin/mail.php b/admin/mail.php
index f097cab4..2d7ce570 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/admin/system.php b/admin/system.php
index 7566801e..a2ca3012 100644
--- a/admin/system.php
+++ b/admin/system.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/admin/users.php b/admin/users.php
index dd073e65..a3adeb5f 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/artists.php b/artists.php
index 1f4e1788..70f8fec7 100644
--- a/artists.php
+++ b/artists.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/bin/catalog_update.inc b/bin/catalog_update.inc
index 342912ff..f081b98b 100644
--- a/bin/catalog_update.inc
+++ b/bin/catalog_update.inc
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/bin/print_tags.inc b/bin/print_tags.inc
index 407bbce9..63c19303 100644
--- a/bin/print_tags.inc
+++ b/bin/print_tags.inc
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/browse.php b/browse.php
index f8f1aaf9..132af334 100644
--- a/browse.php
+++ b/browse.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/flag.php b/flag.php
index 3e37f090..88ec902a 100644
--- a/flag.php
+++ b/flag.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/genre.php b/genre.php
index de8d1262..d200ccb2 100644
--- a/genre.php
+++ b/genre.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/album.lib.php b/lib/album.lib.php
index e04d494c..4317c799 100644
--- a/lib/album.lib.php
+++ b/lib/album.lib.php
@@ -1,5 +1,21 @@
 <?php
 /*
+Copyright (c) 2001 - 2007 Ampache.org
+All Rights Reserved
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License v2
+as published by the Free Software Foundation.
+
+This program is distributed int he hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANT ABILITY 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.
+
  This library handles album related functions.... wooo!
 */
 
diff --git a/lib/artist.lib.php b/lib/artist.lib.php
index 6d83a442..b3fe9ac1 100644
--- a/lib/artist.lib.php
+++ b/lib/artist.lib.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/batch.lib.php b/lib/batch.lib.php
index 4c83deb3..d2712170 100644
--- a/lib/batch.lib.php
+++ b/lib/batch.lib.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
  
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/access.class.php b/lib/class/access.class.php
index dae463de..d3f01c2b 100644
--- a/lib/class/access.class.php
+++ b/lib/class/access.class.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php
index 076b8849..239126e0 100644
--- a/lib/class/browse.class.php
+++ b/lib/class/browse.class.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 536be20f..60b1baad 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/error.class.php b/lib/class/error.class.php
index 3ff9c126..29c1c885 100644
--- a/lib/class/error.class.php
+++ b/lib/class/error.class.php
@@ -22,6 +22,24 @@
 
 
 /**
+Copyright (c) 2001 - 2007 Ampache.org
+All Rights Reserved
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License v2
+as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANT ABILITY 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.
+
+
  * Error class
  * This is the baic error class, its better now that we can use php5
  * hello static functions and variables
diff --git a/lib/class/genre.class.php b/lib/class/genre.class.php
index a37c449e..633e8f9d 100644
--- a/lib/class/genre.class.php
+++ b/lib/class/genre.class.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php
index 78a3c70e..cef01057 100644
--- a/lib/class/localplay.class.php
+++ b/lib/class/localplay.class.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index a8155777..af03e921 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/stats.class.php b/lib/class/stats.class.php
index 9847da39..ab6896fb 100644
--- a/lib/class/stats.class.php
+++ b/lib/class/stats.class.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index a5160c7e..30a8440b 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php
index 517d4c30..34447277 100755
--- a/lib/class/vainfo.class.php
+++ b/lib/class/vainfo.class.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/view.class.php b/lib/class/view.class.php
index 4f58677a..41531b60 100644
--- a/lib/class/view.class.php
+++ b/lib/class/view.class.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/debug.lib.php b/lib/debug.lib.php
index c9e51436..6c6866ee 100644
--- a/lib/debug.lib.php
+++ b/lib/debug.lib.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/general.lib.php b/lib/general.lib.php
index b83942ec..bf4b6edf 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/gettext.php b/lib/gettext.php
index 0052a247..810b9664 100644
--- a/lib/gettext.php
+++ b/lib/gettext.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/install.php b/lib/install.php
index d9636f3a..eae63abd 100644
--- a/lib/install.php
+++ b/lib/install.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/javascript-base.js b/lib/javascript-base.js
index d0684a56..2fdd62e3 100644
--- a/lib/javascript-base.js
+++ b/lib/javascript-base.js
@@ -4,9 +4,9 @@
 // All rights reserved.
 //
 // 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.
+// modify it under the terms of the GNU General Public License v2
+// as published by the Free Software Foundation.
+// 
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/log.lib.php b/lib/log.lib.php
index 66d7263f..63c2ba4a 100644
--- a/lib/log.lib.php
+++ b/lib/log.lib.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/playlist.lib.php b/lib/playlist.lib.php
index c695579b..e0468241 100644
--- a/lib/playlist.lib.php
+++ b/lib/playlist.lib.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/preferences.php b/lib/preferences.php
index 97c0f370..e3cd19c3 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/rss.php b/lib/rss.php
index cfce735d..e5111ad3 100644
--- a/lib/rss.php
+++ b/lib/rss.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/search.php b/lib/search.php
index 22e3a2c5..2d45018a 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/song.php b/lib/song.php
index 6d393ac9..c9262e56 100644
--- a/lib/song.php
+++ b/lib/song.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/stream.lib.php b/lib/stream.lib.php
index 745d1140..f6554e8b 100644
--- a/lib/stream.lib.php
+++ b/lib/stream.lib.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/themes.php b/lib/themes.php
index edee2406..164cb89a 100644
--- a/lib/themes.php
+++ b/lib/themes.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 5f74d525..ececefbb 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -5,9 +5,8 @@
    All rights reserved.
 
    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.
+   modify it under the terms of the GNU General Public License v2
+   as published by the Free Software Foundation.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/login.php b/login.php
index bfdf010f..dc86d477 100644
--- a/login.php
+++ b/login.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/logout.php b/logout.php
index 8855f913..ef770f14 100644
--- a/logout.php
+++ b/logout.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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; version 2
- of the License.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/modules/catalog.php b/modules/catalog.php
index e9b8a1d7..9b9c089a 100644
--- a/modules/catalog.php
+++ b/modules/catalog.php
@@ -1,5 +1,20 @@
 <?php
 /*
+ Copyright (c) 2001 - 2007 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
+
+ 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.
 
  Contains all of the catalog (local & remote) functions.
 
diff --git a/modules/prototype/prototype.js b/modules/prototype/prototype.js
index 5d2100fa..a1c465d3 100644
--- a/modules/prototype/prototype.js
+++ b/modules/prototype/prototype.js
@@ -3,6 +3,21 @@
  *
  *  Prototype is freely distributable under the terms of an MIT-style license.
  *  For details, see the Prototype web site: http://www.prototypejs.org/
+
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"), to 
+deal in the Software without restriction, including without limitation the 
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
+IN THE SOFTWARE.
  *
 /*--------------------------------------------------------------------------*/
 
@@ -3268,4 +3283,4 @@ if (Prototype.Browser.WebKit) {
   }
 }
 
-Element.addMethods();
\ No newline at end of file
+Element.addMethods();
diff --git a/modules/vauth/auth.lib.php b/modules/vauth/auth.lib.php
index 90084db6..f877cea8 100644
--- a/modules/vauth/auth.lib.php
+++ b/modules/vauth/auth.lib.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/modules/vauth/init.php b/modules/vauth/init.php
index ecd0ee25..7392b480 100644
--- a/modules/vauth/init.php
+++ b/modules/vauth/init.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/modules/vauth/session.lib.php b/modules/vauth/session.lib.php
index 26c6997c..16daf1cd 100644
--- a/modules/vauth/session.lib.php
+++ b/modules/vauth/session.lib.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/preferences.php b/preferences.php
index 0f09b89f..ed843b4d 100644
--- a/preferences.php
+++ b/preferences.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/radio.php b/radio.php
index 80361866..9e5fbb1e 100644
--- a/radio.php
+++ b/radio.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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; version 2
- of the License.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ratings.php b/ratings.php
index f5bcab3e..d17eec81 100644
--- a/ratings.php
+++ b/ratings.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/rss.php b/rss.php
index 09df2046..37e90fd4 100644
--- a/rss.php
+++ b/rss.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/search.php b/search.php
index 52c0562b..82ac7eca 100644
--- a/search.php
+++ b/search.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/server/xml.server.php b/server/xml.server.php
index 0efa87ff..b42b8ea4 100644
--- a/server/xml.server.php
+++ b/server/xml.server.php
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/server/xmlrpc.server.php b/server/xmlrpc.server.php
index 139a02c0..5487ddec 100644
--- a/server/xmlrpc.server.php
+++ b/server/xmlrpc.server.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/test.php b/test.php
index e198e65d..470826da 100644
--- a/test.php
+++ b/test.php
@@ -5,9 +5,8 @@
  All Rights Reserved
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/themes/burgundy/templates/default.css b/themes/burgundy/templates/default.css
index 348651a4..5e6514bd 100644
--- a/themes/burgundy/templates/default.css
+++ b/themes/burgundy/templates/default.css
@@ -5,9 +5,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -620,4 +619,4 @@ li.current-rating{
 .lp_box_vol {
 	text-align: center; /*for compatibility, may be controlled by themers now*/
 /* 	padding-left: 7px; */
-}
\ No newline at end of file
+}
diff --git a/themes/burgundy/theme.cfg.php b/themes/burgundy/theme.cfg.php
index 7c37c684..1b37271f 100644
--- a/themes/burgundy/theme.cfg.php
+++ b/themes/burgundy/theme.cfg.php
@@ -1,7 +1,22 @@
 ##################
 #<?php exit(); ?>#
 ##################
-
+# Copyright (c) 2001 - 2007 Ampache.org
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License v2
+# as published by the Free Software Foundation.
+#
+# 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.
+#
 ###########################
 # Burgundy Ampache Theme 
 ###########################
diff --git a/themes/classic/theme.cfg.php b/themes/classic/theme.cfg.php
index 89328636..5d0cc1fe 100644
--- a/themes/classic/theme.cfg.php
+++ b/themes/classic/theme.cfg.php
@@ -1,7 +1,22 @@
 ;;;;;;;;;;;;;;;;;;
 ;<?php exit(); ?>;
 ;;;;;;;;;;;;;;;;;;
-
+; Copyright (c) 2001 - 2007 Ampache.org
+; All rights reserved.
+;
+; This program is free software; you can redistribute it and/or
+; modify it under the terms of the GNU General Public License v2
+; as published by the Free Software Foundation.
+;
+; 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.
+;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Classic Ampache Theme 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/themes/greyblock/templates/default.css b/themes/greyblock/templates/default.css
index 6869f7a6..b0aafb5a 100644
--- a/themes/greyblock/templates/default.css
+++ b/themes/greyblock/templates/default.css
@@ -4,9 +4,8 @@
  All rights reserved.
 
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -428,4 +427,4 @@ li.current-rating{
 .lp_box_vol {
 	text-align: center; /*for compatibility, may be controlled by themers now*/
 /* 	padding-left: 7px; */
-}
\ No newline at end of file
+}
-- 
cgit