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

81 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
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
92fcb84670 Rename Error class to AmpError (fix php7 Error class name conflict) 2015-12-04 14:00:01 +01:00
Afterster
f2f5bd530b Remove scrub_in from password verification (fix #1033) 2015-12-04 07:27:37 +01:00
Afterster
9c3637b879 Change license from GPLv2 to AGPLv3 2015-12-02 20:46:34 +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
Afterster
207076d9a0 Merge branch 'develop' of https://github.com/Niols/ampache into Niols-develop
Conflicts:
	admin/users.php
	config/ampache.cfg.php.dist
	lib/class/api.class.php
	lib/class/userflag.class.php
	lib/rating.lib.php
	lib/ui.lib.php
	sql/ampache.sql
	templates/browse_filters.inc.php
	templates/footer.inc.php
	templates/header.inc.php
	templates/show_albums.inc.php
	templates/show_artists.inc.php
	templates/show_broadcasts.inc.php
	templates/show_catalogs.inc.php
	templates/show_channels.inc.php
	templates/show_concerts.inc.php
	templates/show_democratic_playlist.inc.php
	templates/show_html5_player_headers.inc.php
	templates/show_index.inc.php
	templates/show_install_config.inc.php
	templates/show_labels.inc.php
	templates/show_live_streams.inc.php
	templates/show_localplay_playlist.inc.php
	templates/show_login_form.inc.php
	templates/show_manage_license.inc.php
	templates/show_manage_shoutbox.inc.php
	templates/show_missing_albums.inc.php
	templates/show_objects.inc.php
	templates/show_playlist_songs.inc.php
	templates/show_playlists.inc.php
	templates/show_preferences.inc.php
	templates/show_pvmsgs.inc.php
	templates/show_recommended_artists.inc.php
	templates/show_searches.inc.php
	templates/show_shared_objects.inc.php
	templates/show_song_previews.inc.php
	templates/show_songs.inc.php
	templates/show_tvshow_seasons.inc.php
	templates/show_tvshows.inc.php
	templates/show_user_activate.inc.php
	templates/show_users.inc.php
	templates/show_videos.inc.php
	templates/show_wanted_albums.inc.php
	templates/sidebar.inc.php
	templates/stylesheets.inc.php
2015-09-06 11:23:51 +02:00
Afterster
6085da5819 Remove created user auto-login after installation (wrong session data are created at this time) 2015-08-27 09:42:50 +02:00
Afterster
47a6585c88 Use latest php-cs-fixer version 2015-07-29 21:59:12 +02:00
Niols
a1f6a073cb Use UI::find_template everytime there's a '/templates/…'
Note: This concerns everything but the install files
2015-06-06 18:54:05 +02:00
Afterster
a6d68fef55 Fix channel htaccess installation 2015-04-05 21:00:38 +02:00
Afterster
a80bc4b6f9 Add Installation Type and Players helper sections at installation process
Add 'no catalog' message helper
2015-01-31 12:29:31 +01:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015
janitorial services
2015-01-04 21:36:41 +00:00
Afterster
8c452f6638 Add Missing Artist search on top search 2014-10-04 00:27:40 +02:00
Afterster
90a57321c4 Replace PHP_SELF with REQUEST_URI 2014-10-03 23:33:41 +02:00
Afterster
351f43708d Improve installation process to avoid manual action for each config file
Add max upload size check in installation tests
2014-06-14 08:38:15 +02:00
Afterster
59d038335f Fix several php errors 2014-05-25 18:47:43 +02:00
Afterster
035f7a106d Add transcoding default configuration to installation process 2014-05-20 00:30:10 +02:00
Afterster
862dde3e00 Add .htaccess generation in installation process
Improve installation configuration to be less error-prone
2014-05-18 17:27:29 +02:00
Afterster
98664d2a84 Update copyright years 2014-05-18 09:53:57 +02:00
Jean-François Bilger
ff013ef6b7 [MOD] Bootstrapify installation 2014-04-10 22:39:26 +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
4fbcad59db Fix installation when we don't want to create the database user and add a 'skip' button to skip administrative setup if we don't want to setup the database at all. 2013-11-13 23:23:23 +01:00
Paul Arthur
a2fa8d3019 More cleanup of install, add DB port option 2013-05-13 21:11:38 -04:00
Paul Arthur
716c50f2e9 Clean up the install code a bit
Remove lang/charset copypasta, unnecessary setting of $prefix,
unnecessary constants.
2013-05-13 21:11:18 -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
b7d00ceeb4 Cosmetics: clean up heads in / 2013-01-25 15:40:47 -05:00
Paul Arthur
915b29c985 check_database() -> Dba::check_database() 2012-11-08 14:42:48 -05:00
Paul Arthur
c51ddbd3d6 Clean up check_database, more direct mysql calls 2012-11-08 14:02:28 -05:00
Paul Arthur
70b37ad472 Clean up direct callers of mysql_error() 2012-11-08 13:34:58 -05:00
Paul Arthur
f65076b93d Switch from _() to T_()
Even if we move away from php-gettext in the future, it's easy to
write a quick T_() as a simple wrapper; it's not so easy to rewrite
PHP to allow redeclaration of a function.
2012-04-12 21:13:29 -04:00
Paul Arthur
86783c009a Restore missing includes
Slightly overzealous in removing things
2012-03-14 03:07:05 -04:00
Paul Arthur
fe5d18095e Refactor similar init code into new init-tiny.php
Several places were doing operations that were practically the same
(loading core libraries and setting some variables), with varying
levels of success in remembering to do the right things in the right
order. Making a separate minimal init.php that doesn't worry about
some of the sanity checks and session bumpf makes this cleaner and
easier to maintain.
2012-03-13 17:57:07 -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
Karl Vollmer
ffad56ec18 Install now contains two buttons, Download & Write for the config file, there is also
an additional check before that if the config file is writeable
2011-07-27 14:35:49 -03: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
aee809f1dc header comment replace for phpdoc 2011-02-03 10:07:39 +09:00
Karl 'vollmerk' Vollmer
a5775d5654 Fix potential issue with Apache+Windows causing extranous slash in path during install 2010-10-29 12:43:04 +00:00
momo-i
fede8cc8bd Fixed: didn't show lang and Charset, if Write Config. 2010-07-06 22:06:52 +00:00
Karl 'vollmerk' Vollmer
45f382b06d Add vim modelines to all php files (Thx ascheel) 2010-03-14 04:53:15 +00:00
dipsol
c717912676 Made an redirect when it seems like the installation has already been completed. 2009-11-04 13:14:31 +00:00
momo-i
6136bb1081 fixed for PHP 5.3.0 deprecate warnings 2009-07-02 22:42:40 +00:00
momo-i
2789846584 Add Hint for translators 2009-05-19 00:45:51 +00:00
Karl 'vollmerk' Vollmer
0b63ba290a sync from branch 2009-05-06 00:24:34 +00:00
Karl 'vollmerk' Vollmer
2a83cc96dc more work for alpha2 release, clean up install and debug a bit 2009-03-08 05:08:21 +00:00
Karl 'vollmerk' Vollmer
56fa0e31ad verify that they at least typed in the right db information, before creating the config file for them 2008-11-29 16:37:54 +00:00
Karl 'vollmerk' Vollmer
6a62135d67 improved error messages during install if you fail at typing the same thing twice 2008-11-27 00:13:56 +00:00