Rosanne DiMesio : Remove Steam and GOG from licenses

[Jeremy Newman]

Module: appdb
Branch: master
Commit: d0e262d6b7106afe09fb17ae69b291d96968929b
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=d0e262d6b7106afe09fb17ae6...

Author: Rosanne DiMesio <dimesio(a)earthlink.net>
Date:   Mon May  8 16:09:18 2017 -0500

Remove Steam and GOG from licenses

Steam and GOG are distribution platforms, not licenses. See bug 42970. Entries already using the mistakenly-added items will have to be manually fixed in the live database.

Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net>
Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com>

---

 include/version.php     | 6 ++----
 tables/appdb_tables.sql | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/version.php b/include/version.php
index 5ee4974..45459fd 100644
--- a/include/version.php
+++ b/include/version.php
@@ -20,8 +20,6 @@ define("LICENSE_DEMO", "Demo");
 define("LICENSE_RETAIL", "Retail");
 define('LICENSE_FREETOUSE', 'Free to use');
 define('LICENSE_FREETOSHARE', 'Free to use and share');
-define('LICENSE_STEAM', 'Steam');
-define('LICENSE_GOG', 'GOG');
 
 /**
  * Version class for handling versions.
@@ -1371,7 +1369,7 @@ EOT;
     public static function getLicenses()
     {
         return array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE,
-                     LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE, LICENSE_STEAM, LICENSE_GOG);
+                     LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE);
     }
 
     // returns a string containing the html for a selection list
@@ -1405,7 +1403,7 @@ EOT;
     public static function checkLicense($sLicense)
     {
         $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE,
-                          LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE, LICENSE_STEAM, LICENSE_GOG);
+                          LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE);
 
         foreach($aLicense as $sElement)
         {
diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql
index d1cbeb4..be556d3 100644
--- a/tables/appdb_tables.sql
+++ b/tables/appdb_tables.sql
@@ -48,6 +48,7 @@ create table appFamily (
 
 /*
  * a version of an application
+ * TODO: remove Steam and GOG from the list of licenses after entries using them have been corrected in the live database
  */
 create table appVersion (
   versionId             int not null auto_increment,