yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 09:49:30 +02:00
Code Issues Releases Wiki Activity
4715 commits 4 branches 18 tags 116 MiB
Commit graph

76 commits

Author SHA1 Message Date
Phyks (Lucas Verney)
e86ea9a099 Fix copyright date 2016-08-01 22:02:00 +02:00
Phyks (Lucas Verney)
2bb142eeb8 Fix issue #1260 
Fix coding guidelines incoherences. Code should match PSR1/2 now, and
php-cs is set to check it on each commit.

Also fixed the Git hook to take into account only added, modified,
copied and renamed files (preventing errors when trying to check deleted
files).

Closes #1260.
 2016-08-01 21:55:14 +02:00
Afterster
be816474f6 Add option to ignore song duplicate import 
Add option to match catalog patterns on file upload
 2016-02-27 20:35:03 +01:00
Afterster
9c3637b879 Change license from GPLv2 to AGPLv3 2015-12-02 20:46:34 +01:00
Afterster
f7cd0b43be Merge branch 'feature/customMetadata' of https://github.com/Razrael/ampache into Razrael-feature/customMetadata 
Conflicts:
	lib/class/core.class.php
	lib/class/song.class.php
	lib/class/update.class.php
	lib/class/vainfo.class.php
	modules/catalog/local/local.catalog.php
	templates/show_edit_song_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song.inc.php
 2015-11-17 20:48:10 +01:00
Afterster
5124a5ed4c Merge branch 'develop' of https://github.com/Psy-Virus/ampache into Psy-Virus-develop 
Conflicts:
	templates/show_album_row.inc.php
	templates/show_artist_row.inc.php
	templates/show_label_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song_row.inc.php
	templates/show_video_row.inc.php

Apply align_equals and concat_with_spaces on code style
 2015-11-07 08:08:59 +01:00
René Bigler
04d8ce9c11 [BUGFIX] Fixe some code style issues 2015-10-29 23:09:52 +01:00
René Bigler
899e12e9c7 Merge branch 'develop' into feature/customMetadata 2015-09-07 21:24:56 +02:00
Afterster
47a6585c88 Use latest php-cs-fixer version 2015-07-29 21:59:12 +02:00
Afterster
496932f779 Add Art::insert_from_file method 2015-04-06 21:33:29 +02:00
René Bigler
b312a3f486 [FEATURE] #280 Add fetch_object to DBA class 2015-01-10 00:22:10 +01:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015 
janitorial services
 2015-01-04 21:36:41 +00:00
Afterster
f974eee450 Fixed #583: Can't create admin user 
Update GetID3 to 1.9.9-20141117
 2014-11-20 19:41:51 +01:00
Afterster
083564cb72 Fixed #571: After fresh install, test.php displays ERROR on tables. Also on existing install. 2014-11-13 19:51:15 +01:00
Afterster
1ab17a5080 Add logs on Dba connection 2014-08-01 00:04:52 +02:00
Afterster
17163ef7a9 Show albums associated to Album Artist 2014-07-17 22:02:44 +02:00
Afterster
b16958f44e Remove old code and fix old php errors 2014-05-25 22:54:04 +02:00
Afterster
2a4bedd282 Add Dbh null sets in case of query error 2014-05-20 02:20:38 +02:00
Afterster
98664d2a84 Update copyright years 2014-05-18 09:53:57 +02:00
Afterster
5eceaf2aea Rename Config class to AmpConfig class to avoid conflict with PEAR (fix #68) 2013-12-13 08:36:23 +01:00
Afterster
22cb316a48 Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
Afterster
305b9294ce Add Google Music remote catalog 2013-11-17 01:21:00 +01:00
Paul Arthur
591a0b17c3 Don't call errorInfo() if we don't have an object 2013-07-09 14:33:17 -04:00
Paul Arthur
ee85e4d08d Change Dba::error() and audit its callers 
Will hopefully return more useful information during installation, which
is the only place it's actually used and useful.
 2013-05-27 20:32:02 -04:00
randomessence
c311581b5c Dba: Add support for MySQL sockets 2013-05-27 19:30:18 -04:00
Paul Arthur
f22ceb42c2 Add support for nonstandard MySQL ports 2013-05-13 17:33:12 -04:00
Paul Arthur
d728c76ed0 Drop nonworking Dba::check_database_exists() 
It didn't work.
 2013-03-29 03:54:00 -04:00
Paul Arthur
415880faad Fix infinite loop in Dba 
Strong and stupid indeed.
 2013-03-29 03:37:38 -04:00
Paul Arthur
eee48871e9 Try to be more robust in Dba 2013-03-28 16:56:21 -04:00
Paul Arthur
05498397f3 Dba: return false on errors 
I'm pretty sure this is the correct thing to do.
 2013-02-11 17:24:17 -05:00
Paul Arthur
287ddc4345 Dba: fix more things 
Check that things are things before thing.
 2013-02-03 04:03:35 -05:00
Paul Arthur
544aae5431 Fix Dba::quote() 
It's still ugly, but it won't get too greedy.
 2013-02-02 18:56:14 -05:00
Paul Arthur
4cbb5db6df Make Dba::query() a bit more correct 
Check the DB handle and the statement handle before we try to use them.
 2013-02-02 18:53:02 -05:00
Paul Arthur
7c43b63109 Ignore errors from json_encode in Dba debugging 2013-01-29 14:26:37 -05:00
Paul Arthur
4c03d447a5 Use parameterised queries in Session 2013-01-29 10:42:33 -05:00
Paul Arthur
b7c9678012 Switch Dba from mysql to PDO-MySQL 
The mysql extension is deprecated in PHP 5.5 and will be removed in the
future.
 2013-01-29 03:08:52 -05:00
Paul Arthur
101f4a047a Cosmetics: s/Itterate/Iterate/ 2013-01-28 21:46:00 -05:00
Paul Arthur
ef4d366060 Cosmetics: death to tabs 
The refactoring I've been doing has reminded me of my strong preference
for spaces, and I feel inclined to impose my will on the tree.
 2013-01-26 03:38:46 -05:00
Paul Arthur
fd5b7e1b10 Move Catalog::optimize_tables() to Dba 2013-01-26 00:23:12 -05:00
Paul Arthur
16c3ba34fd Cosmetics: clean up heads in lib/ 2013-01-25 18:38:22 -05:00
Paul Arthur
649298b241 Clean up remaining direct calls to mysql functions 
This makes it theoretically possible to replace Dba with a different
implementation somewhat painlessly.
 2012-11-08 14:31:53 -05:00
Paul Arthur
c51ddbd3d6 Clean up check_database, more direct mysql calls 2012-11-08 14:02:28 -05:00
Paul Arthur
54f9633498 Cosmetics: clean up spaces 2012-11-08 13:23:27 -05:00
Paul Arthur
93251b3c8d Move check_database_inserted into the Dba class 2012-11-08 13:22:56 -05:00
Paul Arthur
d2eaf10b07 Move check_database into the Dba class 2012-11-08 13:15:19 -05:00
Paul Arthur
8a93c849e2 FS#226 - does not catch MySQL errors before passing to num_rows() 
Clean up Dba::num_rows (based on a patch by Natureshadow)

We could check before every call instead, but screw that.
 2012-04-15 23:32:03 -04:00
Paul Arthur
34b0eaf233 Clean up uses of Config::set and Config::set_by_array 
Consistently pass in a boolean instead of a string or an int for the
clobber flag.
 2012-03-06 12:18:57 -05:00
Paul Arthur
89f0b963fe DBA changes 
Make fetch_* automatically clean up result sets by default.  Add a seek
function for any cases where we want to iterate over the same result set
multiple times.
 2011-06-24 11:56:35 -04:00
Paul Arthur
4aa256cb07 Clean up some PHPDoc crap 
Remove misleading, unvetted, or in some cases just plain wrong data.
Packages and categories weren't being used correctly.  They still
aren't.
 2011-04-04 17:37:10 -04:00
momo-i
f99643663c header comment modified for phpdoc 2011-02-03 09:43:46 +09:00