diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php index c5c5ab38..74331160 100644 --- a/lib/class/vainfo.class.php +++ b/lib/class/vainfo.class.php @@ -193,6 +193,7 @@ class vainfo if ($this->islocal) { try { $this->_raw = $this->_getID3->analyze(Core::conv_lc_file($this->filename)); + //debug_event('vainfo', print_r($this->_raw, true), '5'); } catch (Exception $error) { debug_event('getID2', 'Unable to catalog file: ' . $error->getMessage(), 1); } diff --git a/modules/catalog/dropbox.catalog.php b/modules/catalog/dropbox.catalog.php index f798769a..2f855d36 100644 --- a/modules/catalog/dropbox.catalog.php +++ b/modules/catalog/dropbox.catalog.php @@ -89,10 +89,10 @@ class Catalog_dropbox extends Catalog */ public function is_installed() { - $sql = "DESCRIBE `catalog_dropbox`"; + $sql = "SHOW TABLES LIKE 'catalog_dropbox'"; $db_results = Dba::query($sql); - return Dba::num_rows($db_results); + return (Dba::num_rows($db_results) > 0); } // is_installed diff --git a/modules/catalog/local.catalog.php b/modules/catalog/local.catalog.php index f6fb48a9..66051d14 100644 --- a/modules/catalog/local.catalog.php +++ b/modules/catalog/local.catalog.php @@ -78,10 +78,10 @@ class Catalog_local extends Catalog */ public function is_installed() { - $sql = "DESCRIBE `catalog_local`"; + $sql = "SHOW TABLES LIKE 'catalog_local'"; $db_results = Dba::query($sql); - return Dba::num_rows($db_results); + return (Dba::num_rows($db_results) > 0); } // is_installed diff --git a/modules/catalog/remote.catalog.php b/modules/catalog/remote.catalog.php index cf2818b9..7ae3b014 100644 --- a/modules/catalog/remote.catalog.php +++ b/modules/catalog/remote.catalog.php @@ -78,10 +78,10 @@ class Catalog_remote extends Catalog */ public function is_installed() { - $sql = "DESCRIBE `catalog_remote`"; + $sql = "SHOW TABLES LIKE 'catalog_remote'"; $db_results = Dba::query($sql); - return Dba::num_rows($db_results); + return (Dba::num_rows($db_results) > 0); } // is_installed diff --git a/modules/catalog/soundcloud.catalog.php b/modules/catalog/soundcloud.catalog.php index 6193e87c..6facc1fc 100644 --- a/modules/catalog/soundcloud.catalog.php +++ b/modules/catalog/soundcloud.catalog.php @@ -82,10 +82,10 @@ class Catalog_soundcloud extends Catalog */ public function is_installed() { - $sql = "DESCRIBE `catalog_soundcloud`"; + $sql = "SHOW TABLES LIKE 'catalog_soundcloud'"; $db_results = Dba::query($sql); - return Dba::num_rows($db_results); + return (Dba::num_rows($db_results) > 0); } // is_installed diff --git a/modules/catalog/subsonic.catalog.php b/modules/catalog/subsonic.catalog.php index 4d90d10d..a9756356 100644 --- a/modules/catalog/subsonic.catalog.php +++ b/modules/catalog/subsonic.catalog.php @@ -78,10 +78,10 @@ class Catalog_subsonic extends Catalog */ public function is_installed() { - $sql = "DESCRIBE `catalog_subsonic`"; + $sql = "SHOW TABLES LIKE 'catalog_subsonic'"; $db_results = Dba::query($sql); - return Dba::num_rows($db_results); + return (Dba::num_rows($db_results) > 0); } // is_installed diff --git a/modules/localplay/httpq.controller.php b/modules/localplay/httpq.controller.php index 37f61d3b..71291493 100644 --- a/modules/localplay/httpq.controller.php +++ b/modules/localplay/httpq.controller.php @@ -75,12 +75,10 @@ class AmpacheHttpq extends localplay_controller */ public function is_installed() { - $sql = "DESCRIBE `localplay_httpq`"; - $db_results = Dba::read($sql); - - return Dba::num_rows($db_results); - + $sql = "SHOW TABLES LIKE 'localplay_httpq'"; + $db_results = Dba::read($sql); + return (Dba::num_rows($db_results) > 0); } // is_installed /** diff --git a/modules/localplay/mpd.controller.php b/modules/localplay/mpd.controller.php index 013778bf..190da01d 100644 --- a/modules/localplay/mpd.controller.php +++ b/modules/localplay/mpd.controller.php @@ -76,10 +76,10 @@ class AmpacheMpd extends localplay_controller */ public function is_installed() { - $sql = "DESCRIBE `localplay_mpd`"; - $db_results = Dba::read($sql); + $sql = "SHOW TABLES LIKE 'localplay_mpd'"; + $db_results = Dba::read($sql); - return Dba::num_rows($db_results); + return (Dba::num_rows($db_results) > 0); } // is_installed diff --git a/modules/localplay/vlc.controller.php b/modules/localplay/vlc.controller.php index 3dd20799..50badcca 100644 --- a/modules/localplay/vlc.controller.php +++ b/modules/localplay/vlc.controller.php @@ -75,10 +75,10 @@ class AmpacheVlc extends localplay_controller */ public function is_installed() { - $sql = "DESCRIBE `localplay_vlc`"; + $sql = "SHOW TABLES LIKE 'localplay_vlc'"; $db_results = Dba::query($sql); - return Dba::num_rows($db_results); + return (Dba::num_rows($db_results) > 0); } // is_installed diff --git a/modules/localplay/xbmc.controller.php b/modules/localplay/xbmc.controller.php index ed193672..f5a5a60d 100644 --- a/modules/localplay/xbmc.controller.php +++ b/modules/localplay/xbmc.controller.php @@ -79,10 +79,10 @@ class AmpacheXbmc extends localplay_controller */ public function is_installed() { - $sql = "DESCRIBE `localplay_xbmc`"; + $sql = "SHOW TABLES LIKE 'localplay_xbmc'"; $db_results = Dba::query($sql); - return Dba::num_rows($db_results); + return (Dba::num_rows($db_results) > 0); } // is_installed