gmane.comp.web.ampache.devel

Ampache SVN - r2469 - trunk/locale/ja_JP/LC_MESSAGES

ampache-dev — 2011-01-27T22:23:36

Author: momo-i
Date: 2011-01-27 14:23:36 -0800 (Thu, 27 Jan 2011)
New Revision: 2469

Modified:
   trunk/locale/ja_JP/LC_MESSAGES/messages.mo
   trunk/locale/ja_JP/LC_MESSAGES/messages.po
Log:
japanese translation


Modified: trunk/locale/ja_JP/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja_JP/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ja_JP/LC_MESSAGES/messages.po2010-11-05 02:12:57 UTC (rev 2468)
+++ trunk/locale/ja_JP/LC_MESSAGES/messages.po2011-01-27 22:23:36 UTC (rev 2469)
< at >< at > -8,10 +8,11 < at >< at >
 msgstr ""
 "Project-Id-Version: Ampache SVN $Rev$\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2010-07-02 13:34+0900\n"
+"POT-Creation-Date: 2010-12-30 08:18+0900\n"
 "PO-Revision-Date: 2008-07-14 20:44+0900\n"
 "Last-Translator: momo-i <webmaster at momo-i.org>\n"
 "Language-Team: Japanese\n"
+"Language: \n"
 "MIME-Version

Ampache SVN - r2468 - trunk/docs/man/man1

ampache-dev — 2010-11-05T02:12:57

Author: momo-i
Date: 2010-11-04 19:12:57 -0700 (Thu, 04 Nov 2010)
New Revision: 2468

Modified:
   trunk/docs/man/man1/ampache.1
Log:
fixed typo.


Modified: trunk/docs/man/man1/ampache.1
===================================================================
--- trunk/docs/man/man1/ampache.12010-11-02 21:40:59 UTC (rev 2467)
+++ trunk/docs/man/man1/ampache.12010-11-05 02:12:57 UTC (rev 2468)
< at >< at > -35,7 +35,7 < at >< at >
 grab_xspf.sh
 
 Due to no free tools being available in Debian and Ubuntu policy required the
-removal of xspf_jukebox.sfw.  This script downloads the source from Lacy Morrows
+removal of xspf_jukebox.swf.  This script downloads the source from Lacy Morrows
 website and places it into the proper location.
 
 catalog_update.inc

Ampache SVN - r2467 - trunk/templates

ampache-dev — 2010-11-02T21:40:59

Author: cslamar
Date: 2010-11-02 14:40:59 -0700 (Tue, 02 Nov 2010)
New Revision: 2467

Modified:
   trunk/templates/show_xspf_player.inc.php
Log:
Debian Policy Alert

Modified: trunk/templates/show_xspf_player.inc.php
===================================================================
--- trunk/templates/show_xspf_player.inc.php2010-11-02 21:17:59 UTC (rev 2466)
+++ trunk/templates/show_xspf_player.inc.php2010-11-02 21:40:59 UTC (rev 2467)
< at >< at > -54,7 +54,8 < at >< at >
 </script>
 <div id="mp3player">
 <?php
-$player_url = sprintf("%s/modules/flash/xspf_jukebox.swf?autoplay=true&repeat_playlist=true&crossFade=false&shuffle=false&skin_url=%s/modules/flash/Original/&playlist_url=%s",Config::get('web_path'),Config::get('web_path'),$play_url);
+if (file_exists(Config::get('prefix')."/modules/flash/xspf_jukebox.swf")) {
+    $player_url = sprintf("%s/modules/flash/xspf_jukebox.swf?autoplay=true&repeat_playlist=true&crossFade=false&shuffle=false&skin_url=%s/modules/flash/Original/&playlist_url=%s",Config::get('web_path'),Co

Ampache SVN - r2466 - trunk/docs/man/man1

ampache-dev — 2010-11-02T21:17:59

Author: cslamar
Date: 2010-11-02 14:17:59 -0700 (Tue, 02 Nov 2010)
New Revision: 2466

Modified:
   trunk/docs/man/man1/ampache.1
Log:
Updated Doc

Modified: trunk/docs/man/man1/ampache.1
===================================================================
--- trunk/docs/man/man1/ampache.12010-10-29 12:43:04 UTC (rev 2465)
+++ trunk/docs/man/man1/ampache.12010-11-02 21:17:59 UTC (rev 2466)
< at >< at > -29,9 +29,15 < at >< at >
 
 .SH "OPTIONS"
 
-The following php scripts are included in Ampache and can be used to automate some
+The following scripts are included in Ampache and can be used to automate some
 aspects of Ampache.
 
+grab_xspf.sh
+
+Due to no free tools being available in Debian and Ubuntu policy required the
+removal of xspf_jukebox.sfw.  This script downloads the source from Lacy Morrows
+website and places it into the proper location.
+
 catalog_update.inc
 
 You can automate the update of all, or some of your local catalogs by using the

Ampache SVN - r2465 - in trunk: . docs

ampache-dev — 2010-10-29T12:43:04

Author: vollmerk
Date: 2010-10-29 05:43:04 -0700 (Fri, 29 Oct 2010)
New Revision: 2465

Modified:
   trunk/docs/CHANGELOG
   trunk/install.php
Log:
Fix potential issue with Apache+Windows causing extranous slash in path during install

Modified: trunk/docs/CHANGELOG
===================================================================
--- trunk/docs/CHANGELOG2010-10-26 23:06:55 UTC (rev 2464)
+++ trunk/docs/CHANGELOG2010-10-29 12:43:04 UTC (rev 2465)
< at >< at > -4,6 +4,7 < at >< at >
 
 --------------------------------------------------------------------------
   v.3.6-Alpha1
+- Fix \ in web path under Apache + Windows Bug #135
         - Partial MusicBrainz metadata gathering via plugin
         - Metadata code cleanup, support for plugins as metadata sources
         - New plugin architecture

Modified: trunk/install.php
===================================================================
--- trunk/install.php2010-10-26 23:06:55 UTC (rev 2464)
+++ trunk/install.php2010-10-29 12:43:04 UTC (rev 2465)
< at >< at > -68,9 +68,14 < at >< at >
 if

Ampache SVN - r2464 - in trunk: config lib/class

ampache-dev — 2010-10-26T23:06:56

Author: flowerysong
Date: 2010-10-26 16:06:55 -0700 (Tue, 26 Oct 2010)
New Revision: 2464

Modified:
   trunk/config/ampache.cfg.php.dist
   trunk/lib/class/ampachemail.class.php
Log:
Fix authenticated SMTP and add secure (TLS/SSL) SMTP.


Modified: trunk/config/ampache.cfg.php.dist
===================================================================
--- trunk/config/ampache.cfg.php.dist2010-10-24 21:55:51 UTC (rev 2463)
+++ trunk/config/ampache.cfg.php.dist2010-10-26 23:06:55 UTC (rev 2464)
< at >< at > -612,6 +612,11 < at >< at >
 ;DEFAULT: 25
 ;mail_port = 25
 
+;Secure SMTP
+;POSSIBLE VALUES: ssl tls
+;DEFAULT: none
+;mail_secure_smtp = tls
+
 ;Enable SMTP authentication
 ;DEFAULT: false
 ;mail_auth = true

Modified: trunk/lib/class/ampachemail.class.php
===================================================================
--- trunk/lib/class/ampachemail.class.php2010-10-24 21:55:51 UTC (rev 2463)
+++ trunk/lib/class/ampachemail.class.php2010-10-26 23:06:55 UTC (rev 2464)
< at >< at > -163,10 +163,13 < at >< at >
 $mail->Host = $mailhost;

Ampache SVN - r2463 - trunk/lib/class

ampache-dev — 2010-10-24T21:55:51

Author: flowerysong
Date: 2010-10-24 14:55:51 -0700 (Sun, 24 Oct 2010)
New Revision: 2463

Modified:
   trunk/lib/class/ampachemail.class.php
Log:
The AmpacheMail constructor does nothing and we never call it with parameters,
so why did it claim it needed a parameter?


Modified: trunk/lib/class/ampachemail.class.php
===================================================================
--- trunk/lib/class/ampachemail.class.php2010-10-15 19:16:42 UTC (rev 2462)
+++ trunk/lib/class/ampachemail.class.php2010-10-24 21:55:51 UTC (rev 2463)
< at >< at > -34,7 +34,7 < at >< at >
  * Constructor
  * This does nothing. Much like goggles.
  */
-public function __construct($name) {
+public function __construct() {
 
 // Eh bien.

Ampache SVN - r2462 - in trunk: lib lib/class templates

ampache-dev — 2010-10-15T19:16:42

Author: flowerysong
Date: 2010-10-15 12:16:42 -0700 (Fri, 15 Oct 2010)
New Revision: 2462

Modified:
   trunk/lib/class/catalog.class.php
   trunk/lib/class/song.class.php
   trunk/lib/class/user.class.php
   trunk/lib/general.lib.php
   trunk/templates/show_duplicates.inc.php
   trunk/templates/show_song.inc.php
   trunk/templates/show_stats.inc.php
Log:
Use a function to format bytes -> human-readable sizes. Also bump catalog build
memory profiling logging to level 5; fixes FS#141.


Modified: trunk/lib/class/catalog.class.php
===================================================================
--- trunk/lib/class/catalog.class.php2010-10-12 20:40:25 UTC (rev 2461)
+++ trunk/lib/class/catalog.class.php2010-10-15 19:16:42 UTC (rev 2462)
< at >< at > -202,23 +202,8 < at >< at >
 
 $hours = floor($results['time']/3600);
 
-// Convert size to megabytes
-$size =  $results['size']/1048576;
+$results['formatted_size'] = format_bytes($results['size']);
 
-// Do pretty formatting and final unit conversion if needed
-if ($

Ampache SVN - r2461 - trunk/lib

ampache-dev — 2010-10-12T20:40:26

Author: flowerysong
Date: 2010-10-12 13:40:25 -0700 (Tue, 12 Oct 2010)
New Revision: 2461

Modified:
   trunk/lib/install.php
Log:
Add fallback to the old method of downloading the config file if the config
file cannot be written to.


Modified: trunk/lib/install.php
===================================================================
--- trunk/lib/install.php2010-10-12 11:40:19 UTC (rev 2460)
+++ trunk/lib/install.php2010-10-12 20:40:25 UTC (rev 2461)
< at >< at > -236,13 +236,6 < at >< at >
 
 $config_file = Config::get('prefix') . '/config/ampache.cfg.php';
 
-// Make sure the directory is writeable OR the empty config file is
-if (!is_writeable(Config::get('prefix') . '/config/') AND !is_writeable($config_file)) {
-/* HINT: Config File */
-Error::add('general',sprintf(_('%s is not writeable'),$config_file));
-return false;
-}
-
         $data['database_username'] = $username;
         $data['database_password'] = $password;
         $data['database_hostname'] = $hostname;
< at >< at > -270,16 +263,25 < at >< at >
 
 $final = genera

Ampache SVN - r2460 - trunk/docs

ampache-dev — 2010-10-12T11:40:19

Author: vollmerk
Date: 2010-10-12 04:40:19 -0700 (Tue, 12 Oct 2010)
New Revision: 2460

Modified:
   trunk/docs/README
Log:
Update Readme to correctly list supported clients

Modified: trunk/docs/README
===================================================================
--- trunk/docs/README2010-10-09 08:12:53 UTC (rev 2459)
+++ trunk/docs/README2010-10-12 11:40:19 UTC (rev 2460)
< at >< at > -70,7 +70,7 < at >< at >
 - Integrated Flash Player
 - Automatic Downsampling based on load
 - Local/Remote network definition based downsampling
-- On the Fly Transcoding
+- On the Fly Transcoding (Requires additional applications)
 - Localplay
 - Music Player Daemon (MPD)
 - Winamp using (HTTPQ)
< at >< at > -78,7 +78,7 < at >< at >
 - Icecast2
 - Democratic Vote based playback
 - 3rd Party clients using API (Amarok,Coherence,Quickplay)
-- 3rd Party Mobile clients using API (Amdroid - Android,Amphone - Iphone)
+- 3rd Party Mobile clients using API (Android,Iphone,Blackberry,PalmOS)
 
   C) Current Translations

Ampache SVN - r2459 - trunk/config

ampache-dev — 2010-10-09T08:12:53

Author: flowerysong
Date: 2010-10-09 01:12:53 -0700 (Sat, 09 Oct 2010)
New Revision: 2459

Modified:
   trunk/config/ampache.cfg.php.dist
Log:
Remove duplicated config entries.


Modified: trunk/config/ampache.cfg.php.dist
===================================================================
--- trunk/config/ampache.cfg.php.dist2010-10-09 08:06:12 UTC (rev 2458)
+++ trunk/config/ampache.cfg.php.dist2010-10-09 08:12:53 UTC (rev 2459)
< at >< at > -462,22 +462,6 < at >< at >
 ; DEFAULT: false
 ;captcha_public_reg = "false"
 
-; This setting defines the mail domain you're in.
-; DEFAULT: example.com 
-;mail_domain = "example.com"
-
-; This setting will be used as the user part of the mail address for notifications.
-; For example, setting this to 'me' will set the sender to 'me< at >example.com'.
-; DEFAULT: info
-;mail_user = "info"
-
-; This setting affects how strictly candidate email addresses are checked.
-; You can select "strict" or "easy" or "none".
-; "easy" does a regex match, "strict" actually performs some SMTP transactions

Ampache SVN - r2458 - in trunk: . admin config lib/classmodules/validatemail templates

ampache-dev — 2010-10-09T08:06:12

Author: flowerysong
Date: 2010-10-09 01:06:12 -0700 (Sat, 09 Oct 2010)
New Revision: 2458

Modified:
   trunk/admin/mail.php
   trunk/config/ampache.cfg.php.dist
   trunk/lib/class/ampachemail.class.php
   trunk/lib/class/registration.class.php
   trunk/lostpassword.php
   trunk/modules/validatemail/validateEmail.php
   trunk/templates/show_mail_users.inc.php
Log:
Refactor mail handling a bit and make registration use the same method as the 
other places that send mail.


Modified: trunk/admin/mail.php
===================================================================
--- trunk/admin/mail.php2010-10-08 15:56:06 UTC (rev 2457)
+++ trunk/admin/mail.php2010-10-09 08:06:12 UTC (rev 2458)
< at >< at > -43,43 +43,31 < at >< at >
 mb_language("uni");
 }
 
-$clients = AmpacheMail::get_users($_REQUEST['to']);
+$mailer = new AmpacheMail();
 
-foreach ($clients as $client) {
-if(function_exists('mb_encode_mimeheader')) {
-$recipient .= mb_encode_mimeheader($client['fullname']) ." <" . $client['email'] . ">, ";
-} e

Ampache SVN - r2457 - trunk/config

ampache-dev — 2010-10-08T15:56:06

Author: flowerysong
Date: 2010-10-08 08:56:06 -0700 (Fri, 08 Oct 2010)
New Revision: 2457

Modified:
   trunk/config/ampache.cfg.php.dist
Log:
Need to change the config version in *two* places, not just one.


Modified: trunk/config/ampache.cfg.php.dist
===================================================================
--- trunk/config/ampache.cfg.php.dist2010-10-06 16:58:31 UTC (rev 2456)
+++ trunk/config/ampache.cfg.php.dist2010-10-08 15:56:06 UTC (rev 2457)
< at >< at > -7,7 +7,7 < at >< at >
 ; if this config file is up to date 
 ; this is compared against a value hard-coded
 ; into the init script
-config_version = 10
+config_version = 11
 
 ;###################
 ; Path Vars        #

Ampache SVN - r2456 - in trunk: config docs lib lib/classmodules/plugins

ampache-dev — 2010-10-06T16:58:31

Author: flowerysong
Date: 2010-10-06 09:58:31 -0700 (Wed, 06 Oct 2010)
New Revision: 2456

Added:
   trunk/modules/plugins/MusicBrainz.plugin.php
Modified:
   trunk/config/ampache.cfg.php.dist
   trunk/docs/CHANGELOG
   trunk/docs/PLUGINS
   trunk/lib/class/preference.class.php
   trunk/lib/class/vainfo.class.php
   trunk/lib/init.php
Log:
Break everyone's config by changing metadata gathering.


Modified: trunk/config/ampache.cfg.php.dist
===================================================================
--- trunk/config/ampache.cfg.php.dist2010-10-04 22:31:29 UTC (rev 2455)
+++ trunk/config/ampache.cfg.php.dist2010-10-06 16:58:31 UTC (rev 2456)
< at >< at > -211,12 +211,18 < at >< at >
 ; music. If none of the listed tags are found then
 ; ampache will default to the first tag format
 ; that was found. 
-; POSSIBLE VALUES: id3v1 id3v2 file vorbiscomment 
-;                  quicktime ape asf 
-; DEFAULT: id3v2,id3v1 vorbiscomment quicktime ape
-; asf file
-tag_order = "id3v2,id3v1,vorbiscomment,quicktime,ape,asf,file"
+;

Ampache SVN - r2455 - trunk/config

ampache-dev — 2010-10-04T22:31:29

Author: flowerysong
Date: 2010-10-04 15:31:29 -0700 (Mon, 04 Oct 2010)
New Revision: 2455

Modified:
   trunk/config/ampache.cfg.php.dist
Log:
Remove misleading comment about debugging from the config file.


Modified: trunk/config/ampache.cfg.php.dist
===================================================================
--- trunk/config/ampache.cfg.php.dist2010-09-25 04:55:26 UTC (rev 2454)
+++ trunk/config/ampache.cfg.php.dist2010-10-04 22:31:29 UTC (rev 2455)
< at >< at > -339,10 +339,7 < at >< at >
 max_amazon_results_pages = 1
 
 ; Debug
-; If this is enabled Ampache will get really chatty
-; warning this can crash browser during catalog builds due to 
-; the amount of text that is dumped out this will also cause 
-; ampache to write to the log file
+; If this is enabled Ampache will write debugging information to the log file
 ; DEFAULT: false
 ;debug = "false"

Ampache SVN - r2454 - trunk/templates

ampache-dev — 2010-09-25T04:55:26

Author: flowerysong
Date: 2010-09-24 21:55:26 -0700 (Fri, 24 Sep 2010)
New Revision: 2454

Modified:
   trunk/templates/show_login_form.inc.php
Log:
Link the logo on the login screen to root rather than back to the login screen.
Same behaviour with auth enabled, but is slightly nicer with auth optional.


Modified: trunk/templates/show_login_form.inc.php
===================================================================
--- trunk/templates/show_login_form.inc.php2010-09-21 16:59:49 UTC (rev 2453)
+++ trunk/templates/show_login_form.inc.php2010-09-25 04:55:26 UTC (rev 2454)
< at >< at > -46,7 +46,7 < at >< at >
 <div id="maincontainer">
 <div id="header"><!-- This is the header -->
 <h1 id="headerlogo">
-  <a href="<?php echo Config::get('web_path'); ?>/login.php">
+  <a href="<?php echo Config::get('web_path'); ?>">
     <img src="<?php echo Config::get('web_path'); ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="<?php echo Config::get('site_title'); ?>" alt="<?php echo Config::get('site_title'

Ampache SVN - r2453 - trunk/templates

ampache-dev — 2010-09-21T16:59:50

Author: flowerysong
Date: 2010-09-21 09:59:49 -0700 (Tue, 21 Sep 2010)
New Revision: 2453

Modified:
   trunk/templates/list_header.inc.php
Log:
Some cleanup and optimisation of list headers.  Fixes FS#137.


Modified: trunk/templates/list_header.inc.php
===================================================================
--- trunk/templates/list_header.inc.php2010-09-18 14:58:23 UTC (rev 2452)
+++ trunk/templates/list_header.inc.php2010-09-21 16:59:49 UTC (rev 2453)
< at >< at > -31,11 +31,11 < at >< at >
 $limit= $browse->get_offset();
 $start= $browse->get_start();
 $total= $browse->get_total();
-$uid  = Config::get('list_header_uid');
+$uid= Config::get('list_header_uid');
 $sides  = 5;
 
 // ++ the uid
-Config::set('list_header_uid',$uid+1,1);
+Config::set('list_header_uid', $uid + 1, 1);
 
 // Next
 $next_offset = $start + $limit;
< at >< at > -46,61 +46,64 < at >< at >
 if ($prev_offset < 0) { $prev_offset = '0'; }
 
 /* Calculate how many pages total exist */
-$pages  = ceil($total/$limit);
-
-/* Calculate current page and how many w

Ampache SVN - r2452 - in trunk: . templates

ampache-dev — 2010-09-18T14:58:24

Author: flowerysong
Date: 2010-09-18 07:58:23 -0700 (Sat, 18 Sep 2010)
New Revision: 2452

Added:
   trunk/templates/install_header.inc.php
Modified:
   trunk/lostpassword.php
   trunk/templates/show_install.inc.php
   trunk/templates/show_install_account.inc.php
   trunk/templates/show_install_check.inc.php
   trunk/templates/show_install_config.inc.php
   trunk/templates/show_install_lang.inc.php
Log:
Some grammar fixes and a code dedupe for installation.  Identical code in 5
files makes the baby Jesus cry and eventually results in the code not being
identical.


Modified: trunk/lostpassword.php
===================================================================
--- trunk/lostpassword.php2010-08-17 20:59:16 UTC (rev 2451)
+++ trunk/lostpassword.php2010-09-18 14:58:23 UTC (rev 2452)
< at >< at > -36,9 +36,9 < at >< at >
 $result = send_newpassword($email, $current_ip);
 }
 if ($result) {
-Error::add('general',_('Password has been send'));
+Error::add('general', _('Password has been sent'));
 } else {
-Error

Ampache SVN - r2451 - in trunk: . config lib lib/class templates

ampache-dev — 2010-08-17T20:59:16

Author: flowerysong
Date: 2010-08-17 13:59:16 -0700 (Tue, 17 Aug 2010)
New Revision: 2451

Added:
   trunk/lib/class/recommendation.class.php
   trunk/templates/show_recommended_artists.inc.php
Modified:
   trunk/artists.php
   trunk/config/ampache.cfg.php.dist
   trunk/lib/class/artist.class.php
   trunk/lib/debug.lib.php
   trunk/templates/show_artist.inc.php
   trunk/templates/show_install_check.inc.php
   trunk/templates/show_now_playing_row.inc.php
Log:
Refactored Last.FM recommendations; drop new dependency on curl since
Snoopy works just as well for this application.


Modified: trunk/artists.php
===================================================================
--- trunk/artists.php2010-08-05 17:39:09 UTC (rev 2450)
+++ trunk/artists.php2010-08-17 20:59:16 UTC (rev 2451)
< at >< at > -34,6 +34,14 < at >< at >
 $object_ids = $artist->get_albums();
 $object_type = 'album';
 require_once Config::get('prefix') . '/templates/show_artist.inc.php';
+if (Config::get('lastfm_api_key')) {
+if ($object_ids = Recommen

Ampache SVN - r2450 - in trunk/modules: localplay mpd

ampache-dev — 2010-08-05T17:39:09

Author: flowerysong
Date: 2010-08-05 10:39:09 -0700 (Thu, 05 Aug 2010)
New Revision: 2450

Added:
   trunk/modules/mpd/AUTHORS
Removed:
   trunk/modules/mpd/USAGE
Modified:
   trunk/modules/localplay/mpd.controller.php
   trunk/modules/mpd/CHANGELOG
   trunk/modules/mpd/mpd.class.php
Log:
MPD class rewrite.


Modified: trunk/modules/localplay/mpd.controller.php
===================================================================
--- trunk/modules/localplay/mpd.controller.php2010-07-30 00:11:07 UTC (rev 2449)
+++ trunk/modules/localplay/mpd.controller.php2010-08-05 17:39:09 UTC (rev 2450)
< at >< at > -28,8 +28,10 < at >< at >
 class AmpacheMpd extends localplay_controller {
 
 /* Variables */
-private $version = '000001';
+private $version = '000002';
 private $description= 'Controls an instance of MPD';
+
+private $_add_count = 0;
 
 /* Constructed variables */
 private $_mpd;
< at >< at > -277,16 +279,16 < at >< at >
 public function add($object) {
 
 // If we haven't added anything then check to see if we should clear
-if ($thi