1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 09:49:30 +02:00
Commit graph

53 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
Phyks (Lucas Verney)
a50fb430ba Fix for issue #1248
Generate `sceret_key` on Ampache installation

Generate a `secret_key` on Ampache installation and put it in the
generated config. This removes the need to do it manually, and the
secret key is ensured to be crypto safe.

Also move the `web_path` configuration setting under a "Various"
fieldset, as it had nothing to do with database settings.

Also added a comment about a missing `break` statement, which was on
purpose, but one could think it was a mistake at first sight.

Closes #1248.
2016-06-16 11:03:56 +02:00
Phyks (Lucas Verney)
2890aa89bf Fix Travis-CI build
* Fix php-cs according to https://github.com/ampache/ampache/issues/1251
to fix travis build. Use composer to force the 1.* version to be used.

* Add `encoding` fixer.

* Use the same set of fixers in Git commit hook and test script.

* Update hooks and scripts.

* Fix a braces issue detected by php-cs.

Closes issue #1251.
2016-06-13 15:32:48 +02:00
Maniac
90acb6822c Fixed image size checking and Google image search
Image size checking did not handle empty values (e.g. max height/width was not set in config).
As result, any image would be "not in range" even when the user would expect that it would.
To get better information while debugging the error message has also be expanded to include
the configured/assumed min/max value and the current height/width which was checked.

Second fix in this commit addresses broken google image search.
Google has changed the image search page some time ago. This causes the old code to get an error 404
when trying to retrive images.
In addition to the broken URL, the way to parse the HTML result was also broken.
Google now sends some sort of JSON and HTML mix string.
Currently some simple regex will try to find all image urls, maybe someone will find a better solution.
2016-05-14 10:59:55 +02:00
Niols
6cbf700151 fix 1201 and rewrite LDAP class
and ran php-cs-fixer as told in the wiki
2016-05-03 17:11:42 +02:00
Afterster
deba68d9f8 Add helper to retrieve tmp directory path
Fix song xml special character on composer field
2016-03-05 13:07:47 +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
411ad4b06c Use proxy settings on all get Requests 2015-02-05 13:56:12 +01:00
René Bigler
d644f641a4 [FEATURE] #280 Rework autoloader with global namespace support 2015-01-10 00:22:01 +01:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015
janitorial services
2015-01-04 21:36:41 +00:00
Afterster
ec375b1c52 Fix NavigateTo on non-ajax browsing 2014-09-24 01:23:53 +02:00
Afterster
49cd42562b Replace iframe with Ajax page loading :) :) 2014-08-08 01:36:07 +02:00
Afterster
e52146109a Add check for large files manipulation 2014-07-16 23:57:01 +02:00
Afterster
afa536c6be Fix code style 2014-07-08 20:24:51 +02:00
Afterster
0254be9982 Better Video integration in Ampache features 2014-07-08 20:00:33 +02:00
Afterster
041dfda1fc Remove remaining unused code 2014-05-25 23:23:52 +02:00
Afterster
811115958e Fix code style 2014-05-25 22:54:29 +02:00
Afterster
b16958f44e Remove old code and fix old php errors 2014-05-25 22:54:04 +02:00
Afterster
59d038335f Fix several php errors 2014-05-25 18:47:43 +02:00
Afterster
98664d2a84 Update copyright years 2014-05-18 09:53:57 +02:00
SUTJael
39e6e76f59 Fix code style 2014-05-07 15:49:47 +02:00
SUTJael
72f8afac7f Admin can see all playlists (private/public) (Fix #142)
Remove cookie on art as it's not working as expected.
2014-04-22 23:28:55 +02:00
SUTJael
43e9a2b91c Fix session_status with lower PHP version than 5.4.0 (Fix #143) 2014-04-22 22:37:37 +02:00
Afterster
a76609bcad Add local charset setting for ISO8859-1 filename files operations on Windows 2014-04-15 00:02:08 +02:00
Afterster
6adf8307c4 Begin WebSocket support for Broadcast and Player control 2014-02-05 08:08:46 +01:00
Afterster
688353e8e7 Hide autoload errors 2013-12-26 22:55:44 +01: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
0461f2218f Add Dropbox catalog
Fix Google Music streaming
2013-11-17 16:08:32 +01:00
Paul Arthur
228717d350 Clean up Core::autoload() 2013-05-30 14:57:51 -04:00
Paul Arthur
69dcc79e94 Add and use Core::is_readable()
bea34c42 fixed one use of is_readable, but Windows users encountering
this issue would still be affected in other cases. This commit fixes
all of the important is_readable calls within Ampache; I'm not going
to hack this into external modules, so if they're broken people will
have to live with it.
2013-05-30 14:42:33 -04: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
16c3ba34fd Cosmetics: clean up heads in lib/ 2013-01-25 18:38:22 -05:00
Paul Arthur
5f2f81fa8f Use spl_autoload_register instead of __autoload
Might be useful in the future, __autoload is discouraged according to
the PHP documentation.
2012-04-18 00:54:54 -04:00
Paul Arthur
585382422c Allow multiple valid forms of the same type
Use the SID for the primary key, instead of the non-unique form name.
Also add some debugging to the form functions in Core.
2012-03-06 10:58:07 -05: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
momo-i
d703009677 header comment for phpdoc 2011-02-03 07:30:23 +09:00
momo-i
add54bc230 test header for phpdoc. now using only classes and libraries. 2011-02-02 16:48:45 +09:00
momo-i
bc7344c9f5 test for phpdoc 2011-02-02 13:35:26 +09:00
Paul 'flowerysong' Arthur
1cb0983ed0 Cosmetics: remove trailing whitespace 2010-03-14 20:14:52 +00:00
Karl 'vollmerk' Vollmer
45f382b06d Add vim modelines to all php files (Thx ascheel) 2010-03-14 04:53:15 +00:00
Karl 'vollmerk' Vollmer
d8ea07a04a sync from 3.5.x and fix display issue on playlist view 2009-12-20 16:52:43 +00:00
Karl 'vollmerk' Vollmer
fdb7c58cb1 fix typo causing height to not display on art retrival, update to db allowing gc of tmp_browse, add extension to api album art image urls 2009-03-15 16:16:04 +00:00