';
-
} // start_container
/**
@@ -246,12 +240,13 @@ class Ajax
*/
public static function end_container()
{
- if (defined('AJAX_INCLUDE') && !self::$include_override) { return true; }
+ if (defined('AJAX_INCLUDE') && !self::$include_override) {
+ return true;
+ }
echo "
";
self::$include_override = false;
-
} // end_container
-
} // end Ajax class
+
diff --git a/sources/lib/class/album.class.php b/sources/lib/class/album.class.php
index be71bee..d40730c 100644
--- a/sources/lib/class/album.class.php
+++ b/sources/lib/class/album.class.php
@@ -2,22 +2,21 @@
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
- * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
* Copyright 2001 - 2015 Ampache.org
*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License v2
- * as published by the Free Software Foundation.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see \n" . $message; + AmpError::$state = true; + AmpError::$errors[$name] .= "
\n" . $message; $_SESSION['errors'][$name] .= "
\n" . $message; } @@ -86,7 +84,6 @@ class Error ob_flush(); flush(); } - } // add /** @@ -95,10 +92,11 @@ class Error */ public static function occurred() { - if (self::$state == '1') { return true; } + if (self::$state == '1') { + return true; + } return false; - } // occurred /** @@ -107,10 +105,11 @@ class Error */ public static function get($name) { - if (!isset(Error::$errors[$name])) { return ''; } - - return Error::$errors[$name]; + if (!isset(AmpError::$errors[$name])) { + return ''; + } + return AmpError::$errors[$name]; } // get /** @@ -121,10 +120,11 @@ class Error public static function display($name) { // Be smart about this, if no error don't print - if (!isset(Error::$errors[$name])) { return ''; } - - echo '
' . T_(Error::$errors[$name]) . '
'; + if (!isset(AmpError::$errors[$name])) { + return ''; + } + echo '' . T_(AmpError::$errors[$name]) . '
'; } // display /** @@ -133,13 +133,14 @@ class Error */ public static function auto_init() { - if (!is_array($_SESSION['errors'])) { return false; } + if (!is_array($_SESSION['errors'])) { + return false; + } // Re-insert them foreach ($_SESSION['errors'] as $key=>$error) { self::add($key,$error); } - } // auto_init - } // Error + diff --git a/sources/lib/class/api.class.php b/sources/lib/class/api.class.php index e7cd5b6..ce7175c 100644 --- a/sources/lib/class/api.class.php +++ b/sources/lib/class/api.class.php @@ -2,21 +2,21 @@ /* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * - * LICENSE: GNU General Public License, version 2 (GPLv2) + * LICENSE: GNU Affero General Public License, version 3 (AGPLv3) * Copyright 2001 - 2015 Ampache.org * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License v2 - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see";
- echo Ajax::text('?page=stream&action=directplay&object_type=' . $object_type . '&object_id=' . $object_id . '\' + getPagePlaySettings() + \'', '', 'directplay_art_' . $object_type . '_' .$object_id);
- echo "
";
+ // This to keep browser cache feature but force a refresh in case image just changed
+ if (Art::has_db($object_id, $object_type)) {
+ $art = new Art($object_id, $object_type);
+ if ($art->get_db()) {
+ $imgurl .= '&fooid=' . $art->id;
}
-
+ }
+ echo "";
+ echo Ajax::text('?page=stream&action=directplay&object_type=' . $object_type . '&object_id=' . $object_id . '\' + getPagePlaySettings() + \'', '', 'directplay_art_' . $object_type . '_' . $object_id);
+ echo "
";
+ }
+
+ if ($prettyPhoto) {
$libitem = new $object_type($object_id);
echo "";
if ($GLOBALS['user']->has_access(50) || ($GLOBALS['user']->has_access(25) && $GLOBALS['user']->id == $libitem->get_user_owner())) {
@@ -1728,10 +1768,11 @@ class Art extends database_object
}
echo"
";
}
+
echo "\n";
echo "";
return true;
}
-
} // Art
+
diff --git a/sources/lib/class/artist.class.php b/sources/lib/class/artist.class.php
index 11587a8..f55fcc1 100644
--- a/sources/lib/class/artist.class.php
+++ b/sources/lib/class/artist.class.php
@@ -2,21 +2,21 @@
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
- * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
* Copyright 2001 - 2015 Ampache.org
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License v2
- * as published by the Free Software Foundation.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see '; + $cmd = 'git pull https://github.com/ampache/ampache.git'; + echo T_('Updating Ampache sources with `' . $cmd . '` ...') . '
'; ob_flush(); chdir(AmpConfig::get('prefix')); - exec('git pull https://github.com/ampache/ampache.git'); + exec($cmd); echo T_('Done') . '
'; ob_flush(); self::get_latest_version(true); } + + /** + * Update project dependencies. + */ + public static function update_dependencies() + { + $cmd = 'composer install --prefer-source --no-interaction'; + echo T_('Updating dependencies with `' . $cmd . '` ...') . '
'; + ob_flush(); + chdir(AmpConfig::get('prefix')); + exec($cmd); + echo T_('Done') . '
'; + ob_flush(); + } } diff --git a/sources/lib/class/bookmark.class.php b/sources/lib/class/bookmark.class.php new file mode 100644 index 0000000..cd0cb00 --- /dev/null +++ b/sources/lib/class/bookmark.class.php @@ -0,0 +1,156 @@ +. + * + */ + +/** + * Bookmark class + * + * This manage bookmark on playable items + * + */ +class Bookmark extends database_object +{ + // Public variables + public $id; + public $user; + public $object_id; + public $object_type; + public $position; + public $comment; + public $creation_date; + public $update_date; + + public $f_user; + + /** + * Constructor + * This is run every time a new object is created, and requires + * the id and type of object that we need to pull for + */ + public function __construct ($object_id, $object_type = null, $user_id = null) + { + if (!$object_id) { + return false; + } + + if (!$object_type) { + $info = $this->get_info($object_id); + } else { + if ($user_id == null) { + $user_id = $GLOBALS['user']->id; + } + + $sql = "SELECT * FROM `bookmark` WHERE `object_type` = ? AND `object_id` = ? AND `user` = ?"; + $db_results = Dba::read($sql, array($object_type, $object_id, $user_id)); + + if (!$db_results) { + return false; + } + + $info = Dba::fetch_assoc($db_results); + } + + // Foreach what we've got + foreach ($info as $key=>$value) { + $this->$key = $value; + } + + return true; + } + + /** + * gc + * + * Remove bookmark for items that no longer exist. + */ + public static function gc($object_type = null, $object_id = null) + { + $types = array('song', 'video', 'podcast_episode'); + + if ($object_type != null) { + if (in_array($object_type, $types)) { + $sql = "DELETE FROM `bookmark` WHERE `object_type` = ? AND `object_id` = ?"; + Dba::write($sql, array($object_type, $object_id)); + } else { + debug_event('bookmark', 'Garbage collect on type `' . $object_type . '` is not supported.', 1); + } + } else { + foreach ($types as $type) { + Dba::write("DELETE FROM `bookmark` USING `bookmark` LEFT JOIN `$type` ON `$type`.`id` = `bookmark`.`object_id` WHERE `bookmark`.`object_type` = '$type' AND `$type`.`id` IS NULL"); + } + } + } + + public static function get_bookmarks_ids($user = null) + { + $ids = array(); + if ($user == null) { + $user = $GLOBALS['user']; + } + + $sql = "SELECT `id` FROM `bookmark` WHERE `user` = ?"; + $db_results = Dba::read($sql, array($user->id)); + while ($results = Dba::fetch_assoc($db_results)) { + $ids[] = $results['id']; + } + + return $ids; + } + + public static function get_bookmarks($user = null) + { + $bookmarks = array(); + $ids = self::get_bookmarks_ids($user); + foreach ($ids as $id) { + $bookmarks[] = new Bookmark($id); + } + return $bookmarks; + } + + public static function create(array $data) + { + $user = $data['user'] ?: $GLOBALS['user']->id; + $position = $data['position'] ?: 0; + $comment = scrub_in($data['comment']); + + $sql = "INSERT INTO `bookmark` (`user`, `position`, `comment`, `object_type`, `object_id`, `creation_date`, `update_date`) VALUES (?, ?, ?, ?, ?, ?, ?)"; + return Dba::write($sql, array($user, $position, $comment, $data['object_type'], $data['object_id'], time(), time())); + } + + public function update($position) + { + $sql = "UPDATE `bookmark` SET `position` = ?, `update_date` = ? WHERE `id` = ?"; + return Dba::write($sql, array($position, time(), $this->id)); + } + + public function remove() + { + $sql = "DELETE FROM `bookmark` WHERE `id` = ?"; + return Dba::write($sql, array($this->id)); + } + + public function format() + { + $user = new User($this->user); + $f_user = $user->username; + } +} //end bookmark class + diff --git a/sources/lib/class/broadcast.class.php b/sources/lib/class/broadcast.class.php index 56669cc..ba05fc2 100644 --- a/sources/lib/class/broadcast.class.php +++ b/sources/lib/class/broadcast.class.php @@ -2,21 +2,21 @@ /* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * - * LICENSE: GNU General Public License, version 2 (GPLv2) + * LICENSE: GNU Affero General Public License, version 3 (AGPLv3) * Copyright 2001 - 2015 Ampache.org * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License v2 - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see
', strip_tags($results['lyrics'])); - $new_song->bitrate = $results['bitrate']; - $new_song->rate = $results['rate']; - $new_song->mode = ($results['mode'] == 'cbr') ? 'cbr' : 'vbr'; - $new_song->size = $results['size']; - $new_song->time = $results['time']; - $new_song->mime = $results['mime']; - $new_song->track = intval($results['track']); - $new_song->mbid = $results['mb_trackid']; - $new_song->label = $results['publisher']; - $new_song->composer = $results['composer']; + $new_song->bitrate = $results['bitrate']; + $new_song->rate = $results['rate']; + $new_song->mode = ($results['mode'] == 'cbr') ? 'cbr' : 'vbr'; + $new_song->size = $results['size']; + $new_song->time = $results['time']; + $new_song->mime = $results['mime']; + $new_song->track = intval($results['track']); + $new_song->mbid = $results['mb_trackid']; + $new_song->label = $results['publisher']; + $new_song->composer = $results['composer']; $new_song->replaygain_track_gain = floatval($results['replaygain_track_gain']); $new_song->replaygain_track_peak = floatval($results['replaygain_track_peak']); $new_song->replaygain_album_gain = floatval($results['replaygain_album_gain']); $new_song->replaygain_album_peak = floatval($results['replaygain_album_peak']); - $tags = Tag::get_object_tags('song', $song->id); + $tags = Tag::get_object_tags('song', $song->id); if ($tags) { foreach ($tags as $tag) { $song->tags[] = $tag['name']; @@ -1508,6 +1621,17 @@ abstract class Catalog extends database_object /* Since we're doing a full compare make sure we fill the extended information */ $song->fill_ext_info(); + + if (Song::isCustomMetadataEnabled()) { + $ctags = self::get_clean_metadata($song, $results); + if (method_exists($song, 'updateOrInsertMetadata') && $song::isCustomMetadataEnabled()) { + $ctags = array_diff_key($ctags, array_flip($song->getDisabledMetadataFields())); + foreach ($ctags as $tag => $value) { + $field = $song->getField($tag); + $song->updateOrInsertMetadata($field, $value); + } + } + } $info = Song::compare_song_information($song, $new_song); if ($info['change']) { @@ -1543,13 +1667,92 @@ abstract class Catalog extends database_object debug_event('update', "$song->file : no differences found", 5); } + // If song rating tag exists and is well formed (array user=>rating), update it + if ($song->id && array_key_exists('rating', $results) && is_array($results['rating'])) { + // For each user's ratings, call the function + foreach ($results['rating'] as $user => $rating) { + debug_event('Rating', "Updating rating for Song " . $song->id . " to $rating for user $user", 5); + $o_rating = new Rating($song->id, 'song'); + $o_rating->set_rating($rating, $user); + } + } return $info; } // update_song_from_tags - public function update_video_from_tags($results, Video $video) + public static function update_video_from_tags($results, Video $video) { - // TODO: implement this - return null; + /* Setup the vars */ + $new_video = new Video(); + $new_video->file = $results['file']; + $new_video->title = $results['title']; + $new_video->size = $results['size']; + $new_video->video_codec = $results['video_codec']; + $new_video->audio_codec = $results['audio_codec']; + $new_video->resolution_x = $results['resolution_x']; + $new_video->resolution_y = $results['resolution_y']; + $new_video->time = $results['time']; + $new_video->release_date = $results['release_date'] ?: 0; + $new_video->bitrate = $results['bitrate']; + $new_video->mode = $results['mode']; + $new_video->channels = $results['channels']; + $new_video->display_x = $results['display_x']; + $new_video->display_y = $results['display_y']; + $new_video->frame_rate = $results['frame_rate']; + $new_video->video_bitrate = $results['video_bitrate']; + $tags = Tag::get_object_tags('video', $video->id); + if ($tags) { + foreach ($tags as $tag) { + $video->tags[] = $tag['name']; + } + } + $new_video->tags = $results['genre']; + + $info = Video::compare_video_information($video, $new_video); + if ($info['change']) { + debug_event('update', $video->file . " : differences found, updating database", 5); + + $video->update_video($video->id, $new_video); + + if ($video->tags != $new_video->tags) { + Tag::update_tag_list(implode(',', $new_video->tags), 'video', $video->id, true); + } + } else { + debug_event('update', $video->file . " : no differences found", 5); + } + + return $info; + } + + /** + * Get rid of all tags found in the libraryItem + * @param library_item $libraryItem + * @param array $metadata + * @return array + */ + private static function get_clean_metadata(library_item $libraryItem, $metadata) + { + $tags = array_diff_key( + $metadata, + get_object_vars($libraryItem), + array_flip($libraryItem::$aliases ?: array()) + ); + + return array_filter($tags); + } + + /** + * + * @param library_item $libraryItem + * @param type $metadata + */ + public static function add_metadata(library_item $libraryItem, $metadata) + { + $tags = self::get_clean_metadata($libraryItem, $metadata); + + foreach ($tags as $tag => $value) { + $field = $libraryItem->getField($tag); + $libraryItem->addMetadata($field, $value); + } } /** @@ -1589,14 +1792,14 @@ abstract class Catalog extends database_object debug_event('clean', 'Starting on ' . $this->name, 5); if (!defined('SSE_OUTPUT')) { - require AmpConfig::get('prefix') . '/templates/show_clean_catalog.inc.php'; + require AmpConfig::get('prefix') . UI::find_template('show_clean_catalog.inc.php'); ob_flush(); flush(); } $dead_total = $this->clean_catalog_proc(); - debug_event('clean', 'clean finished, ' . $dead_total . ' removed from '. $this->name, 5); + debug_event('clean', 'clean finished, ' . $dead_total . ' removed from ' . $this->name, 5); // Remove any orphaned artists/albums/etc. self::gc(); @@ -1619,7 +1822,7 @@ abstract class Catalog extends database_object public function verify_catalog() { if (!defined('SSE_OUTPUT')) { - require AmpConfig::get('prefix') . '/templates/show_verify_catalog.inc.php'; + require AmpConfig::get('prefix') . UI::find_template('show_verify_catalog.inc.php'); ob_flush(); flush(); } @@ -1654,10 +1857,15 @@ abstract class Catalog extends database_object Stats::gc(); Rating::gc(); Userflag::gc(); + Useractivity::gc(); Playlist::gc(); Tmp_Playlist::gc(); Shoutbox::gc(); Tag::gc(); + + // TODO: use InnoDB with foreign keys and on delete cascade to get rid of garbage collection + \Lib\Metadata\Repository\Metadata::gc(); + \Lib\Metadata\Repository\MetadataField::gc(); debug_event('catalog', 'Database cleanup ended', 5); } @@ -1682,6 +1890,32 @@ abstract class Catalog extends database_object return array('string' => $string, 'prefix' => $prefix); } // trim_prefix + public static function normalize_year($year) + { + if (empty($year)) { + return 0; + } + + $year = intval($year); + if ($year < 0 || $year > 9999) { + return 0; + } + + return $year; + } + + /** + * trim_featuring + * Splits artists featuring from the string + * @param string $string + * @return array + */ + public static function trim_featuring($string) + { + $trimmed = array_map('trim', explode(' feat. ', $string)); + return $trimmed; + } // trim_featuring + /** * check_title * this checks to make sure something is @@ -1708,7 +1942,7 @@ abstract class Catalog extends database_object public static function import_playlist($playlist) { $data = file_get_contents($playlist); - if (substr($playlist, -3, 3) == 'm3u') { + if (substr($playlist, -3, 3) == 'm3u' || substr($playlist, -4, 4) == 'm3u8') { $files = self::parse_m3u($data); } elseif (substr($playlist, -3, 3) == 'pls') { $files = self::parse_pls($data); @@ -1725,8 +1959,8 @@ abstract class Catalog extends database_object $file = trim($file); // Check to see if it's a url from this ampache instance if (substr($file, 0, strlen(AmpConfig::get('web_path'))) == AmpConfig::get('web_path')) { - $data = Stream_URL::parse($file); - $sql = 'SELECT COUNT(*) FROM `song` WHERE `id` = ?'; + $data = Stream_URL::parse($file); + $sql = 'SELECT COUNT(*) FROM `song` WHERE `id` = ?'; $db_results = Dba::read($sql, array($data['id'])); if (Dba::num_rows($db_results)) { $songs[] = $data['id']; @@ -1748,9 +1982,9 @@ abstract class Catalog extends database_object debug_event('catalog', 'Add file ' . $file . ' to playlist.', '5'); // First, try to found the file as absolute path - $sql = "SELECT `id` FROM `song` WHERE `file` = ?"; + $sql = "SELECT `id` FROM `song` WHERE `file` = ?"; $db_results = Dba::read($sql, array($file)); - $results = Dba::fetch_assoc($db_results); + $results = Dba::fetch_assoc($db_results); if (isset($results['id'])) { $songs[] = $results['id']; @@ -1760,9 +1994,9 @@ abstract class Catalog extends database_object // Normalize the file path. realpath requires the files to exists. $file = realpath($file); if ($file) { - $sql = "SELECT `id` FROM `song` WHERE `file` = ?"; + $sql = "SELECT `id` FROM `song` WHERE `file` = ?"; $db_results = Dba::read($sql, array($file)); - $results = Dba::fetch_assoc($db_results); + $results = Dba::fetch_assoc($db_results); if (isset($results['id'])) { $songs[] = $results['id']; @@ -1776,7 +2010,7 @@ abstract class Catalog extends database_object debug_event('import_playlist', "Parsed " . $playlist . ", found " . count($songs) . " songs", 5); if (count($songs)) { - $name = $pinfo['extension'] . " - " . $pinfo['filename']; + $name = $pinfo['extension'] . " - " . $pinfo['filename']; $playlist_id = Playlist::create($name, 'public'); if (!$playlist_id) { @@ -1811,7 +2045,7 @@ abstract class Catalog extends database_object */ public static function parse_m3u($data) { - $files = array(); + $files = array(); $results = explode("\n", $data); foreach ($results as $value) { @@ -1832,7 +2066,7 @@ abstract class Catalog extends database_object */ public static function parse_pls($data) { - $files = array(); + $files = array(); $results = explode("\n", $data); foreach ($results as $value) { @@ -1857,7 +2091,7 @@ abstract class Catalog extends database_object public static function parse_asx($data) { $files = array(); - $xml = simplexml_load_string($data); + $xml = simplexml_load_string($data); if ($xml) { foreach ($xml->entry as $entry) { @@ -1880,7 +2114,7 @@ abstract class Catalog extends database_object public static function parse_xspf($data) { $files = array(); - $xml = simplexml_load_string($data); + $xml = simplexml_load_string($data); if ($xml) { foreach ($xml->trackList->track as $track) { $file = trim($track->location); @@ -1905,7 +2139,7 @@ abstract class Catalog extends database_object set_time_limit(0); // First remove the songs in this catalog - $sql = "DELETE FROM `song` WHERE `catalog` = ?"; + $sql = "DELETE FROM `song` WHERE `catalog` = ?"; $db_results = Dba::write($sql, array($catalog_id)); // Only if the previous one works do we go on @@ -1913,7 +2147,7 @@ abstract class Catalog extends database_object return false; } - $sql = "DELETE FROM `video` WHERE `catalog` = ?"; + $sql = "DELETE FROM `video` WHERE `catalog` = ?"; $db_results = Dba::write($sql, array($catalog_id)); if (!$db_results) { @@ -1922,10 +2156,11 @@ abstract class Catalog extends database_object $catalog = self::create_from_id($catalog_id); - if (!$catalog->id) + if (!$catalog->id) { return false; + } - $sql = 'DELETE FROM `catalog_' . $catalog->get_type() . '` WHERE catalog_id = ?'; + $sql = 'DELETE FROM `catalog_' . $catalog->get_type() . '` WHERE catalog_id = ?'; $db_results = Dba::write($sql, array($catalog_id)); if (!$db_results) { @@ -1968,21 +2203,21 @@ abstract class Catalog extends database_object $song = new Song($results['id']); $song->format(); - $xml = array(); - $xml['key']= $results['id']; - $xml['dict']['Track ID']= intval($results['id']); - $xml['dict']['Name'] = $song->title; - $xml['dict']['Artist'] = $song->f_artist_full; - $xml['dict']['Album'] = $song->f_album_full; - $xml['dict']['Total Time'] = intval($song->time) * 1000; // iTunes uses milliseconds + $xml = array(); + $xml['key'] = $results['id']; + $xml['dict']['Track ID'] = intval($results['id']); + $xml['dict']['Name'] = $song->title; + $xml['dict']['Artist'] = $song->f_artist_full; + $xml['dict']['Album'] = $song->f_album_full; + $xml['dict']['Total Time'] = intval($song->time) * 1000; // iTunes uses milliseconds $xml['dict']['Track Number'] = intval($song->track); - $xml['dict']['Year'] = intval($song->year); - $xml['dict']['Date Added'] = date("Y-m-d\TH:i:s\Z", $song->addition_time); - $xml['dict']['Bit Rate'] = intval($song->bitrate/1000); - $xml['dict']['Sample Rate'] = intval($song->rate); - $xml['dict']['Play Count'] = intval($song->played); - $xml['dict']['Track Type'] = "URL"; - $xml['dict']['Location'] = Song::play_url($song->id); + $xml['dict']['Year'] = intval($song->year); + $xml['dict']['Date Added'] = date("Y-m-d\TH:i:s\Z", $song->addition_time); + $xml['dict']['Bit Rate'] = intval($song->bitrate/1000); + $xml['dict']['Sample Rate'] = intval($song->rate); + $xml['dict']['Play Count'] = intval($song->played); + $xml['dict']['Track Type'] = "URL"; + $xml['dict']['Location'] = Song::play_url($song->id); echo xoutput_from_array($xml, true, 'itunes'); // flush output buffer } // while result @@ -1997,12 +2232,12 @@ abstract class Catalog extends database_object echo '"' . $song->id . '","' . $song->title . '","' . $song->f_artist_full . '","' . - $song->f_album_full .'","' . + $song->f_album_full . '","' . $song->f_time . '","' . $song->f_track . '","' . - $song->year .'","' . + $song->year . '","' . date("Y-m-d\TH:i:s\Z", $song->addition_time) . '","' . - $song->f_bitrate .'","' . + $song->f_bitrate . '","' . $song->played . '","' . $song->file . "\n"; } @@ -2039,12 +2274,12 @@ abstract class Catalog extends database_object */ protected static function getSongTags($type, $id) { - $tags = array(); - $db_results = Dba::read('SELECT tag.name FROM tag' - . ' JOIN tag_map ON tag.id = tag_map.tag_id' - . ' JOIN song ON tag_map.object_id = song.id' - . ' WHERE song.' . $type . ' = ? AND tag_map.object_type = "song"' - . ' GROUP BY tag.id', array($id)); + $tags = array(); + $db_results = Dba::read('SELECT `tag`.`name` FROM `tag`' + . ' JOIN `tag_map` ON `tag`.`id` = `tag_map`.`tag_id`' + . ' JOIN `song` ON `tag_map`.`object_id` = `song`.`id`' + . ' WHERE `song`.`' . $type . '` = ? AND `tag_map`.`object_type` = "song"' + . ' GROUP BY `tag`.`id`, `tag`.`name`', array($id)); while ($row = Dba::fetch_assoc($db_results)) { $tags[] = $row['name']; } @@ -2057,14 +2292,125 @@ abstract class Catalog extends database_object $user = $GLOBALS['user']->id; } - if (!$user) + if (!$user) { return false; + } - if (!AmpConfig::get('delete_from_disk')) + if (!AmpConfig::get('delete_from_disk')) { return false; + } return (Access::check('interface','75') || ($libitem->get_user_owner() == $user && AmpConfig::get('upload_allow_remove'))); } + + public static function process_action($action, $catalogs, $options = null) + { + if (!$options || !is_array($options)) { + $options = array(); + } + + switch ($action) { + case 'add_to_all_catalogs': + $catalogs = Catalog::get_catalogs(); + case 'add_to_catalog': + if ($catalogs) { + foreach ($catalogs as $catalog_id) { + $catalog = Catalog::create_from_id($catalog_id); + if ($catalog !== null) { + $catalog->add_to_catalog($options); + } + } + + if (!defined('SSE_OUTPUT')) { + AmpError::display('catalog_add'); + } + } + break; + case 'update_all_catalogs': + $catalogs = Catalog::get_catalogs(); + case 'update_catalog': + if ($catalogs) { + foreach ($catalogs as $catalog_id) { + $catalog = Catalog::create_from_id($catalog_id); + if ($catalog !== null) { + $catalog->verify_catalog(); + } + } + } + break; + case 'full_service': + if (!$catalogs) { + $catalogs = Catalog::get_catalogs(); + } + + /* This runs the clean/verify/add in that order */ + foreach ($catalogs as $catalog_id) { + $catalog = Catalog::create_from_id($catalog_id); + if ($catalog !== null) { + $catalog->clean_catalog(); + $catalog->verify_catalog(); + $catalog->add_to_catalog(); + } + } + Dba::optimize_tables(); + break; + case 'clean_all_catalogs': + $catalogs = Catalog::get_catalogs(); + case 'clean_catalog': + if ($catalogs) { + foreach ($catalogs as $catalog_id) { + $catalog = Catalog::create_from_id($catalog_id); + if ($catalog !== null) { + $catalog->clean_catalog(); + } + } // end foreach catalogs + Dba::optimize_tables(); + } + break; + case 'update_from': + $catalog_id = 0; + // First see if we need to do an add + if ($options['add_path'] != '/' && strlen($options['add_path'])) { + if ($catalog_id = Catalog_local::get_from_path($options['add_path'])) { + $catalog = Catalog::create_from_id($catalog_id); + if ($catalog !== null) { + $catalog->add_to_catalog(array('subdirectory'=>$options['add_path'])); + } + } + } // end if add + + // Now check for an update + if ($options['update_path'] != '/' && strlen($options['update_path'])) { + if ($catalog_id = Catalog_local::get_from_path($options['update_path'])) { + $songs = Song::get_from_path($options['update_path']); + foreach ($songs as $song_id) { + Catalog::update_single_item('song',$song_id); + } + } + } // end if update + + if ($catalog_id <= 0) { + AmpError::add('general', T_("This subdirectory is not part of an existing catalog. Update cannot be processed.")); + } + break; + case 'gather_media_art': + if (!$catalogs) { + $catalogs = Catalog::get_catalogs(); + } + + // Iterate throught the catalogs and gather as needed + foreach ($catalogs as $catalog_id) { + $catalog = Catalog::create_from_id($catalog_id); + if ($catalog !== null) { + require AmpConfig::get('prefix') . UI::find_template('show_gather_art.inc.php'); + flush(); + $catalog->gather_art(); + } + } + break; + } + } } // end of catalog class + diff --git a/sources/lib/class/channel.class.php b/sources/lib/class/channel.class.php index c092f66..98a2a41 100644 --- a/sources/lib/class/channel.class.php +++ b/sources/lib/class/channel.class.php @@ -2,21 +2,21 @@ /* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * - * LICENSE: GNU General Public License, version 2 (GPLv2) + * LICENSE: GNU Affero General Public License, version 3 (AGPLv3) * Copyright 2001 - 2015 Ampache.org * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License v2 - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see
" . $code . " " . $error . "
"; self::apiOutput($html); exit(); } - public static function createApiError($tag, $code, $msg='') + public static function createApiError($tag, $code, $msg = '') { $o = self::tlv('dmap.status', $code); - if (!empty($msg)) { + if (! empty($msg)) { $o .= self::tlv('dmap.statusstring', $msg); } $o = self::tlv($tag, $o); diff --git a/sources/lib/class/database_object.abstract.php b/sources/lib/class/database_object.abstract.php index 6b98433..1aeb01f 100644 --- a/sources/lib/class/database_object.abstract.php +++ b/sources/lib/class/database_object.abstract.php @@ -2,21 +2,21 @@ /* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * - * LICENSE: GNU General Public License, version 2 (GPLv2) + * LICENSE: GNU Affero General Public License, version 3 (AGPLv3) * Copyright 2001 - 2015 Ampache.org * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License v2 - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see" . $code . " " . $error . "
"; self::apiOutput($html); @@ -319,7 +318,8 @@ class Plex_Api ); $action = 'users/sign_in.xml'; - $res = self::myPlexRequest($action, $options, $headers);; + $res = self::myPlexRequest($action, $options, $headers); + ; return $res['xml']['authenticationToken']; } @@ -352,8 +352,8 @@ class Plex_Api public static function publishDeviceConnection($authtoken) { - $headers = array (); - $action = 'devices/' . Plex_XML_Data::getMachineIdentifier() . '?Connection[][uri]=' . Plex_XML_Data::getServerUri() . '&X-Plex-Token=' . $authtoken; + $headers = array (); + $action = 'devices/' . Plex_XML_Data::getMachineIdentifier() . '?Connection[][uri]=' . Plex_XML_Data::getServerUri() . '&X-Plex-Token=' . $authtoken; $curlopts = array( CURLOPT_CUSTOMREQUEST => "PUT" ); @@ -366,7 +366,7 @@ class Plex_Api $headers = array ( 'Content-Type: text/xml' ); - $action = 'servers/' . Plex_XML_Data::getMachineIdentifier() . '.xml?auth_token=' . $authtoken; + $action = 'servers/' . Plex_XML_Data::getMachineIdentifier() . '.xml?auth_token=' . $authtoken; $curlopts = array( CURLOPT_CUSTOMREQUEST => "DELETE" ); @@ -437,7 +437,7 @@ class Plex_Api public static function replay_header($ch, $header) { $rheader = trim($header); - $rhpart = explode(':', $rheader); + $rhpart = explode(':', $rheader); if (!empty($rheader) && count($rhpart) > 1) { if ($rhpart[0] != "Transfer-Encoding") { header($rheader); @@ -462,7 +462,7 @@ class Plex_Api protected static function myPlexRequest($action, $curlopts = array(), $headers = array(), $proxy = false) { - $server = Plex_XML_Data::getServerUri(); + $server = Plex_XML_Data::getServerUri(); $allheaders = array(); if (!$proxy) { $allheadersarr = self::getPlexHeaders(); @@ -495,12 +495,12 @@ class Plex_Api $ch = curl_init($url); curl_setopt_array($ch, $options); - $r = curl_exec($ch); - $res = array(); + $r = curl_exec($ch); + $res = array(); $res['status'] = curl_getinfo($ch, CURLINFO_HTTP_CODE); curl_close($ch); $res['headers'] = self::$request_headers; - $res['raw'] = $r; + $res['raw'] = $r; try { $res['xml'] = simplexml_load_string($r); } catch (Exception $e) { @@ -558,10 +558,9 @@ class Plex_Api { if (count($params) == 2) { if ($params[0] == ':' && $params[1] == 'transcode') { - - $width = $_REQUEST['width']; + $width = $_REQUEST['width']; $height = $_REQUEST['height']; - $url = $_REQUEST['url']; + $url = $_REQUEST['url']; // Replace 32400 request port with the real listening port // *** To `Plex Inc`: *** @@ -573,7 +572,7 @@ class Plex_Api $options = Core::requests_options(); if (strpos($url, $localrs) !== false) { $options = array(); // In case proxy is set, no proxy for local addresses - $url = "http://127.0.0.1:" . Plex_XML_Data::getServerPort() . "/" . substr($url, strlen($localrs)); + $url = "http://127.0.0.1:" . Plex_XML_Data::getServerPort() . "/" . substr($url, strlen($localrs)); } if ($width && $height && $url) { @@ -582,9 +581,9 @@ class Plex_Api ob_clean(); $mime = $request->headers['content-type']; self::setHeader($mime); - $art = new Art(0); + $art = new Art(0); $art->raw = $request->body; - $thumb = $art->generate_thumb($art->raw, array('width' => $width, 'height' => $height), $mime); + $thumb = $art->generate_thumb($art->raw, array('width' => $width, 'height' => $height), $mime); echo $thumb['thumb']; exit(); } @@ -599,14 +598,14 @@ class Plex_Api if ($params[0] == ':' && $params[1] == 'transcode') { if (count($params) == 3) { $format = $_REQUEST['format'] ?: pathinfo($params[2], PATHINFO_EXTENSION); - $url = $_REQUEST['url']; - $br = $_REQUEST['audioBitrate']; + $url = $_REQUEST['url']; + $br = $_REQUEST['audioBitrate']; if (preg_match("/\/parts\/([0-9]+)\//", $url, $matches)) { $song_id = Plex_XML_Data::getAmpacheId($matches[1]); } } elseif (count($params) == 4 && $params[2] == 'universal') { $format = pathinfo($params[3], PATHINFO_EXTENSION); - $path = $_REQUEST['path']; + $path = $_REQUEST['path']; // Should be the maximal allowed bitrate, not necessary the bitrate used but Ampache doesn't support this kind of option yet $br = $_REQUEST['maxAudioBitrate']; if (preg_match("/\/metadata\/([0-9]+)/", $path, $matches)) { @@ -645,19 +644,19 @@ class Plex_Api $n = count($params); if ($n == 2) { $transcode_to = $params[0]; - $action = $params[1]; - $id = ''; + $action = $params[1]; + $id = ''; - $path = $_GET['path']; + $path = $_GET['path']; $protocol = $_GET['protocol']; - $offset = $_GET['offset']; + $offset = $_GET['offset']; // Transcode arguments. - $videoQuality = $_GET['videoQuality']; + $videoQuality = $_GET['videoQuality']; $videoResolution = $_GET['videoResolution']; $maxVideoBitrate = $_GET['maxVideoBitrate']; - $subtitleSize = $_GET['subtitleSize']; - $audioBoost = $_GET['audioBoost']; + $subtitleSize = $_GET['subtitleSize']; + $audioBoost = $_GET['audioBoost']; $additional_params = '&vsettings='; if ($videoResolution) { @@ -684,7 +683,7 @@ class Plex_Api //$directStream = $_GET['directStream']; $uriroot = '/library/metadata/'; - $upos = strrpos($path, $uriroot); + $upos = strrpos($path, $uriroot); if ($upos !== false) { $id = substr($path, $upos + strlen($uriroot)); } @@ -698,15 +697,18 @@ class Plex_Api $videoResolution = $_GET['videoResolution']; $maxVideoBitrate = $_GET['maxVideoBitrate']; - if (!$maxVideoBitrate) + if (!$maxVideoBitrate) { $maxVideoBitrate = 8175; + } echo "#EXTM3U\n"; echo "#EXT-X-STREAM-INF:PROGRAM-ID=1"; - if ($maxVideoBitrate) + if ($maxVideoBitrate) { echo ",BANDWIDTH=" . ($maxVideoBitrate * 1000); - if ($videoResolution) + } + if ($videoResolution) { echo ",RESOLUTION=" . $videoResolution; + } echo "\n"; echo "hls.m3u8?" . substr($_SERVER['QUERY_STRING'], strpos($_SERVER['QUERY_STRING'], '&') + 1); } elseif ($protocol == "http") { @@ -771,7 +773,7 @@ class Plex_Api if ($n == 0) { Plex_XML_Data::setSections($r, Catalog::get_catalogs()); } else { - $key = $params[0]; + $key = $params[0]; $catalog = Catalog::create_from_id($key); if (!$catalog) { self::createError(404); @@ -779,7 +781,7 @@ class Plex_Api if ($n == 1) { Plex_XML_Data::setSectionContent($r, $catalog); } elseif ($n == 2) { - $view = $params[1]; + $view = $params[1]; $gtypes = $catalog->get_gather_types(); if ($gtypes[0] == 'music') { $type = 'artist'; @@ -849,12 +851,12 @@ class Plex_Api public static function library_metadata($params) { - $r = Plex_XML_Data::createLibContainer(); - $n = count($params); + $r = Plex_XML_Data::createLibContainer(); + $n = count($params); $litem = null; $createMode = ($_SERVER['REQUEST_METHOD'] == 'POST'); - $editMode = ($_SERVER['REQUEST_METHOD'] == 'PUT'); + $editMode = ($_SERVER['REQUEST_METHOD'] == 'PUT'); if ($n > 0) { $key = $params[0]; @@ -867,7 +869,7 @@ class Plex_Api if ($n == 1) { // Should we check that files still exists here? $checkFiles = $_REQUEST['checkFiles']; - $extra = $_REQUEST['includeExtra']; + $extra = $_REQUEST['includeExtra']; if (Plex_XML_Data::isArtist($key)) { $litem = new Artist($id); @@ -949,7 +951,6 @@ class Plex_Api } Plex_XML_Data::addPlaylist($r, $litem); } - } else { $subact = $params[1]; if ($subact == "children") { @@ -957,18 +958,24 @@ class Plex_Api $litem = new Artist($id); $litem->format(); Plex_XML_Data::setArtistRoot($r, $litem); - } else if (Plex_XML_Data::isAlbum($key)) { - $litem = new Album($id); - $litem->format(); - Plex_XML_Data::setAlbumRoot($r, $litem); - } else if (Plex_XML_Data::isTVShow($key)) { - $litem = new TVShow($id); - $litem->format(); - Plex_XML_Data::setTVShowRoot($r, $litem); - } else if (Plex_XML_Data::isTVShowSeason($key)) { - $litem = new TVShow_Season($id); - $litem->format(); - Plex_XML_Data::setTVShowSeasonRoot($r, $litem); + } else { + if (Plex_XML_Data::isAlbum($key)) { + $litem = new Album($id); + $litem->format(); + Plex_XML_Data::setAlbumRoot($r, $litem); + } else { + if (Plex_XML_Data::isTVShow($key)) { + $litem = new TVShow($id); + $litem->format(); + Plex_XML_Data::setTVShowRoot($r, $litem); + } else { + if (Plex_XML_Data::isTVShowSeason($key)) { + $litem = new TVShow_Season($id); + $litem->format(); + Plex_XML_Data::setTVShowSeasonRoot($r, $litem); + } + } + } } } elseif ($subact == "thumbs" || $subact == "posters" || $subact == "arts" || $subact == 'backgrounds') { $kind = Plex_XML_Data::getPhotoKind($subact); @@ -1000,16 +1007,26 @@ class Plex_Api $art = null; if (Plex_XML_Data::isArtist($key)) { $art = new Art($id, "artist", $kind); - } else if (Plex_XML_Data::isAlbum($key)) { - $art = new Art($id, "album", $kind); - } else if (Plex_XML_Data::isTrack($key)) { - $art = new Art($id, "song", $kind); - } else if (Plex_XML_Data::isTVShow($key)) { - $art = new Art($id, "tvshow", $kind); - } else if (Plex_XML_Data::isTVShowSeason($key)) { - $art = new Art($id, "tvshow_season", $kind); - } else if (Plex_XML_Data::isVideo($key)) { - $art = new Art($id, "video", $kind); + } else { + if (Plex_XML_Data::isAlbum($key)) { + $art = new Art($id, "album", $kind); + } else { + if (Plex_XML_Data::isTrack($key)) { + $art = new Art($id, "song", $kind); + } else { + if (Plex_XML_Data::isTVShow($key)) { + $art = new Art($id, "tvshow", $kind); + } else { + if (Plex_XML_Data::isTVShowSeason($key)) { + $art = new Art($id, "tvshow_season", $kind); + } else { + if (Plex_XML_Data::isVideo($key)) { + $art = new Art($id, "video", $kind); + } + } + } + } + } } if ($art != null) { @@ -1020,10 +1037,10 @@ class Plex_Api self::setHeader($art->raw_mime); echo $art->raw; } else { - $dim = array(); - $dim['width'] = $size; + $dim = array(); + $dim['width'] = $size; $dim['height'] = $size; - $thumb = $art->get_thumb($dim); + $thumb = $art->get_thumb($dim); self::setHeader($art->thumb_mime); echo $thumb['thumb']; } @@ -1052,7 +1069,7 @@ class Plex_Api set_time_limit(0); ob_end_clean(); - $headers = apache_request_headers(); + $headers = apache_request_headers(); $reqheaders = array(); if (isset($headers['Range'])) { $reqheaders[] = "Range: " . $headers['Range']; @@ -1071,9 +1088,9 @@ class Plex_Api CURLOPT_SSL_VERIFYHOST => false, CURLOPT_TIMEOUT => 0 )); - if (curl_exec($ch) === false) { + if (curl_exec($ch) === false) { debug_event('plex-api', 'Curl error: ' . curl_error($ch),1); - } + } curl_close($ch); } @@ -1107,7 +1124,7 @@ class Plex_Api } elseif ($n == 1) { if ($_SERVER['REQUEST_METHOD'] == 'PUT') { if (isset($_GET['subtitleStreamID'])) { - $lang_code = dechex(hex2bin(substr($_GET['subtitleStreamID'], 0, 2))); + $lang_code = dechex(hex2bin(substr($_GET['subtitleStreamID'], 0, 2))); $_SESSION['iframe']['subtitle'] = $lang_code; } } @@ -1117,9 +1134,9 @@ class Plex_Api public static function library_recentlyadded($params) { - $data = array(); + $data = array(); $data['album'] = Stats::get_newest('album', 25); - $r = Plex_XML_Data::createLibContainer(); + $r = Plex_XML_Data::createLibContainer(); Plex_XML_Data::setCustomView($r, $data); Plex_XML_Data::setContainerSize($r); self::apiOutputXml($r->asXML()); @@ -1127,9 +1144,9 @@ class Plex_Api public static function library_ondeck($params) { - $data = array(); + $data = array(); $data['album'] = Stats::get_recent('album', 25); - $r = Plex_XML_Data::createLibContainer(); + $r = Plex_XML_Data::createLibContainer(); Plex_XML_Data::setCustomView($r, $data); Plex_XML_Data::setContainerSize($r); self::apiOutputXml($r->asXML()); @@ -1161,11 +1178,11 @@ class Plex_Api public static function system_agents($params) { - $r = Plex_XML_Data::createSysContainer(); + $r = Plex_XML_Data::createSysContainer(); $addcontributors = false; - $mediaType = $_REQUEST['mediaType']; + $mediaType = $_REQUEST['mediaType']; if (count($params) >= 3 && $params[1] == 'config') { - $mediaType = $params[2]; + $mediaType = $params[2]; $addcontributors = true; } @@ -1202,7 +1219,7 @@ class Plex_Api public static function system_agents_contributors($params) { - $mediaType = $_REQUEST['mediaType']; + $mediaType = $_REQUEST['mediaType']; $primaryAgent = $_REQUEST['primaryAgent']; $r = Plex_XML_Data::createSysContainer(); @@ -1222,7 +1239,7 @@ class Plex_Api { if (count($params) > 0) { $type = $params[0]; - $r = Plex_XML_Data::createSysContainer(); + $r = Plex_XML_Data::createSysContainer(); Plex_XML_Data::setScanners($r, $type); Plex_XML_Data::setContainerSize($r); self::apiOutputXml($r->asXML()); @@ -1245,7 +1262,9 @@ class Plex_Api $userid = $params[0]; } // Not supported yet - if ($userid > 1) { self::createError(404); } + if ($userid > 1) { + self::createError(404); + } $r = Plex_XML_Data::createAccountContainer(); Plex_XML_Data::setAccounts($r, $userid); @@ -1316,10 +1335,10 @@ class Plex_Api public static function timeline($params) { $ratingKey = $_REQUEST['ratingKey']; - $key = $_REQUEST['key']; - $state = $_REQUEST['state']; - $time = $_REQUEST['time']; - $duration = $_REQUEST['duration']; + $key = $_REQUEST['key']; + $state = $_REQUEST['state']; + $time = $_REQUEST['time']; + $duration = $_REQUEST['duration']; // Not supported right now (maybe in a future for broadcast?) header('Content-Type: text/html'); @@ -1327,9 +1346,9 @@ class Plex_Api public static function rate($params) { - $id = $_REQUEST['key']; + $id = $_REQUEST['key']; $identifier = $_REQUEST['identifier']; - $rating = $_REQUEST['rating']; + $rating = $_REQUEST['rating']; if ($identifier == 'com.plexapp.plugins.library') { $robj = new Rating(Plex_XML_Data::getAmpacheId($id), Plex_XML_Data::getLibraryItemType($id)); @@ -1344,7 +1363,7 @@ class Plex_Api } $action = 'users/account?auth_token=' . $authtoken; - $res = self::myPlexRequest($action); + $res = self::myPlexRequest($action); return $res['xml']; } @@ -1363,8 +1382,8 @@ class Plex_Api { if ($params[0] == 'sign_in.xml') { $curlopts = array(); - $headers = array(); - $res = self::myPlexRequest('users/sign_in.xml', $curlopts, $headers, true); + $headers = array(); + $res = self::myPlexRequest('users/sign_in.xml', $curlopts, $headers, true); foreach ($res['headers'] as $header) { header($header); @@ -1373,7 +1392,9 @@ class Plex_Api if ($res['status'] == '201') { Plex_XML_Data::setMyPlexSubscription($res['xml']); self::apiOutput($res['xml']->asXML()); - } else { self::createError($res['status']); } + } else { + self::createError($res['status']); + } } } @@ -1391,8 +1412,8 @@ class Plex_Api $n = count($params); $createMode = ($_SERVER['REQUEST_METHOD'] == 'POST'); - $editMode = ($_SERVER['REQUEST_METHOD'] == 'PUT'); - $delMode = ($_SERVER['REQUEST_METHOD'] == 'DELETE'); + $editMode = ($_SERVER['REQUEST_METHOD'] == 'PUT'); + $delMode = ($_SERVER['REQUEST_METHOD'] == 'DELETE'); if ($createMode || $editMode || $delMode) { self::check_access(50); } @@ -1407,12 +1428,12 @@ class Plex_Api //$summary = $_GET['summary']; $uri = $_GET['uri']; - $plid = Playlist::create($title, 'public'); + $plid = Playlist::create($title, 'public'); $playlist = new Playlist($plid); - $key = Plex_XML_Data::getKeyFromFullUri($uri); - $id = Plex_XML_Data::getKeyFromMetadataUri($key); + $key = Plex_XML_Data::getKeyFromFullUri($uri); + $id = Plex_XML_Data::getKeyFromMetadataUri($key); if ($id) { - $item = Plex_XML_Data::createLibraryItem($id); + $item = Plex_XML_Data::createLibraryItem($id); $medias = $item->get_medias(); $playlist->add_medias($medias); } @@ -1450,9 +1471,9 @@ class Plex_Api // Add a new item to playlist $uri = $_GET['uri']; $key = Plex_XML_Data::getKeyFromFullUri($uri); - $id = Plex_XML_Data::getKeyFromMetadataUri($key); + $id = Plex_XML_Data::getKeyFromMetadataUri($key); if ($id) { - $item = Plex_XML_Data::createLibraryItem($id); + $item = Plex_XML_Data::createLibraryItem($id); $medias = $item->get_medias(); $playlist->add_medias($medias); Plex_XML_Data::addPlaylist($r, $playlist); @@ -1485,11 +1506,11 @@ class Plex_Api $playlistID = $params[0]; Plex_XML_Data::setTmpPlayQueue($r, $playlistID); } else { - $type = $_GET['type']; + $type = $_GET['type']; $playlistID = $_GET['playlistID']; - $uri = $_GET['uri']; - $key = $_GET['key']; - $shuffle = $_GET['shuffle']; + $uri = $_GET['uri']; + $key = $_GET['key']; + $shuffle = $_GET['shuffle']; Plex_XML_Data::setPlayQueue($r, $type, $playlistID, $uri, $key, $shuffle); } diff --git a/sources/lib/class/plex_xml_data.class.php b/sources/lib/class/plex_xml_data.class.php index 9dae707..6b555b9 100644 --- a/sources/lib/class/plex_xml_data.class.php +++ b/sources/lib/class/plex_xml_data.class.php @@ -2,22 +2,21 @@ /* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * - * LICENSE: GNU General Public License, version 2 (GPLv2) + * LICENSE: GNU Affero General Public License, version 3 (AGPLv3) * Copyright 2001 - 2015 Ampache.org * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; version 2 - * of the License. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see- ";
- echo "
- " . UI::get_icon('share', T_('Advanced Share')) . " " . T_('Advanced Share') . " "; + echo "
- " . UI::get_icon('share', T_('Advanced Share')) . " " . T_('Advanced Share') . " "; if (AmpConfig::get('download')) { $dllink = ""; if ($object_type == "song" || $object_type == "video") { @@ -370,10 +378,10 @@ class Share extends database_object echo "
- "; $plugins = Plugin::get_plugins('external_share'); foreach ($plugins as $plugin_name) { - echo "" . UI::get_icon('share_' . strtolower($plugin_name), $plugin_name) . " "; + echo "" . UI::get_icon('share_' . strtolower($plugin_name), $plugin_name) . " "; } echo " "; echo "
', $this->text); return true; - } //format /** @@ -276,16 +280,15 @@ class Shoutbox { // Delete the shoutbox post $shout_id = Dba::escape($shout_id); - $sql = "DELETE FROM `user_shout` WHERE `id`='$shout_id'"; + $sql = "DELETE FROM `user_shout` WHERE `id`='$shout_id'"; Dba::write($sql); - } // delete public function get_display($details = true, $jsbuttons = false) { $object = Shoutbox::get_object($this->object_type, $this->object_id); $object->format(); - $img = $this->get_image(); + $img = $this->get_image(); $html = "
";
$html .= "
";
if ($details && $img) {
@@ -294,7 +297,7 @@ class Shoutbox
$html .= "
";
if ($details) {
$html .= "
";
@@ -303,8 +306,8 @@ class Shoutbox
if ($details) {
$html .= "" . $object->f_link . "
";
- $html .= "".date("Y/m/d H:i:s", $this->date) . "
";
+ $html .= "" . date("Y/m/d H:i:s", $this->date) . "
";
}
$html .= "" . $this->f_text . "
";
$html .= "";
if ($jsbuttons) {
- $html .= Ajax::button('?page=stream&action=directplay&playtype=' . $this->object_type .'&' . $this->object_type . '_id=' . $this->object_id,'play', T_('Play'),'play_' . $this->object_type . '_' . $this->object_id);
- $html .= Ajax::button('?action=basket&type=' . $this->object_type .'&id=' . $this->object_id,'add', T_('Add'),'add_' . $this->object_type . '_' . $this->object_id);
+ $html .= Ajax::button('?page=stream&action=directplay&playtype=' . $this->object_type . '&' . $this->object_type . '_id=' . $this->object_id,'play', T_('Play'),'play_' . $this->object_type . '_' . $this->object_id);
+ $html .= Ajax::button('?action=basket&type=' . $this->object_type . '&id=' . $this->object_id,'add', T_('Add'),'add_' . $this->object_type . '_' . $this->object_id);
}
if (Access::check('interface','25')) {
$html .= "object_type . "&id=" . $this->object_id . "\">" . UI::get_icon('comment', T_('Post Shout')) . "";
@@ -333,9 +336,9 @@ class Shoutbox
public static function get_shouts($object_type, $object_id)
{
- $sql = "SELECT `id` FROM `user_shout` WHERE `object_type` = ? AND `object_id` = ? ORDER BY `sticky`, `date` DESC";
+ $sql = "SELECT `id` FROM `user_shout` WHERE `object_type` = ? AND `object_id` = ? ORDER BY `sticky`, `date` DESC";
$db_results = Dba::read($sql, array($object_type, $object_id));
- $results = array();
+ $results = array();
while ($row = Dba::fetch_assoc($db_results)) {
$results[] = $row['id'];
@@ -343,5 +346,5 @@ class Shoutbox
return $results;
}
-
} // Shoutbox class
+
diff --git a/sources/lib/class/slideshow.class.php b/sources/lib/class/slideshow.class.php
index ad73742..c053261 100644
--- a/sources/lib/class/slideshow.class.php
+++ b/sources/lib/class/slideshow.class.php
@@ -2,21 +2,21 @@
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
- * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
* Copyright 2001 - 2015 Ampache.org
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License v2
- * as published by the Free Software Foundation.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see ' . "\n";
- echo "Ampache ASX Playlist \n";
- echo '' . "\n";
+ $ret = '' . "\n";
+ $ret .= "" . ($this->title ?: "Ampache ASX Playlist") . " \n";
+ $ret .= '' . "\n";
foreach ($this->urls as $url) {
- echo "\n";
- echo '' . scrub_out($url->title) . " \n";
- echo '' . scrub_out($url->author) . " \n";
+ $ret .= "\n";
+ $ret .= '' . scrub_out($url->title) . " \n";
+ $ret .= '' . scrub_out($url->author) . " \n";
//FIXME: duration looks hacky and wrong
- echo "\t\t" . ' \n";
+ $ret .= "\t\t" . ' \n";
}
- echo " \n";
+ $ret .= " \n";
+ return $ret;
+ } // get_asx_string
- } // create_asx
+ public function create_asx()
+ {
+ echo $this->get_asx_string();
+ }
/**
- * create_xspf
+ * get_xspf_string
*/
- public function create_xspf()
+ public function get_xspf_string()
{
$result = "";
foreach ($this->urls as $url) {
@@ -395,38 +459,45 @@ class Stream_Playlist
if ($url->album) {
$xml['track']['album'] = $url->album;
}
+ if ($url->track_num) {
+ $xml['track']['trackNum'] = $url->track_num;
+ }
$result .= XML_Data::keyed_array($xml, true);
-
} // end foreach
XML_Data::set_type('xspf');
- echo XML_Data::header();
- echo $result;
- echo XML_Data::footer();
+ $ret = XML_Data::header($this->title);
+ $ret .= $result;
+ $ret .= XML_Data::footer();
+ return $ret;
+ } // get_xspf_string
- } // create_xspf
+ public function create_xspf()
+ {
+ echo $this->get_xspf_string();
+ }
- public function create_hls()
+ public function get_hls_string()
{
$ssize = 10;
- echo "#EXTM3U\n";
- echo "#EXT-X-TARGETDURATION:" . $ssize . "\n";
- echo "#EXT-X-VERSION:1\n";
- echo "#EXT-X-ALLOW-CACHE:NO\n";
- echo "#EXT-X-MEDIA-SEQUENCE:0\n";
- echo "#EXT-X-PLAYLIST-TYPE:VOD\n"; // Static list of segments
+ $ret = "#EXTM3U\n";
+ $ret .= "#EXT-X-TARGETDURATION:" . $ssize . "\n";
+ $ret .= "#EXT-X-VERSION:1\n";
+ $ret .= "#EXT-X-ALLOW-CACHE:NO\n";
+ $ret .= "#EXT-X-MEDIA-SEQUENCE:0\n";
+ $ret .= "#EXT-X-PLAYLIST-TYPE:VOD\n"; // Static list of segments
foreach ($this->urls as $url) {
$soffset = 0;
$segment = 0;
while ($soffset < $url->time) {
- $type = $url->type;
- $size = (($soffset + $ssize) <= $url->time) ? $ssize : ($url->time - $soffset);
+ $type = $url->type;
+ $size = (($soffset + $ssize) <= $url->time) ? $ssize : ($url->time - $soffset);
$additional_params = '&transcode_to=ts&segment=' . $segment;
- echo "#EXTINF:" . $size . ",\n";
+ $ret .= "#EXTINF:" . $size . ",\n";
$purl = Stream_URL::parse($url->url);
- $id = $purl['id'];
+ $id = $purl['id'];
unset($purl['id']);
unset($purl['ssid']);
@@ -440,13 +511,19 @@ class Stream_Playlist
}
$hu = $type::play_url($id, $additional_params);
- echo $hu . "\n";
+ $ret .= $hu . "\n";
$soffset += $size;
$segment++;
}
}
- echo "#EXT-X-ENDLIST\n\n";
+ $ret .= "#EXT-X-ENDLIST\n\n";
+ return $ret;
+ }
+
+ public function create_hls()
+ {
+ echo $this->get_hls_string();
}
/**
@@ -457,11 +534,10 @@ class Stream_Playlist
public function create_web_player()
{
if (AmpConfig::get("ajax_load")) {
- require AmpConfig::get('prefix') . '/templates/create_web_player_embedded.inc.php';
+ require AmpConfig::get('prefix') . UI::find_template('create_web_player_embedded.inc.php');
} else {
- require AmpConfig::get('prefix') . '/templates/create_web_player.inc.php';
+ require AmpConfig::get('prefix') . UI::find_template('create_web_player.inc.php');
}
-
} // create_web_player
/**
@@ -492,7 +568,6 @@ class Stream_Playlist
}
$localplay->play();
}
-
} // create_localplay
/**
@@ -508,7 +583,7 @@ class Stream_Playlist
$items = array();
foreach ($this->urls as $url) {
- $data = Stream_URL::parse($url->url);
+ $data = Stream_URL::parse($url->url);
$items[] = array($data['type'], $data['id']);
}
diff --git a/sources/lib/class/stream_url.class.php b/sources/lib/class/stream_url.class.php
index 019d8c1..4b322c0 100644
--- a/sources/lib/class/stream_url.class.php
+++ b/sources/lib/class/stream_url.class.php
@@ -2,22 +2,21 @@
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
- * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
* Copyright 2001 - 2015 Ampache.org
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see 1) {
if ($rhpart[0] != "Transfer-Encoding") {
header($rheader);
@@ -105,9 +108,10 @@ class Subsonic_Api
set_time_limit(0);
ob_end_clean();
+ header("Access-Control-Allow-Origin: *");
if (function_exists('curl_version')) {
- $headers = apache_request_headers();
- $reqheaders = array();
+ $headers = apache_request_headers();
+ $reqheaders = array();
$reqheaders[] = "User-Agent: " . $headers['User-Agent'];
if (isset($headers['Range'])) {
$reqheaders[] = "Range: " . $headers['Range'];
@@ -145,17 +149,19 @@ class Subsonic_Api
{
if (strtolower($f) == "json") {
header("Content-type: application/json; charset=" . AmpConfig::get('site_charset'));
- } else if (strtolower($f) == "jsonp") {
+ Subsonic_XML_Data::$enable_json_checks = true;
+ } elseif (strtolower($f) == "jsonp") {
header("Content-type: text/javascript; charset=" . AmpConfig::get('site_charset'));
+ Subsonic_XML_Data::$enable_json_checks = true;
} else {
header("Content-type: text/xml; charset=" . AmpConfig::get('site_charset'));
}
- header("access-control-allow-origin: *");
+ header("Access-Control-Allow-Origin: *");
}
public static function apiOutput($input, $xml)
{
- $f = $input['f'];
+ $f = $input['f'];
$callback = $input['callback'];
self::apiOutput2(strtolower($f), $xml, $callback);
}
@@ -163,17 +169,21 @@ class Subsonic_Api
public static function apiOutput2($f, $xml, $callback='')
{
if ($f == "json") {
- echo json_encode(self::xml2json($xml), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK);
- } else if ($f == "jsonp") {
- echo $callback . '(' . json_encode(self::xml2json($xml), JSON_PRETTY_PRINT) . ')';
+ $output = json_encode(self::xml2json($xml), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK);
} else {
- $xmlstr = $xml->asXml();
- // Format xml output
- $dom = new DOMDocument();
- $dom->loadXML($xmlstr);
- $dom->formatOutput = true;
- echo $dom->saveXML();
+ if ($f == "jsonp") {
+ $output = $callback . '(' . json_encode(self::xml2json($xml), JSON_PRETTY_PRINT) . ')';
+ } else {
+ $xmlstr = $xml->asXml();
+ // Format xml output
+ $dom = new DOMDocument();
+ $dom->loadXML($xmlstr);
+ $dom->formatOutput = true;
+ $output = $dom->saveXML();
+ }
}
+
+ echo $output;
}
/**
@@ -187,14 +197,14 @@ class Subsonic_Api
'attributePrefix' => '', //to distinguish between attributes and nodes with the same name
'alwaysArray' => array(), //array of xml tag names which should always become arrays
'autoArray' => true, //only create arrays for tags which appear more than once
- 'textContent' => '$', //key used for the text content of elements
+ 'textContent' => 'value', //key used for the text content of elements
'autoText' => true, //skip textContent key if node has no attributes or child nodes
'keySearch' => false, //optional search and replace on tag and attribute names
'keyReplace' => false, //replace values for above search values (as passed to str_replace())
'boolean' => true //replace true and false string with boolean values
);
- $options = array_merge($defaults, $options);
- $namespaces = $xml->getDocNamespaces();
+ $options = array_merge($defaults, $options);
+ $namespaces = $xml->getDocNamespaces();
$namespaces[''] = null; //add base (empty) namespace
//get attributes from all namespaces
@@ -202,8 +212,10 @@ class Subsonic_Api
foreach ($namespaces as $prefix => $namespace) {
foreach ($xml->attributes($namespace) as $attributeName => $attribute) {
//replace characters in attribute name
- if ($options['keySearch']) $attributeName =
+ if ($options['keySearch']) {
+ $attributeName =
str_replace($options['keySearch'], $options['keyReplace'], $attributeName);
+ }
$attributeKey = $options['attributePrefix']
. ($prefix ? $prefix . $options['namespaceSeparator'] : '')
. $attributeName;
@@ -222,14 +234,18 @@ class Subsonic_Api
foreach ($namespaces as $prefix => $namespace) {
foreach ($xml->children($namespace) as $childXml) {
//recurse into child nodes
- $childArray = self::xml2json($childXml, $options);
+ $childArray = self::xml2json($childXml, $options);
list($childTagName, $childProperties) = each($childArray);
//replace characters in tag name
- if ($options['keySearch']) $childTagName =
+ if ($options['keySearch']) {
+ $childTagName =
str_replace($options['keySearch'], $options['keyReplace'], $childTagName);
+ }
//add namespace prefix, if any
- if ($prefix) $childTagName = $prefix . $options['namespaceSeparator'] . $childTagName;
+ if ($prefix) {
+ $childTagName = $prefix . $options['namespaceSeparator'] . $childTagName;
+ }
if (!isset($tagsArray[$childTagName])) {
//only entry with this key
@@ -252,8 +268,10 @@ class Subsonic_Api
//get text content of node
$textContentArray = array();
- $plainText = trim((string) $xml);
- if ($plainText !== '') $textContentArray[$options['textContent']] = $plainText;
+ $plainText = trim((string) $xml);
+ if ($plainText !== '') {
+ $textContentArray[$options['textContent']] = $plainText;
+ }
//stick it all together
$propertiesArray = !$options['autoText'] || $attributesArray || $tagsArray || ($plainText === '')
@@ -302,12 +320,12 @@ class Subsonic_Api
*/
public static function getmusicfolders($input)
{
- self::check_version($input);
+ self::check_version($input);
- $r = Subsonic_XML_Data::createSuccessResponse();
- Subsonic_XML_Data::addMusicFolders($r, Catalog::get_catalogs());
- self::apiOutput($input, $r);
- }
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ Subsonic_XML_Data::addMusicFolders($r, Catalog::get_catalogs());
+ self::apiOutput($input, $r);
+ }
/**
* getIndexes
@@ -316,41 +334,54 @@ class Subsonic_Api
*/
public static function getindexes($input)
{
- self::check_version($input);
+ self::check_version($input);
+ set_time_limit(300);
- $musicFolderId = $input['musicFolderId'];
- $ifModifiedSince = $input['ifModifiedSince'];
+ $musicFolderId = $input['musicFolderId'];
+ $ifModifiedSince = $input['ifModifiedSince'];
- $catalogs = array();
- if (!empty($musicFolderId) && $musicFolderId != '-1') {
- $catalogs[] = $musicFolderId;
- } else {
- $catalogs = Catalog::get_catalogs();
- }
+ $catalogs = array();
+ if (!empty($musicFolderId) && $musicFolderId != '-1') {
+ $catalogs[] = $musicFolderId;
+ } else {
+ $catalogs = Catalog::get_catalogs();
+ }
- $lastmodified = 0;
- $fcatalogs = array();
+ $lastmodified = 0;
+ $fcatalogs = array();
- foreach ($catalogs as $id) {
- $clastmodified = 0;
- $catalog = Catalog::create_from_id($id);
+ foreach ($catalogs as $id) {
+ $clastmodified = 0;
+ $catalog = Catalog::create_from_id($id);
- if ($catalog->last_update > $clastmodified) $clastmodified = $catalog->last_update;
- if ($catalog->last_add > $clastmodified) $clastmodified = $catalog->last_add;
- if ($catalog->last_clean > $clastmodified) $clastmodified = $catalog->last_clean;
+ if ($catalog->last_update > $clastmodified) {
+ $clastmodified = $catalog->last_update;
+ }
+ if ($catalog->last_add > $clastmodified) {
+ $clastmodified = $catalog->last_add;
+ }
+ if ($catalog->last_clean > $clastmodified) {
+ $clastmodified = $catalog->last_clean;
+ }
- if ($clastmodified > $lastmodified) $lastmodified = $clastmodified;
- if (!empty($ifModifiedSince) && $clastmodified > ($ifModifiedSince / 1000)) $fcatalogs[] = $id;
- }
- if (empty($ifModifiedSince)) $fcatalogs = $catalogs;
+ if ($clastmodified > $lastmodified) {
+ $lastmodified = $clastmodified;
+ }
+ if (!empty($ifModifiedSince) && $clastmodified > ($ifModifiedSince / 1000)) {
+ $fcatalogs[] = $id;
+ }
+ }
+ if (empty($ifModifiedSince)) {
+ $fcatalogs = $catalogs;
+ }
- $r = Subsonic_XML_Data::createSuccessResponse();
- if (count($fcatalogs) > 0) {
- $artists = Catalog::get_artists($fcatalogs);
- Subsonic_XML_Data::addArtistsIndexes($r, $artists, $lastmodified);
- }
- self::apiOutput($input, $r);
- }
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ if (count($fcatalogs) > 0) {
+ $artists = Catalog::get_artists($fcatalogs);
+ Subsonic_XML_Data::addArtistsIndexes($r, $artists, $lastmodified);
+ }
+ self::apiOutput($input, $r);
+ }
/**
* getMusicDirectory
@@ -359,19 +390,21 @@ class Subsonic_Api
*/
public static function getmusicdirectory($input)
{
- self::check_version($input);
+ self::check_version($input);
- $id = self::check_parameter($input, 'id');
+ $id = self::check_parameter($input, 'id');
- $r = Subsonic_XML_Data::createSuccessResponse();
- if (Subsonic_XML_Data::isArtist($id)) {
- $artist = new Artist(Subsonic_XML_Data::getAmpacheId($id));
- Subsonic_XML_Data::addArtistDirectory($r, $artist);
- } else if (Subsonic_XML_Data::isAlbum($id)) {
- $album = new Album(Subsonic_XML_Data::getAmpacheId($id));
- Subsonic_XML_Data::addAlbumDirectory($r, $album);
- }
- self::apiOutput($input, $r);
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ if (Subsonic_XML_Data::isArtist($id)) {
+ $artist = new Artist(Subsonic_XML_Data::getAmpacheId($id));
+ Subsonic_XML_Data::addArtistDirectory($r, $artist);
+ } else {
+ if (Subsonic_XML_Data::isAlbum($id)) {
+ $album = new Album(Subsonic_XML_Data::getAmpacheId($id));
+ Subsonic_XML_Data::addAlbumDirectory($r, $album);
+ }
+ }
+ self::apiOutput($input, $r);
}
/**
@@ -397,9 +430,9 @@ class Subsonic_Api
{
self::check_version($input, "1.7.0");
- $r = Subsonic_XML_Data::createSuccessResponse();
+ $r = Subsonic_XML_Data::createSuccessResponse();
$artists = Catalog::get_artists(Catalog::get_catalogs());
- Subsonic_XML_Data::addArtistsRoot($r, $artists);
+ Subsonic_XML_Data::addArtistsRoot($r, $artists, true);
self::apiOutput($input, $r);
}
@@ -435,12 +468,14 @@ class Subsonic_Api
$albumid = self::check_parameter($input, 'id');
+ $addAmpacheInfo = ($input['ampache'] == "1");
+
$album = new Album(Subsonic_XML_Data::getAmpacheId($albumid));
if (empty($album->name)) {
$r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND, "Album not found.");
} else {
$r = Subsonic_XML_Data::createSuccessResponse();
- Subsonic_XML_Data::addAlbum($r, $album, true);
+ Subsonic_XML_Data::addAlbum($r, $album, true, $addAmpacheInfo);
}
self::apiOutput($input, $r);
@@ -455,7 +490,7 @@ class Subsonic_Api
{
self::check_version($input, "1.7.0");
- $r = Subsonic_XML_Data::createSuccessResponse();
+ $r = Subsonic_XML_Data::createSuccessResponse();
$videos = Catalog::get_videos();
Subsonic_XML_Data::addVideos($r, $videos);
self::apiOutput($input, $r);
@@ -472,77 +507,97 @@ class Subsonic_Api
$type = self::check_parameter($input, 'type');
- $size = $input['size'];
- $offset = $input['offset'];
+ $size = $input['size'];
+ $offset = $input['offset'];
$musicFolderId = $input['musicFolderId'] ?: 0;
// Get albums from all catalogs by default
// Catalog filter is not supported for all request type for now.
$catalogs = null;
if ($musicFolderId > 0) {
- $catalogs = array();
+ $catalogs = array();
$catalogs[] = $musicFolderId;
}
-
- $albums = array();
+
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ $errorOccured = false;
+ $albums = array();
+
if ($type == "random") {
$albums = Album::get_random($size);
- } else if ($type == "newest") {
- $albums = Stats::get_newest("album", $size, $offset, $musicFolderId);
- } else if ($type == "highest") {
- $albums = Rating::get_highest("album", $size, $offset);
- } else if ($type == "frequent") {
- $albums = Stats::get_top("album", $size, '', $offset);
- } else if ($type == "recent") {
- $albums = Stats::get_recent("album", $size, $offset);
- } else if ($type == "starred") {
- $albums = Userflag::get_latest('album');
- } else if ($type == "alphabeticalByName") {
- $albums = Catalog::get_albums($size, $offset, $catalogs);
- } else if ($type == "alphabeticalByArtist") {
- $albums = Catalog::get_albums_by_artist($size, $offset, $catalogs);
- } else if ($type == "byYear") {
- $fromYear = $input['fromYear'];
- $toYear = $input['toYear'];
-
- if ($fromYear || $toYear) {
- $search = array();
- $search['limit'] = $size;
- $search['offset'] = $offset;
- $search['type'] = "album";
- $i = 0;
- if ($fromYear) {
- $search['rule_'.$i.'_input'] = $fromYear;
- $search['rule_'.$i.'_operator'] = 0;
- $search['rule_'.$i.''] = "year";
- ++$i;
- }
- if ($toYear) {
- $search['rule_'.$i.'_input'] = $toYear;
- $search['rule_'.$i.'_operator'] = 1;
- $search['rule_'.$i.''] = "year";
- ++$i;
- }
-
- $query = new Search(null, 'album');
- $albums = $query->run($search);
- }
- } else if ($type == "byGenre") {
- $genre = self::check_parameter($input, 'genre');
-
- $tag_id = Tag::tag_exists($genre);
- if ($tag_id) {
- $albums = Tag::get_tag_objects('album', $tag_id, $size, $offset);
- }
- }
-
- if (count($albums)) {
- $r = Subsonic_XML_Data::createSuccessResponse();
- Subsonic_XML_Data::addAlbumList($r, $albums, $elementName);
} else {
- $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ if ($type == "newest") {
+ $albums = Stats::get_newest("album", $size, $offset, $musicFolderId);
+ } else {
+ if ($type == "highest") {
+ $albums = Rating::get_highest("album", $size, $offset);
+ } else {
+ if ($type == "frequent") {
+ $albums = Stats::get_top("album", $size, '', $offset);
+ } else {
+ if ($type == "recent") {
+ $albums = Stats::get_recent("album", $size, $offset);
+ } else {
+ if ($type == "starred") {
+ $albums = Userflag::get_latest('album');
+ } else {
+ if ($type == "alphabeticalByName") {
+ $albums = Catalog::get_albums($size, $offset, $catalogs);
+ } else {
+ if ($type == "alphabeticalByArtist") {
+ $albums = Catalog::get_albums_by_artist($size, $offset, $catalogs);
+ } else {
+ if ($type == "byYear") {
+ $fromYear = $input['fromYear'];
+ $toYear = $input['toYear'];
+
+ if ($fromYear || $toYear) {
+ $search = array();
+ $search['limit'] = $size;
+ $search['offset'] = $offset;
+ $search['type'] = "album";
+ $i = 0;
+ if ($fromYear) {
+ $search['rule_' . $i . '_input'] = $fromYear;
+ $search['rule_' . $i . '_operator'] = 0;
+ $search['rule_' . $i . ''] = "year";
+ ++$i;
+ }
+ if ($toYear) {
+ $search['rule_' . $i . '_input'] = $toYear;
+ $search['rule_' . $i . '_operator'] = 1;
+ $search['rule_' . $i . ''] = "year";
+ ++$i;
+ }
+
+ $query = new Search(null, 'album');
+ $albums = $query->run($search);
+ }
+ } else {
+ if ($type == "byGenre") {
+ $genre = self::check_parameter($input, 'genre');
+
+ $tag_id = Tag::tag_exists($genre);
+ if ($tag_id) {
+ $albums = Tag::get_tag_objects('album', $tag_id, $size, $offset);
+ }
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_GENERIC, "Invalid list type: " . scrub_out($type));
+ $errorOccured = true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
+ if (!$errorOccured) {
+ Subsonic_XML_Data::addAlbumList($r, $albums, $elementName);
+ }
self::apiOutput($input, $r);
}
@@ -566,54 +621,58 @@ class Subsonic_Api
self::check_version($input, "1.2.0");
$size = $input['size'];
- if (!$size) $size = 10;
- $genre = $input['genre'];
- $fromYear = $input['fromYear'];
- $toYear = $input['toYear'];
+ if (!$size) {
+ $size = 10;
+ }
+ $genre = $input['genre'];
+ $fromYear = $input['fromYear'];
+ $toYear = $input['toYear'];
$musicFolderId = $input['musicFolderId'];
- $search = array();
- $search['limit'] = $size;
+ $search = array();
+ $search['limit'] = $size;
$search['random'] = $size;
- $search['type'] = "song";
- $i = 0;
+ $search['type'] = "song";
+ $i = 0;
if ($genre) {
- $search['rule_'.$i.'_input'] = $genre;
- $search['rule_'.$i.'_operator'] = 0;
- $search['rule_'.$i.''] = "tag";
+ $search['rule_' . $i . '_input'] = $genre;
+ $search['rule_' . $i . '_operator'] = 0;
+ $search['rule_' . $i . ''] = "tag";
++$i;
}
if ($fromYear) {
- $search['rule_'.$i.'_input'] = $fromYear;
- $search['rule_'.$i.'_operator'] = 0;
- $search['rule_'.$i.''] = "year";
+ $search['rule_' . $i . '_input'] = $fromYear;
+ $search['rule_' . $i . '_operator'] = 0;
+ $search['rule_' . $i . ''] = "year";
++$i;
}
if ($toYear) {
- $search['rule_'.$i.'_input'] = $toYear;
- $search['rule_'.$i.'_operator'] = 1;
- $search['rule_'.$i.''] = "year";
+ $search['rule_' . $i . '_input'] = $toYear;
+ $search['rule_' . $i . '_operator'] = 1;
+ $search['rule_' . $i . ''] = "year";
++$i;
}
if ($musicFolderId) {
if (Subsonic_XML_Data::isArtist($musicFolderId)) {
- $artist = new Artist(Subsonic_XML_Data::getAmpacheId($musicFolderId));
- $finput = $artist->name;
+ $artist = new Artist(Subsonic_XML_Data::getAmpacheId($musicFolderId));
+ $finput = $artist->name;
$operator = 4;
- $ftype = "artist";
- } else if (Subsonic_XML_Data::isAlbum($musicFolderId)) {
- $album = new Album(Subsonic_XML_Data::getAmpacheId($musicFolderId));
- $finput = $album->name;
- $operator = 4;
- $ftype = "artist";
+ $ftype = "artist";
} else {
- $finput = intval($musicFolderId);
- $operator = 0;
- $ftype = "catalog";
+ if (Subsonic_XML_Data::isAlbum($musicFolderId)) {
+ $album = new Album(Subsonic_XML_Data::getAmpacheId($musicFolderId));
+ $finput = $album->name;
+ $operator = 4;
+ $ftype = "artist";
+ } else {
+ $finput = intval($musicFolderId);
+ $operator = 0;
+ $ftype = "catalog";
+ }
}
- $search['rule_'.$i.'_input'] = $finput;
- $search['rule_'.$i.'_operator'] = $operator;
- $search['rule_'.$i.''] = $ftype;
+ $search['rule_' . $i . '_input'] = $finput;
+ $search['rule_' . $i . '_operator'] = $operator;
+ $search['rule_' . $i . ''] = $ftype;
++$i;
}
if ($i > 0) {
@@ -637,8 +696,8 @@ class Subsonic_Api
self::check_version($input, "1.7.0");
$songid = self::check_parameter($input, 'id');
- $r = Subsonic_XML_Data::createSuccessResponse();
- $song = new Song(Subsonic_XML_Data::getAmpacheId($songid));
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ $song = new Song(Subsonic_XML_Data::getAmpacheId($songid));
Subsonic_XML_Data::addSong($r, $song);
self::apiOutput($input, $r);
}
@@ -652,8 +711,8 @@ class Subsonic_Api
{
self::check_version($input, "1.9.0");
- $genre = self::check_parameter($input, 'genre');
- $count = $input['count'];
+ $genre = self::check_parameter($input, 'genre');
+ $count = $input['count'];
$offset = $input['offset'];
$tag = Tag::construct_from_name($genre);
@@ -677,7 +736,7 @@ class Subsonic_Api
self::check_version($input);
$data = Stream::get_now_playing();
- $r = Subsonic_XML_Data::createSuccessResponse();
+ $r = Subsonic_XML_Data::createSuccessResponse();
Subsonic_XML_Data::addNowPlaying($r, $data);
self::apiOutput($input, $r);
}
@@ -696,44 +755,56 @@ class Subsonic_Api
$operator = 0;
if (strlen($query) > 1) {
if (substr($query, -1) == "*") {
- $query = substr($query, 0, -1);
+ $query = substr($query, 0, -1);
$operator = 2; // Start with
}
}
- $artistCount = $input['artistCount'];
+ $artistCount = isset($input['artistCount']) ? $input['artistCount'] : 20;
$artistOffset = $input['artistOffset'];
- $albumCount = $input['albumCount'];
- $albumOffset = $input['albumOffset'];
- $songCount = $input['songCount'];
- $songOffset = $input['songOffset'];
+ $albumCount = isset($input['albumCount']) ? $input['albumCount'] : 20;
+ $albumOffset = $input['albumOffset'];
+ $songCount = isset($input['songCount']) ? $input['songCount'] : 20;
+ $songOffset = $input['songOffset'];
- $sartist = array();
+ $sartist = array();
$sartist['limit'] = $artistCount;
- if ($artistOffset) $sartist['offset'] = $artistOffset;
- $sartist['rule_1_input'] = $query;
+ if ($artistOffset) {
+ $sartist['offset'] = $artistOffset;
+ }
+ $sartist['rule_1_input'] = $query;
$sartist['rule_1_operator'] = $operator;
- $sartist['rule_1'] = "name";
- $sartist['type'] = "artist";
- $artists = Search::run($sartist);
+ $sartist['rule_1'] = "name";
+ $sartist['type'] = "artist";
+ if ($artistCount > 0) {
+ $artists = Search::run($sartist);
+ }
- $salbum = array();
+ $salbum = array();
$salbum['limit'] = $albumCount;
- if ($albumOffset) $salbum['offset'] = $albumOffset;
- $salbum['rule_1_input'] = $query;
+ if ($albumOffset) {
+ $salbum['offset'] = $albumOffset;
+ }
+ $salbum['rule_1_input'] = $query;
$salbum['rule_1_operator'] = $operator;
- $salbum['rule_1'] = "title";
- $salbum['type'] = "album";
- $albums = Search::run($salbum);
+ $salbum['rule_1'] = "title";
+ $salbum['type'] = "album";
+ if ($albumCount > 0) {
+ $albums = Search::run($salbum);
+ }
- $ssong = array();
+ $ssong = array();
$ssong['limit'] = $songCount;
- if ($songOffset) $ssong['offset'] = $songOffset;
- $ssong['rule_1_input'] = $query;
+ if ($songOffset) {
+ $ssong['offset'] = $songOffset;
+ }
+ $ssong['rule_1_input'] = $query;
$ssong['rule_1_operator'] = $operator;
- $ssong['rule_1'] = "anywhere";
- $ssong['type'] = "song";
- $songs = Search::run($ssong);
+ $ssong['rule_1'] = "anywhere";
+ $ssong['type'] = "song";
+ if ($songCount > 0) {
+ $songs = Search::run($ssong);
+ }
$r = Subsonic_XML_Data::createSuccessResponse();
Subsonic_XML_Data::addSearchResult($r, $artists, $albums, $songs, $elementName);
@@ -759,7 +830,7 @@ class Subsonic_Api
{
self::check_version($input);
- $r = Subsonic_XML_Data::createSuccessResponse();
+ $r = Subsonic_XML_Data::createSuccessResponse();
$username = $input['username'];
// Don't allow playlist listing for another user
@@ -808,20 +879,22 @@ class Subsonic_Api
self::check_version($input, "1.2.0");
$playlistId = $input['playlistId'];
- $name = $input['name'];
- $songId = $input['songId'];
+ $name = $input['name'];
+ $songId = $input['songId'];
if ($playlistId) {
self::_updatePlaylist($playlistId, $name, $songId);
$r = Subsonic_XML_Data::createSuccessResponse();
- } else if (!empty($name)) {
- $playlistId = Playlist::create($name, 'private');
- if (count($songId) > 0) {
- self::_updatePlaylist($playlistId, "", $songId);
- }
- $r = Subsonic_XML_Data::createSuccessResponse();
} else {
- $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_MISSINGPARAM);
+ if (!empty($name)) {
+ $playlistId = Playlist::create($name, 'private');
+ if (count($songId) > 0) {
+ self::_updatePlaylist($playlistId, "", $songId);
+ }
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_MISSINGPARAM);
+ }
}
self::apiOutput($input, $r);
}
@@ -830,8 +903,8 @@ class Subsonic_Api
{
$playlist = new Playlist($id);
- $newdata = array();
- $newdata['name'] = (!empty($name)) ? $name : $playlist->name;
+ $newdata = array();
+ $newdata['name'] = (!empty($name)) ? $name : $playlist->name;
$newdata['pl_type'] = ($public) ? "public" : "private";
$playlist->update($newdata);
@@ -871,12 +944,12 @@ class Subsonic_Api
$playlistId = self::check_parameter($input, 'playlistId');
- $name = $input['name'];
+ $name = $input['name'];
$comment = $input['comment']; // Not supported.
- $public = ($input['public'] === "true");
+ $public = ($input['public'] === "true");
if (!Subsonic_XML_Data::isSmartPlaylist($playlistId)) {
- $songIdToAdd = $input['songIdToAdd'];
+ $songIdToAdd = $input['songIdToAdd'];
$songIndexToRemove = $input['songIndexToRemove'];
self::_updatePlaylist(Subsonic_XML_Data::getAmpacheId($playlistId), $name, $songIdToAdd, $songIndexToRemove, $public);
@@ -922,10 +995,10 @@ class Subsonic_Api
$fileid = self::check_parameter($input, 'id', true);
- $maxBitRate = $input['maxBitRate'];
- $format = $input['format']; // mp3, flv or raw
- $timeOffset = $input['timeOffset'];
- $size = $input['size']; // For video streaming. Not supported.
+ $maxBitRate = $input['maxBitRate'];
+ $format = $input['format']; // mp3, flv or raw
+ $timeOffset = $input['timeOffset'];
+ $size = $input['size']; // For video streaming. Not supported.
$estimateContentLength = $input['estimateContentLength']; // Force content-length guessing if transcode
$params = '&client=' . rawurlencode($input['c']) . '&noscrobble=1';
@@ -945,8 +1018,10 @@ class Subsonic_Api
$url = '';
if (Subsonic_XML_Data::isVideo($fileid)) {
$url = Video::play_url(Subsonic_XML_Data::getAmpacheId($fileid), $params, 'api', function_exists('curl_version'));
- } else if (Subsonic_XML_Data::isSong($fileid)) {
+ } elseif (Subsonic_XML_Data::isSong($fileid)) {
$url = Song::play_url(Subsonic_XML_Data::getAmpacheId($fileid), $params, 'api', function_exists('curl_version'));
+ } elseif (Subsonic_XML_Data::isPodcastEp($fileid)) {
+ $url = Podcast_Episode::play_url(Subsonic_XML_Data::getAmpacheId($fileid), $params, 'api', function_exists('curl_version'));
}
if (!empty($url)) {
@@ -982,13 +1057,13 @@ class Subsonic_Api
$bitRate = $input['bitRate'];
- $media = array();
+ $media = array();
$media['object_type'] = 'song';
- $media['object_id'] = Subsonic_XML_Data::getAmpacheId($fileid);
+ $media['object_id'] = Subsonic_XML_Data::getAmpacheId($fileid);
- $medias = array();
- $medias[] = $media;
- $stream = new Stream_Playlist();
+ $medias = array();
+ $medias[] = $media;
+ $stream = new Stream_Playlist();
$additional_params = '';
if ($bitRate) {
$additional_params .= '&bitrate=' . $bitRate;
@@ -1009,25 +1084,34 @@ class Subsonic_Api
{
self::check_version($input, "1.0.0", true);
- $id = self::check_parameter($input, 'id', true);
+ $id = self::check_parameter($input, 'id', true);
$size = $input['size'];
$art = null;
if (Subsonic_XML_Data::isArtist($id)) {
$art = new Art(Subsonic_XML_Data::getAmpacheId($id), "artist");
- } else if (Subsonic_XML_Data::isAlbum($id)) {
+ } elseif (Subsonic_XML_Data::isAlbum($id)) {
$art = new Art(Subsonic_XML_Data::getAmpacheId($id), "album");
- } else if (Subsonic_XML_Data::isSong($id)) {
+ } elseif (Subsonic_XML_Data::isSong($id)) {
$art = new Art(Subsonic_XML_Data::getAmpacheId($id), "song");
+ if ($art != null && $art->id == null) {
+ // in most cases the song doesn't have a picture, but the album where it belongs to has
+ // if this is the case, we take the album art
+ $song = new Song(Subsonic_XML_Data::getAmpacheId(Subsonic_XML_Data::getAmpacheId($id)));
+ $art = new Art(Subsonic_XML_Data::getAmpacheId($song->album), "album");
+ }
+ } elseif (Subsonic_XML_Data::isPodcast($id)) {
+ $art = new Art(Subsonic_XML_Data::getAmpacheId($id), "podcast");
}
+ header("Access-Control-Allow-Origin: *");
if ($art != null) {
$art->get_db();
- if ($size) {
- $dim = array();
- $dim['width'] = $size;
+ if ($size && AmpConfig::get('resize_images')) {
+ $dim = array();
+ $dim['width'] = $size;
$dim['height'] = $size;
- $thumb = $art->get_thumb($dim);
+ $thumb = $art->get_thumb($dim);
if ($thumb) {
header('Content-type: ' . $thumb['thumb_mime']);
header('Content-Length: ' . strlen($thumb['thumb']));
@@ -1051,16 +1135,20 @@ class Subsonic_Api
{
self::check_version($input, "1.6.0");
- $id = self::check_parameter($input, 'id');
+ $id = self::check_parameter($input, 'id');
$rating = $input['rating'];
$robj = null;
if (Subsonic_XML_Data::isArtist($id)) {
$robj = new Rating(Subsonic_XML_Data::getAmpacheId($id), "artist");
- } else if (Subsonic_XML_Data::isAlbum($id)) {
- $robj = new Rating(Subsonic_XML_Data::getAmpacheId($id), "album");
- } else if (Subsonic_XML_Data::isSong($id)) {
- $robj = new Rating(Subsonic_XML_Data::getAmpacheId($id), "song");
+ } else {
+ if (Subsonic_XML_Data::isAlbum($id)) {
+ $robj = new Rating(Subsonic_XML_Data::getAmpacheId($id), "album");
+ } else {
+ if (Subsonic_XML_Data::isSong($id)) {
+ $robj = new Rating(Subsonic_XML_Data::getAmpacheId($id), "song");
+ }
+ }
}
if ($robj != null) {
@@ -1085,7 +1173,7 @@ class Subsonic_Api
self::check_version($input, "1.7.0");
$r = Subsonic_XML_Data::createSuccessResponse();
- Subsonic_XML_Data::addStarred($r, Userflag::get_latest('artist'), Userflag::get_latest('album'), Userflag::get_latest('song'), $elementName);
+ Subsonic_XML_Data::addStarred($r, Userflag::get_latest('artist',null,99999), Userflag::get_latest('album',null,99999), Userflag::get_latest('song',null,99999), $elementName);
self::apiOutput($input, $r);
}
@@ -1127,8 +1215,8 @@ class Subsonic_Api
private static function _setStar($input, $star)
{
- $id = $input['id'];
- $albumId = $input['albumId'];
+ $id = $input['id'];
+ $albumId = $input['albumId'];
$artistId = $input['artistId'];
// Normalize all in one array
@@ -1143,36 +1231,44 @@ class Subsonic_Api
$aid = Subsonic_XML_Data::getAmpacheId($i);
if (Subsonic_XML_Data::isArtist($i)) {
$type = 'artist';
- } else if (Subsonic_XML_Data::isAlbum($i)) {
- $type = 'album';
- } else if (Subsonic_XML_Data::isSong($i)) {
- $type = 'song';
} else {
- $type = "";
+ if (Subsonic_XML_Data::isAlbum($i)) {
+ $type = 'album';
+ } else {
+ if (Subsonic_XML_Data::isSong($i)) {
+ $type = 'song';
+ } else {
+ $type = "";
+ }
+ }
}
$ids[] = array('id' => $aid, 'type' => $type);
}
- } else if ($albumId) {
- if (!is_array($albumId)) {
- $albumId = array($albumId);
- }
- foreach ($albumId as $i) {
- $aid = Subsonic_XML_Data::getAmpacheId($i);
- $ids[] = array('id' => $aid, 'album');
- }
- } else if ($artistId) {
- if (!is_array($artistId)) {
- $artistId = array($artistId);
- }
- foreach ($artistId as $i) {
- $aid = Subsonic_XML_Data::getAmpacheId($i);
- $ids[] = array('id' => $aid, 'artist');
- }
} else {
- $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_MISSINGPARAM);
+ if ($albumId) {
+ if (!is_array($albumId)) {
+ $albumId = array($albumId);
+ }
+ foreach ($albumId as $i) {
+ $aid = Subsonic_XML_Data::getAmpacheId($i);
+ $ids[] = array('id' => $aid, 'album');
+ }
+ } else {
+ if ($artistId) {
+ if (!is_array($artistId)) {
+ $artistId = array($artistId);
+ }
+ foreach ($artistId as $i) {
+ $aid = Subsonic_XML_Data::getAmpacheId($i);
+ $ids[] = array('id' => $aid, 'artist');
+ }
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_MISSINGPARAM);
+ }
+ }
}
- foreach ($ids as $i) {
+ foreach ($ids as $i) {
$flag = new Userflag($i['id'], $i['type']);
$flag->set_flag($star);
}
@@ -1216,7 +1312,7 @@ class Subsonic_Api
self::check_version($input, "1.7.0");
if ($GLOBALS['user']->access >= 100) {
- $r = Subsonic_XML_Data::createSuccessResponse();
+ $r = Subsonic_XML_Data::createSuccessResponse();
$users = User::get_valid_users();
Subsonic_XML_Data::addUsers($r, $users);
} else {
@@ -1269,7 +1365,7 @@ class Subsonic_Api
{
self::check_version($input, "1.9.0");
- $r = Subsonic_XML_Data::createSuccessResponse();
+ $r = Subsonic_XML_Data::createSuccessResponse();
$radios = Live_Stream::get_all_radios();
Subsonic_XML_Data::addRadios($r, $radios);
self::apiOutput($input, $r);
@@ -1284,7 +1380,7 @@ class Subsonic_Api
{
self::check_version($input, "1.6.0");
- $r = Subsonic_XML_Data::createSuccessResponse();
+ $r = Subsonic_XML_Data::createSuccessResponse();
$shares = Share::get_share_list();
Subsonic_XML_Data::addShares($r, $shares);
self::apiOutput($input, $r);
@@ -1299,7 +1395,7 @@ class Subsonic_Api
{
self::check_version($input, "1.6.0");
- $id = self::check_parameter($input, 'id');
+ $id = self::check_parameter($input, 'id');
$description = $input['description'];
if (AmpConfig::get('share')) {
@@ -1317,13 +1413,15 @@ class Subsonic_Api
$object_id = Subsonic_XML_Data::getAmpacheId($id);
if (Subsonic_XML_Data::isAlbum($id)) {
$object_type = 'album';
- } else if (Subsonic_XML_Data::isSong($id)) {
- $object_type = 'song';
+ } else {
+ if (Subsonic_XML_Data::isSong($id)) {
+ $object_type = 'song';
+ }
}
if (!empty($object_type)) {
- $r = Subsonic_XML_Data::createSuccessResponse();
- $shares = array();
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ $shares = array();
$shares[] = Share::create_share($object_type, $object_id, true, Access::check_function('download'), $expire_days, Share::generate_secret(), 0, $description);
Subsonic_XML_Data::addShares($r, $shares);
} else {
@@ -1368,7 +1466,7 @@ class Subsonic_Api
{
self::check_version($input, "1.6.0");
- $id = self::check_parameter($input, 'id');
+ $id = self::check_parameter($input, 'id');
$description = $input['description'];
if (AmpConfig::get('share')) {
@@ -1418,16 +1516,16 @@ class Subsonic_Api
{
self::check_version($input, "1.1.0");
- $username = self::check_parameter($input, 'username');
- $password = self::check_parameter($input, 'password');
- $email = self::check_parameter($input, 'email');
+ $username = self::check_parameter($input, 'username');
+ $password = self::check_parameter($input, 'password');
+ $email = self::check_parameter($input, 'email');
$ldapAuthenticated = $input['ldapAuthenticated'];
- $adminRole = ($input['adminRole'] == 'true');
+ $adminRole = ($input['adminRole'] == 'true');
//$settingsRole = $input['settingsRole'];
//$streamRole = $input['streamRole'];
//$jukeboxRole = $input['jukeboxRole'];
$downloadRole = ($input['downloadRole'] == 'true');
- $uploadRole = ($input['uploadRole'] == 'true');
+ $uploadRole = ($input['uploadRole'] == 'true');
//$playlistRole = $input['playlistRole'];
$coverArtRole = ($input['coverArtRole'] == 'true');
//$commentRole = $input['commentRole'];
@@ -1442,7 +1540,7 @@ class Subsonic_Api
$access = 75;
}
$password = self::decrypt_password($password);
- $user_id = User::create($username, $username, $email, null, $password, $access);
+ $user_id = User::create($username, $username, $email, null, $password, $access);
if ($user_id > 0) {
if ($downloadRole) {
Preference::update('download', $user_id, '1');
@@ -1526,8 +1624,8 @@ class Subsonic_Api
{
self::check_version($input, "1.2.0");
$action = self::check_parameter($input, 'action');
- $id = $input['id'];
- $gain = $input['gain'];
+ $id = $input['id'];
+ $gain = $input['gain'];
$r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
debug_event('subsonic', 'Using Localplay controller: ' . AmpConfig::get('localplay_controller'), 5);
@@ -1548,8 +1646,9 @@ class Subsonic_Api
break;
case 'skip':
if (isset($input['index'])) {
- if ($localplay->skip($input['index']))
+ if ($localplay->skip($input['index'])) {
$ret = $localplay->play();
+ }
} elseif (isset($input['offset'])) {
debug_event('subsonic', 'Skip with offset is not supported on JukeboxControl.', 5);
} else {
@@ -1561,9 +1660,9 @@ class Subsonic_Api
case 'add':
if ($id) {
if (!is_array($id)) {
- $rid = array();
+ $rid = array();
$rid[] = $id;
- $id = $rid;
+ $id = $rid;
}
foreach ($id as $i) {
@@ -1576,9 +1675,9 @@ class Subsonic_Api
if ($url) {
debug_event('subsonic', 'Adding ' . $url, 5);
- $stream = array();
+ $stream = array();
$stream['url'] = $url;
- $ret = $localplay->add_url(new Stream_URL($stream));
+ $ret = $localplay->add_url(new Stream_URL($stream));
}
}
}
@@ -1628,9 +1727,9 @@ class Subsonic_Api
//$submission = $input['submission'];
if (!is_array($id)) {
- $rid = array();
+ $rid = array();
$rid[] = $id;
- $id = $rid;
+ $id = $rid;
}
foreach ($id as $i) {
@@ -1660,27 +1759,27 @@ class Subsonic_Api
self::check_version($input, "1.2.0");
$artist = $input['artist'];
- $title = $input['title'];
+ $title = $input['title'];
if (!$artist && !$title) {
$r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_MISSINGPARAM);
} else {
- $search = array();
- $search['limit'] = 1;
+ $search = array();
+ $search['limit'] = 1;
$search['offset'] = 0;
- $search['type'] = "song";
+ $search['type'] = "song";
$i = 0;
if ($artist) {
- $search['rule_'.$i.'_input'] = $artist;
- $search['rule_'.$i.'_operator'] = 5;
- $search['rule_'.$i.''] = "artist";
+ $search['rule_' . $i . '_input'] = $artist;
+ $search['rule_' . $i . '_operator'] = 5;
+ $search['rule_' . $i . ''] = "artist";
++$i;
}
if ($title) {
- $search['rule_'.$i.'_input'] = $title;
- $search['rule_'.$i.'_operator'] = 5;
- $search['rule_'.$i.''] = "title";
+ $search['rule_' . $i . '_input'] = $title;
+ $search['rule_' . $i . '_operator'] = 5;
+ $search['rule_' . $i . ''] = "title";
++$i;
}
@@ -1703,15 +1802,15 @@ class Subsonic_Api
*/
public static function getartistinfo($input)
{
- $id = self::check_parameter($input, 'id');
- $count = $input['count'] ?: 20;
+ $id = self::check_parameter($input, 'id');
+ $count = $input['count'] ?: 20;
$includeNotPresent = ($input['includeNotPresent'] === "true");
if (Subsonic_XML_Data::isArtist($id)) {
$artist_id = Subsonic_XML_Data::getAmpacheId($id);
- $info = Recommendation::get_artist_info($artist_id);
- $similars = Recommendation::get_artists_like($artist_id, $count, !$includeNotPresent);
- $r = Subsonic_XML_Data::createSuccessResponse();
+ $info = Recommendation::get_artist_info($artist_id);
+ $similars = Recommendation::get_artists_like($artist_id, $count, !$includeNotPresent);
+ $r = Subsonic_XML_Data::createSuccessResponse();
Subsonic_XML_Data::addArtistInfo($r, $info, $similars);
} else {
$r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
@@ -1736,7 +1835,7 @@ class Subsonic_Api
*/
public static function getsimilarsongs($input)
{
- $id = self::check_parameter($input, 'id');
+ $id = self::check_parameter($input, 'id');
$count = $input['count'] ?: 50;
$songs = null;
@@ -1769,19 +1868,54 @@ class Subsonic_Api
return self::getsimilarsongs($input);
}
- /**** CURRENT UNSUPPORTED FUNCTIONS ****/
-
/**
* getPodcasts
* Get all podcast channels.
* Takes the optional includeEpisodes and channel id in parameters
- * Not supported.
*/
public static function getpodcasts($input)
{
self::check_version($input, "1.6.0");
+ $id = $input['id'];
+ $includeEpisodes = isset($input['includeEpisodes']) ? $input['includeEpisodes'] : true;
- $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ if (AmpConfig::get('podcast')) {
+ if ($id) {
+ $podcast = new Podcast(Subsonic_XML_Data::getAmpacheId($id));
+ if ($podcast->id) {
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ Subsonic_XML_Data::addPodcasts($r, array($podcast), $includeEpisodes);
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ }
+ } else {
+ $podcasts = Catalog::get_podcasts();
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ Subsonic_XML_Data::addPodcasts($r, $podcasts, $includeEpisodes);
+ }
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_UNAUTHORIZED);
+ }
+ self::apiOutput($input, $r);
+ }
+
+ /**
+ * getNewestPodcasts
+ * Get the most recently published podcast episodes.
+ * Takes the optional count in parameters
+ */
+ public static function getnewestpodcasts($input)
+ {
+ self::check_version($input, "1.13.0");
+ $count = $input['count'] ?: 20;
+
+ if (AmpConfig::get('podcast')) {
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ $episodes = Catalog::get_newest_podcasts($count);
+ Subsonic_XML_Data::addNewestPodcastEpisodes($r, $episodes);
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_UNAUTHORIZED);
+ }
self::apiOutput($input, $r);
}
@@ -1789,13 +1923,20 @@ class Subsonic_Api
* refreshPodcasts
* Request the server to check for new podcast episodes.
* Takes no parameters.
- * Not supported.
*/
public static function refreshpodcasts($input)
{
self::check_version($input, "1.9.0");
- $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ if (AmpConfig::get('podcast') && Access::check('interface', 75)) {
+ $podcasts = Catalog::get_podcasts();
+ foreach ($podcasts as $podcast) {
+ $podcast->sync_episodes(true);
+ }
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_UNAUTHORIZED);
+ }
self::apiOutput($input, $r);
}
@@ -1803,13 +1944,29 @@ class Subsonic_Api
* createPodcastChannel
* Add a new podcast channel.
* Takes the podcast url in parameter.
- * Not supported.
*/
public static function createpodcastchannel($input)
{
self::check_version($input, "1.9.0");
-
- $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ $url = self::check_parameter($input, 'url');
+
+ if (AmpConfig::get('podcast') && Access::check('interface', 75)) {
+ $catalogs = Catalog::get_catalogs('podcast');
+ if (count($catalogs) > 0) {
+ $data = array();
+ $data['feed'] = $url;
+ $data['catalog'] = $catalogs[0];
+ if (Podcast::create($data)) {
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_GENERIC);
+ }
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_UNAUTHORIZED);
+ }
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_UNAUTHORIZED);
+ }
self::apiOutput($input, $r);
}
@@ -1817,13 +1974,26 @@ class Subsonic_Api
* deletePodcastChannel
* Delete an existing podcast channel
* Takes the podcast id in parameter.
- * Not supported.
*/
public static function deletepodcastchannel($input)
{
self::check_version($input, "1.9.0");
-
- $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ $id = self::check_parameter($input, 'id');
+
+ if (AmpConfig::get('podcast') && Access::check('interface', 75)) {
+ $podcast = new Podcast(Subsonic_XML_Data::getAmpacheId($id));
+ if ($podcast->id) {
+ if ($podcast->remove()) {
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_GENERIC);
+ }
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ }
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_UNAUTHORIZED);
+ }
self::apiOutput($input, $r);
}
@@ -1831,13 +2001,26 @@ class Subsonic_Api
* deletePodcastEpisode
* Delete a podcast episode
* Takes the podcast episode id in parameter.
- * Not supported.
*/
public static function deletepodcastepisode($input)
{
self::check_version($input, "1.9.0");
-
- $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ $id = self::check_parameter($input, 'id');
+
+ if (AmpConfig::get('podcast') && Access::check('interface', 75)) {
+ $episode = new Podcast_Episode(Subsonic_XML_Data::getAmpacheId($id));
+ if ($episode->id) {
+ if ($episode->remove()) {
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_GENERIC);
+ }
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ }
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_UNAUTHORIZED);
+ }
self::apiOutput($input, $r);
}
@@ -1845,15 +2028,98 @@ class Subsonic_Api
* downloadPodcastEpisode
* Request the server to download a podcast episode
* Takes the podcast episode id in parameter.
- * Not supported.
*/
public static function downloadpodcastepisode($input)
{
self::check_version($input, "1.9.0");
-
- $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ $id = self::check_parameter($input, 'id');
+
+ if (AmpConfig::get('podcast') && Access::check('interface', 75)) {
+ $episode = new Podcast_Episode(Subsonic_XML_Data::getAmpacheId($id));
+ if ($episode->id) {
+ $episode->gather();
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ }
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_UNAUTHORIZED);
+ }
self::apiOutput($input, $r);
}
+
+ /**
+ * getBookmarks
+ * Get all user bookmarks.
+ * Takes no parameter.
+ * Not supported.
+ */
+ public static function getbookmarks($input)
+ {
+ self::check_version($input, "1.9.0");
+
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ $bookmarks = Bookmark::get_bookmarks();
+ Subsonic_XML_Data::addBookmarks($r, $bookmarks);
+ self::apiOutput($input, $r);
+ }
+
+ /**
+ * createBookmark
+ * Creates or updates a bookmark.
+ * Takes the file id and position with optional comment in parameters.
+ * Not supported.
+ */
+ public static function createbookmark($input)
+ {
+ self::check_version($input, "1.9.0");
+ $id = self::check_parameter($input, 'id');
+ $position = self::check_parameter($input, 'position');
+ $comment = $input['comment'];
+ $type = Subsonic_XML_Data::getAmpacheType($id);
+
+ if (!empty($type)) {
+ $bookmark = new Bookmark(Subsonic_XML_Data::getAmpacheId($id), $type);
+ if ($bookmark->id) {
+ $bookmark->update($position);
+ } else {
+ Bookmark::create(array(
+ 'object_id' => Subsonic_XML_Data::getAmpacheId($id),
+ 'object_type' => $type,
+ 'comment' => $comment,
+ 'position' => $position
+ ));
+ }
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ }
+ self::apiOutput($input, $r);
+ }
+
+ /**
+ * deleteBookmark
+ * Delete an existing bookmark.
+ * Takes the file id in parameter.
+ * Not supported.
+ */
+ public static function deletebookmark($input)
+ {
+ self::check_version($input, "1.9.0");
+ $id = self::check_parameter($input, 'id');
+ $type = Subsonic_XML_Data::getAmpacheType($id);
+
+ $bookmark = new Bookmark(Subsonic_XML_Data::getAmpacheId($id), $type);
+ if ($bookmark->id) {
+ $bookmark->remove();
+ $r = Subsonic_XML_Data::createSuccessResponse();
+ } else {
+ $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
+ }
+ self::apiOutput($input, $r);
+ }
+
+ /**** CURRENT UNSUPPORTED FUNCTIONS ****/
/**
* getChatMessages
@@ -1882,44 +2148,30 @@ class Subsonic_Api
$r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
self::apiOutput($input, $r);
}
-
+
/**
- * getBookmarks
- * Get all user bookmarks.
+ * getPlayQueue
+ * Geturns the state of the play queue for the authenticated user.
* Takes no parameter.
* Not supported.
*/
- public static function getbookmarks($input)
+ public static function getplayqueue($input)
{
- self::check_version($input, "1.9.0");
+ self::check_version($input, "1.12.0");
$r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
self::apiOutput($input, $r);
}
-
+
/**
- * createBookmark
- * Creates or updates a bookmark.
- * Takes the file id and position with optional comment in parameters.
+ * savePlayQueue
+ * Save the state of the play queue for the authenticated user.
+ * Takes multiple song id in parameter with optional current id playing sond and position.
* Not supported.
*/
- public static function createbookmark($input)
+ public static function saveplayqueue($input)
{
- self::check_version($input, "1.9.0");
-
- $r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
- self::apiOutput($input, $r);
- }
-
- /**
- * deleteBookmark
- * Delete an existing bookmark.
- * Takes the file id in parameter.
- * Not supported.
- */
- public static function deletebookmark($input)
- {
- self::check_version($input, "1.9.0");
+ self::check_version($input, "1.12.0");
$r = Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_DATA_NOTFOUND);
self::apiOutput($input, $r);
diff --git a/sources/lib/class/subsonic_xml_data.class.php b/sources/lib/class/subsonic_xml_data.class.php
index 675b8fd..ffca28d 100644
--- a/sources/lib/class/subsonic_xml_data.class.php
+++ b/sources/lib/class/subsonic_xml_data.class.php
@@ -2,22 +2,21 @@
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
- * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
* Copyright 2001 - 2015 Ampache.org
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see /i', "\n", $lyrics['text']);
- $text = str_replace("\r", '', $text);
+ $text = preg_replace('/\/i', "\n", $lyrics['text']);
+ $text = str_replace("\r", '', $text);
$xlyrics = $xml->addChild("lyrics", $text);
if ($artist) {
$xlyrics->addAttribute("artist", $artist);
@@ -762,7 +878,7 @@ class Subsonic_XML_Data
foreach ($similars as $similar) {
$xsimilar = $xartist->addChild("similarArtist");
$xsimilar->addAttribute("id", ($similar['id'] !== null ? self::getArtistId($similar['id']) : "-1"));
- $xsimilar->addAttribute("name", $similar['name']);
+ $xsimilar->addAttribute("name", self::checkName($similar['name']));
}
}
@@ -777,4 +893,91 @@ class Subsonic_XML_Data
}
}
}
+
+ public static function addPodcasts($xml, $podcasts, $includeEpisodes = false)
+ {
+ $xpodcasts = $xml->addChild("podcasts");
+ foreach ($podcasts as $podcast) {
+ $podcast->format();
+ $xchannel = $xpodcasts->addChild("channel");
+ $xchannel->addAttribute("id", self::getPodcastId($podcast->id));
+ $xchannel->addAttribute("url", $podcast->feed);
+ $xchannel->addAttribute("title", self::checkName($podcast->f_title));
+ $xchannel->addAttribute("description", $podcast->f_description);
+ if (Art::has_db($podcast->id, 'podcast')) {
+ $xchannel->addAttribute("coverArt", "pod-" . self::getPodcastId($podcast->id));
+ }
+ $xchannel->addAttribute("status", "completed");
+ if ($includeEpisodes) {
+ $episodes = $podcast->get_episodes();
+ foreach ($episodes as $episode_id) {
+ $episode = new Podcast_Episode($episode_id);
+ self::addPodcastEpisode($xchannel, $episode);
+ }
+ }
+ }
+ }
+
+ private static function addPodcastEpisode($xml, $episode, $elementName = 'episode')
+ {
+ $episode->format();
+ $xepisode = $xml->addChild($elementName);
+ $xepisode->addAttribute("id", self::getPodcastEpId($episode->id));
+ $xepisode->addAttribute("channelId", self::getPodcastId($episode->podcast));
+ $xepisode->addAttribute("title", $episode->f_title);
+ $xepisode->addAttribute("album", $episode->f_podcast);
+ $xepisode->addAttribute("description", $episode->f_description);
+ $xepisode->addAttribute("duration", $episode->time);
+ $xepisode->addAttribute("genre", "Podcast");
+ $xepisode->addAttribute("isDir", "false");
+ $xepisode->addAttribute("publishDate", date("c", $episode->pubdate));
+ $xepisode->addAttribute("status", $episode->state);
+ if (Art::has_db($episode->podcast, 'podcast')) {
+ $xepisode->addAttribute("coverArt",self::getPodcastId($episode->podcast));
+ }
+ if ($episode->file) {
+ $xepisode->addAttribute("streamId", self::getPodcastEpId($episode->id));
+ $xepisode->addAttribute("size", $episode->size);
+ $xepisode->addAttribute("suffix", $episode->type);
+ $xepisode->addAttribute("contentType", $episode->mime);
+ // Create a clean fake path instead of song real file path to have better offline mode storage on Subsonic clients
+ $path = basename($episode->file);
+ $xepisode->addAttribute("path", $path);
+ }
+ }
+
+ public static function addNewestPodcastEpisodes($xml, $episodes)
+ {
+ $xpodcasts = $xml->addChild("newestPodcasts");
+ foreach ($episodes as $episode) {
+ $episode->format();
+ self::addPodcastEpisode($xpodcasts, $episode);
+ }
+ }
+
+ public static function addBookmarks($xml, $bookmarks)
+ {
+ $xbookmarks = $xml->addChild("bookmarks");
+ foreach ($bookmarks as $bookmark) {
+ $bookmark->format();
+ self::addBookmark($xbookmarks, $bookmark);
+ }
+ }
+
+ private static function addBookmark($xml, $bookmark)
+ {
+ $xbookmark = $xml->addChild("bookmark");
+ $xbookmark->addAttribute("position", $bookmark->position);
+ $xbookmark->addAttribute("username", $bookmark->f_user);
+ $xbookmark->addAttribute("comment", $bookmark->comment);
+ $xbookmark->addAttribute("created", date("c", $bookmark->creation_date));
+ $xbookmark->addAttribute("changed", date("c", $bookmark->update_date));
+ if ($bookmark->object_type == "song") {
+ self::addSong($xbookmark, new Song($bookmark->object_id), false, 'entry');
+ } elseif ($bookmark->object_type == "video") {
+ self::addVideo($xbookmark, new Video($bookmark->object_id), 'entry');
+ } elseif ($bookmark->object_type == "podcast_episode") {
+ self::addPodcastEpisode($xbookmark, new Podcast_Episode($bookmark->object_id), 'entry');
+ }
+ }
}
diff --git a/sources/lib/class/tag.class.php b/sources/lib/class/tag.class.php
index b83151c..a910297 100644
--- a/sources/lib/class/tag.class.php
+++ b/sources/lib/class/tag.class.php
@@ -2,21 +2,21 @@
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
- * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
* Copyright 2001 - 2015 Ampache.org
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License v2
- * as published by the Free Software Foundation.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
" . $value . "
\n"; } @@ -371,4 +390,14 @@ END; return AmpConfig::get('web_path') . AmpConfig::get('theme_path') . '/images/ampache.png'; } } + + public static function is_grid_view($type) + { + $isgv = true; + $cn = 'browse_' . $type . '_grid_view'; + if (isset($_COOKIE[$cn])) { + $isgv = ($_COOKIE[$cn] == 'true'); + } + return $isgv; + } } diff --git a/sources/lib/class/update.class.php b/sources/lib/class/update.class.php index 688939a..e18355c 100644 --- a/sources/lib/class/update.class.php +++ b/sources/lib/class/update.class.php @@ -2,21 +2,21 @@ /* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * - * LICENSE: GNU General Public License, version 2 (GPLv2) + * LICENSE: GNU Affero General Public License, version 3 (AGPLv3) * Copyright 2001 - 2015 Ampache.org * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License v2 - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see
' . '- Made some minor changes to song table to reduce size of each row.
' . @@ -164,7 +163,7 @@ class Update $version[] = array('version' => '340006','description' => $update_string); $update_string = '- Altered the session table, making value a LONGTEXT.
'; - $version[] = array('version' => '340007','description' => $update_string); + $version[] = array('version' => '340007','description' => $update_string); $update_string = '- Modified Playlist_Data table to account for multiple object types.
' . '- Verified previous updates, adjusting as needed.
' . @@ -206,7 +205,7 @@ class Update $version[] = array('version' => '340016','description'=>$update_string); $update_string = '- Fix Tables for new Democratic Play methodology.
'; - $version[] = array('version' => '340017','description'=>$update_string); + $version[] = array('version' => '340017','description'=>$update_string); $update_string = '- Modify the Tag tables so that they actually work.
' . '- Alter the Prefix fields to allow for more prefixs.
'; @@ -227,10 +226,10 @@ class Update $version[] = array('version'=>'350004','description'=>$update_string); $update_string = "- Add table for Video files
"; - $version[] = array('version'=>'350005','description'=>$update_string); + $version[] = array('version'=>'350005','description'=>$update_string); $update_string = "- Add data for Lyrics
"; - $version[] = array('version'=>'350006','description'=>$update_string); + $version[] = array('version'=>'350006','description'=>$update_string); $update_string = '- Remove unused fields from catalog, playlist, playlist_data
' . '- Add tables for dynamic playlists
' . @@ -262,250 +261,283 @@ class Update $version[] = array('version'=>'360003','description'=>$update_string); $update_string = '- Add uniqueness constraint to ratings.
'; - $version[] = array('version' => '360004','description' => $update_string); + $version[] = array('version' => '360004','description' => $update_string); $update_string = '- Modify tmp_browse to allow caching of multiple browses per session.
'; - $version[] = array('version' => '360005','description' => $update_string); + $version[] = array('version' => '360005','description' => $update_string); $update_string = '- Add table for dynamic playlists.
'; - $version[] = array('version' => '360006','description' => $update_string); + $version[] = array('version' => '360006','description' => $update_string); $update_string = '- Verify remote_username and remote_password were added correctly to catalog table.
'; - $version[] = array('version' => '360008','description' => $update_string); + $version[] = array('version' => '360008','description' => $update_string); $update_string = '- Allow long sessionids in tmp_playlist table.
'; - $version[] = array('version' => '360009', 'description' => $update_string); + $version[] = array('version' => '360009', 'description' => $update_string); $update_string = '- Allow compound MBIDs in the artist table.
'; - $version[] = array('version' => '360010', 'description' => $update_string); + $version[] = array('version' => '360010', 'description' => $update_string); $update_string = '- Add table to store stream session playlist.
'; - $version[] = array('version' => '360011', 'description' => $update_string); + $version[] = array('version' => '360011', 'description' => $update_string); $update_string = '- Drop enum for the type field in session.
'; - $version[] = array('version' => '360012', 'description' => $update_string); + $version[] = array('version' => '360012', 'description' => $update_string); $update_string = '- Update stream_playlist table to address performance issues.
'; - $version[] = array('version' => '360013', 'description' => $update_string); + $version[] = array('version' => '360013', 'description' => $update_string); $update_string = '- Increase the length of sessionids again.
'; - $version[] = array('version' => '360014', 'description' => $update_string); + $version[] = array('version' => '360014', 'description' => $update_string); $update_string = '- Add iframes parameter to preferences.
'; - $version[] = array('version' => '360015', 'description' => $update_string); + $version[] = array('version' => '360015', 'description' => $update_string); $update_string = '- Optionally filter Now Playing to return only the last song per user.
'; - $version[] = array('version' => '360016', 'description' => $update_string); + $version[] = array('version' => '360016', 'description' => $update_string); $update_string = '- Add user flags on objects.
'; - $version[] = array('version' => '360017', 'description' => $update_string); + $version[] = array('version' => '360017', 'description' => $update_string); $update_string = '- Add album default sort value to preferences.
'; - $version[] = array('version' => '360018', 'description' => $update_string); + $version[] = array('version' => '360018', 'description' => $update_string); $update_string = '- Add option to show number of times a song was played.
'; - $version[] = array('version' => '360019', 'description' => $update_string); + $version[] = array('version' => '360019', 'description' => $update_string); $update_string = '- Catalog types are plugins now.
'; - $version[] = array('version' => '360020', 'description' => $update_string); + $version[] = array('version' => '360020', 'description' => $update_string); $update_string = '- Add insertion date on Now Playing and option to show the current song in page title for Web player.
'; - $version[] = array('version' => '360021', 'description' => $update_string); + $version[] = array('version' => '360021', 'description' => $update_string); $update_string = '- Remove unused live_stream fields and add codec field.
'; - $version[] = array('version' => '360022', 'description' => $update_string); + $version[] = array('version' => '360022', 'description' => $update_string); $update_string = '- Enable/Disable SubSonic and Plex backend.
'; - $version[] = array('version' => '360023', 'description' => $update_string); + $version[] = array('version' => '360023', 'description' => $update_string); $update_string = '- Drop flagged table.
'; - $version[] = array('version' => '360024', 'description' => $update_string); + $version[] = array('version' => '360024', 'description' => $update_string); $update_string = '- Add options to enable HTML5 / Flash on web players.
'; - $version[] = array('version' => '360025', 'description' => $update_string); + $version[] = array('version' => '360025', 'description' => $update_string); $update_string = '- Added agent to `object_count` table.
'; - $version[] = array('version' => '360026','description' => $update_string); + $version[] = array('version' => '360026','description' => $update_string); $update_string = '- Add option to allow/disallow to show personnal information to other users (now playing and recently played).
'; - $version[] = array('version' => '360027','description' => $update_string); + $version[] = array('version' => '360027','description' => $update_string); - $update_string = '- Personnal information: allow/disallow to show in now playing.
'. - '- Personnal information: allow/disallow to show in recently played.
'. + $update_string = '- Personnal information: allow/disallow to show in now playing.
' . + '- Personnal information: allow/disallow to show in recently played.
' . '- Personnal information: allow/disallow to show time and/or agent in recently played.
'; $version[] = array('version' => '360028','description' => $update_string); $update_string = '- Add new table to store wanted releases.
'; - $version[] = array('version' => '360029','description' => $update_string); + $version[] = array('version' => '360029','description' => $update_string); $update_string = '- New table to store song previews.
'; - $version[] = array('version' => '360030','description' => $update_string); + $version[] = array('version' => '360030','description' => $update_string); $update_string = '- Add option to fix header position on compatible themes.
'; - $version[] = array('version' => '360031','description' => $update_string); + $version[] = array('version' => '360031','description' => $update_string); $update_string = '- Add check update automatically option.
'; - $version[] = array('version' => '360032','description' => $update_string); + $version[] = array('version' => '360032','description' => $update_string); $update_string = '- Add song waveform as song data.
'; - $version[] = array('version' => '360033','description' => $update_string); + $version[] = array('version' => '360033','description' => $update_string); $update_string = '- Add settings for confirmation when closing window and auto-pause between tabs.
'; - $version[] = array('version' => '360034','description' => $update_string); + $version[] = array('version' => '360034','description' => $update_string); $update_string = '- Add beautiful stream url setting.
'; - $version[] = array('version' => '360035','description' => $update_string); + $version[] = array('version' => '360035','description' => $update_string); $update_string = '- Remove unused parameters.
'; - $version[] = array('version' => '360036','description' => $update_string); + $version[] = array('version' => '360036','description' => $update_string); $update_string = '- Add sharing features.
'; - $version[] = array('version' => '360037','description' => $update_string); + $version[] = array('version' => '360037','description' => $update_string); $update_string = '- Add missing albums browse on missing artists.
'; - $version[] = array('version' => '360038','description' => $update_string); + $version[] = array('version' => '360038','description' => $update_string); $update_string = '- Add website field on users.
'; - $version[] = array('version' => '360039','description' => $update_string); + $version[] = array('version' => '360039','description' => $update_string); $update_string = '- Add channels.
'; - $version[] = array('version' => '360041','description' => $update_string); + $version[] = array('version' => '360041','description' => $update_string); $update_string = '- Add broadcasts and player control.
'; - $version[] = array('version' => '360042','description' => $update_string); + $version[] = array('version' => '360042','description' => $update_string); $update_string = '- Add slideshow on currently played artist preference.
'; - $version[] = array('version' => '360043','description' => $update_string); + $version[] = array('version' => '360043','description' => $update_string); $update_string = '- Add artist description/recommendation external service data cache.
'; - $version[] = array('version' => '360044','description' => $update_string); + $version[] = array('version' => '360044','description' => $update_string); $update_string = '- Set user field on playlists as optional.
'; - $version[] = array('version' => '360045','description' => $update_string); + $version[] = array('version' => '360045','description' => $update_string); $update_string = '- Add broadcast web player by default preference.
'; - $version[] = array('version' => '360046','description' => $update_string); + $version[] = array('version' => '360046','description' => $update_string); $update_string = '- Add apikey field on users.
'; - $version[] = array('version' => '360047','description' => $update_string); + $version[] = array('version' => '360047','description' => $update_string); $update_string = '- Add concerts options.
'; - $version[] = array('version' => '360048','description' => $update_string); + $version[] = array('version' => '360048','description' => $update_string); $update_string = '- Add album group multiple disks setting.
'; - $version[] = array('version' => '360049','description' => $update_string); + $version[] = array('version' => '360049','description' => $update_string); $update_string = '- Add top menu setting.
'; - $version[] = array('version' => '360050','description' => $update_string); + $version[] = array('version' => '360050','description' => $update_string); $update_string = '- Copy default .htaccess configurations.
'; - $version[] = array('version' => '360051','description' => $update_string); + $version[] = array('version' => '360051','description' => $update_string); $update_string = '- Drop unused dynamic_playlist tables and add session id to votes.
'; - $version[] = array('version' => '370001','description' => $update_string); + $version[] = array('version' => '370001','description' => $update_string); $update_string = '- Add tag persistent merge reference.
'; - $version[] = array('version' => '370002','description' => $update_string); + $version[] = array('version' => '370002','description' => $update_string); $update_string = '- Add show/hide donate button preference.
'; - $version[] = array('version' => '370003','description' => $update_string); + $version[] = array('version' => '370003','description' => $update_string); $update_string = '- Add license information and user\'s artist association.
'; - $version[] = array('version' => '370004','description' => $update_string); + $version[] = array('version' => '370004','description' => $update_string); $update_string = '- Add new column album_artist into table song.
'; - $version[] = array('version' => '370005','description' => $update_string); + $version[] = array('version' => '370005','description' => $update_string); $update_string = '- Add random and limit options to smart playlists.
'; - $version[] = array('version' => '370006','description' => $update_string); + $version[] = array('version' => '370006','description' => $update_string); $update_string = '- Add DAAP backend preference.
'; - $version[] = array('version' => '370007','description' => $update_string); + $version[] = array('version' => '370007','description' => $update_string); $update_string = '- Add UPnP backend preference.
'; - $version[] = array('version' => '370008','description' => $update_string); + $version[] = array('version' => '370008','description' => $update_string); $update_string = '- Enhance video support with TVShows and Movies.
'; - $version[] = array('version' => '370009','description' => $update_string); + $version[] = array('version' => '370009','description' => $update_string); $update_string = '- Add MusicBrainz Album Release Group identifier.
'; - $version[] = array('version' => '370010','description' => $update_string); + $version[] = array('version' => '370010','description' => $update_string); $update_string = '- Add Prefix to TVShows and Movies.
'; - $version[] = array('version' => '370011','description' => $update_string); + $version[] = array('version' => '370011','description' => $update_string); $update_string = '- Add metadata information to albums / songs / videos.
'; - $version[] = array('version' => '370012','description' => $update_string); + $version[] = array('version' => '370012','description' => $update_string); $update_string = '- Replace iframe with ajax page load.
'; - $version[] = array('version' => '370013','description' => $update_string); + $version[] = array('version' => '370013','description' => $update_string); $update_string = '- Modified release_date in video table to signed int.
'; - $version[] = array('version' => '370014','description' => $update_string); + $version[] = array('version' => '370014','description' => $update_string); $update_string = '- Add session_remember table to store remember tokens.
'; - $version[] = array('version' => '370015','description' => $update_string); + $version[] = array('version' => '370015','description' => $update_string); $update_string = '- Add limit of media count for direct play preference.
'; - $version[] = array('version' => '370016','description' => $update_string); + $version[] = array('version' => '370016','description' => $update_string); $update_string = '- Add home display settings.
'; - $version[] = array('version' => '370017','description' => $update_string); + $version[] = array('version' => '370017','description' => $update_string); $update_string = '- Enhance tag persistent merge reference.
'; - $version[] = array('version' => '370018','description' => $update_string); + $version[] = array('version' => '370018','description' => $update_string); $update_string = '- Add album group order setting.
'; - $version[] = array('version' => '370019','description' => $update_string); + $version[] = array('version' => '370019','description' => $update_string); $update_string = '- Add webplayer browser notification settings.
'; - $version[] = array('version' => '370020','description' => $update_string); + $version[] = array('version' => '370020','description' => $update_string); $update_string = '- Add rating to playlists, tvshows and tvshows seasons.
'; - $version[] = array('version' => '370021','description' => $update_string); + $version[] = array('version' => '370021','description' => $update_string); $update_string = '- Add users geolocation.
'; - $version[] = array('version' => '370022','description' => $update_string); + $version[] = array('version' => '370022','description' => $update_string); $update_string = " - Add Aurora.js webplayer option.
"; - $version[] = array('version' => '370023','description' => $update_string); + $version[] = array('version' => '370023','description' => $update_string); $update_string = " - Add count_type column to object_count table.
"; - $version[] = array('version' => '370024','description' => $update_string); + $version[] = array('version' => '370024','description' => $update_string); $update_string = " - Add state and city fields to user table.
"; - $version[] = array('version' => '370025','description' => $update_string); + $version[] = array('version' => '370025','description' => $update_string); $update_string = " - Add replay gain fields to song_data table.
"; - $version[] = array('version' => '370026','description' => $update_string); + $version[] = array('version' => '370026','description' => $update_string); $update_string = " - Move column album_artist from table song to table album.
"; - $version[] = array('version' => '370027','description' => $update_string); + $version[] = array('version' => '370027','description' => $update_string); $update_string = " - Add width and height in table image.
"; - $version[] = array('version' => '370028','description' => $update_string); + $version[] = array('version' => '370028','description' => $update_string); $update_string = " - Set image column from image table as nullable.
"; - $version[] = array('version' => '370029','description' => $update_string); + $version[] = array('version' => '370029','description' => $update_string); $update_string = " - Add an option to allow users to remove uploaded songs.
"; - $version[] = array('version' => '370030','description' => $update_string); + $version[] = array('version' => '370030','description' => $update_string); $update_string = " - Add an option to customize login art, favicon and text footer.
"; - $version[] = array('version' => '370031','description' => $update_string); + $version[] = array('version' => '370031','description' => $update_string); $update_string = " - Add WebDAV backend preference.
"; - $version[] = array('version' => '370032','description' => $update_string); + $version[] = array('version' => '370032','description' => $update_string); $update_string = " - Add Label tables.
"; - $version[] = array('version' => '370033','description' => $update_string); + $version[] = array('version' => '370033','description' => $update_string); $update_string = " - Add User messages and user follow tables.
"; - $version[] = array('version' => '370034','description' => $update_string); + $version[] = array('version' => '370034','description' => $update_string); $update_string = " - Add option on user fullname to show/hide it publicly.
"; - $version[] = array('version' => '370035','description' => $update_string); + $version[] = array('version' => '370035','description' => $update_string); + + $update_string = " - Add track number field to stream_playlist table.
"; + $version[] = array('version' => '370036','description' => $update_string); + + $update_string = " - Delete http_port preference (use ampache.cfg.php configuration instead).
"; + $version[] = array('version' => '370037','description' => $update_string); + $update_string = " - Add theme color option.
"; + $version[] = array('version' => '370038','description' => $update_string); + + $update_string = " - Renamed false named sample_rate option name in preference table.
"; + $version[] = array('version' => '370039','description' => $update_string); + + $update_string = " - Add user_activity table.
"; + $version[] = array('version' => '370040','description' => $update_string); + + $update_string = "- Add basic metadata tables.
"; + $version[] = array('version' => '370041', 'description' => $update_string); + + $update_string = "- Add podcasts.
"; + $version[] = array('version' => '380001', 'description' => $update_string); + + $update_string = "- Add bookmarks.
"; + $version[] = array('version' => '380002', 'description' => $update_string); + + $update_string = "- Add unique constraint on tag_map table.
"; + $version[] = array('version' => '380003', 'description' => $update_string); + + $update_string = "- Add preference subcategory.
"; + $version[] = array('version' => '380004', 'description' => $update_string); + + $update_string = "- Add manual update flag on artist.
"; + $version[] = array('version' => '380005', 'description' => $update_string); + return $version; } @@ -523,13 +555,16 @@ class Update } $update_needed = false; - if (!defined('CLI')) { echo "
';
}
-
} // format_user
/**
@@ -1058,7 +1068,6 @@ class User extends database_object
default:
return '0';
}
-
} // access_name_to_level
/**
@@ -1073,7 +1082,7 @@ class User extends database_object
$user_id = Dba::escape($user_id);
/* Get All Preferences for the current user */
- $sql = "SELECT * FROM `user_preference` WHERE `user`='$user_id'";
+ $sql = "SELECT * FROM `user_preference` WHERE `user`='$user_id'";
$db_results = Dba::read($sql);
$results = array();
@@ -1083,7 +1092,7 @@ class User extends database_object
/* Check for duplicates */
if (isset($results[$pref_id])) {
$r['value'] = Dba::escape($r['value']);
- $sql = "DELETE FROM `user_preference` WHERE `user`='$user_id' AND `preference`='" . $r['preference'] . "' AND" .
+ $sql = "DELETE FROM `user_preference` WHERE `user`='$user_id' AND `preference`='" . $r['preference'] . "' AND" .
" `value`='" . Dba::escape($r['value']) . "'";
Dba::write($sql);
} // if its set
@@ -1100,7 +1109,7 @@ class User extends database_object
/* While through our base stuff */
$zero_results = array();
while ($r = Dba::fetch_assoc($db_results)) {
- $key = $r['preference'];
+ $key = $r['preference'];
$zero_results[$key] = $r['value'];
}
} // if not user -1
@@ -1115,7 +1124,6 @@ class User extends database_object
$db_results = Dba::read($sql);
while ($r = Dba::fetch_assoc($db_results)) {
-
$key = $r['id'];
/* Check if this preference is set */
@@ -1124,11 +1132,10 @@ class User extends database_object
$r['value'] = $zero_results[$key];
}
$value = Dba::escape($r['value']);
- $sql = "INSERT INTO user_preference (`user`,`preference`,`value`) VALUES ('$user_id','$key','$value')";
+ $sql = "INSERT INTO user_preference (`user`,`preference`,`value`) VALUES ('$user_id','$key','$value')";
Dba::write($sql);
}
} // while preferences
-
} // fix_preferences
/**
@@ -1143,7 +1150,7 @@ class User extends database_object
admin
*/
if ($this->has_access(100)) {
- $sql = "SELECT `id` FROM `user` WHERE `access`='100' AND id != ?";
+ $sql = "SELECT `id` FROM `user` WHERE `access`='100' AND id != ?";
$db_results = Dba::read($sql, array($this->id));
if (!Dba::num_rows($db_results)) {
return false;
@@ -1212,7 +1219,6 @@ class User extends database_object
Dba::write($sql, array($this->username));
return true;
-
} // delete
/**
@@ -1224,7 +1230,6 @@ class User extends database_object
public function is_online( $delay = 1200 )
{
return time() - $this->last_seen <= $delay;
-
} // is_online
/**
@@ -1233,13 +1238,12 @@ class User extends database_object
*/
public static function get_validation($username)
{
- $sql = "SELECT `validation` FROM `user` WHERE `username` = ?";
+ $sql = "SELECT `validation` FROM `user` WHERE `username` = ?";
$db_results = Dba::read($sql, array($username));
$row = Dba::fetch_assoc($db_results);
return $row['validation'];
-
} // get_validation
/**
@@ -1249,7 +1253,9 @@ class User extends database_object
*/
public function get_recently_played($limit,$type='')
{
- if (!$type) { $type = 'song'; }
+ if (!$type) {
+ $type = 'song';
+ }
$sql = "SELECT * FROM `object_count` WHERE `object_type` = ? AND `user` = ? " .
"ORDER BY `date` DESC LIMIT " . $limit;
@@ -1261,7 +1267,6 @@ class User extends database_object
}
return $results;
-
} // get_recently_played
/**
@@ -1275,11 +1280,15 @@ class User extends database_object
$count = $count ? intval($count) : intval(AmpConfig::get('user_ip_cardinality'));
// Make sure it's something
- if ($count < 1) { $count = '1'; }
+ if ($count < 1) {
+ $count = '1';
+ }
$limit_sql = "LIMIT " . intval($count);
$group_sql = "";
- if ($distinct) { $group_sql = "GROUP BY `ip`"; }
+ if ($distinct) {
+ $group_sql = "GROUP BY `ip`";
+ }
/* Select ip history */
$sql = "SELECT `ip`,`date` FROM `ip_history`" .
@@ -1294,9 +1303,17 @@ class User extends database_object
}
return $results;
-
} // get_ip_history
+ /**
+ * Get item fullname.
+ * @return string
+ */
+ public function get_fullname()
+ {
+ return $this->f_name;
+ }
+
/**
* get_avatar
* Get the user avatar
@@ -1306,10 +1323,10 @@ class User extends database_object
$avatar = array();
$avatar['title'] = T_('User avatar');
- $upavatar = new Art($this->id, 'user');
+ $upavatar = new Art($this->id, 'user');
if ($upavatar->get_db()) {
- $avatar['url'] = ($local ? AmpConfig::get('local_web_path') : AmpConfig::get('web_path')) . '/image.php?object_type=user&object_id=' . $this->id;
- $avatar['url_mini'] = $avatar['url'];
+ $avatar['url'] = ($local ? AmpConfig::get('local_web_path') : AmpConfig::get('web_path')) . '/image.php?object_type=user&object_id=' . $this->id;
+ $avatar['url_mini'] = $avatar['url'];
$avatar['url_medium'] = $avatar['url'];
$avatar['url'] .= '&thumb=4';
$avatar['url_mini'] .= '&thumb=5';
@@ -1320,7 +1337,7 @@ class User extends database_object
if ($plugin->load($GLOBALS['user'])) {
$avatar['url'] = $plugin->_plugin->get_avatar_url($this);
if (!empty($avatar['url'])) {
- $avatar['url_mini'] = $plugin->_plugin->get_avatar_url($this, 32);
+ $avatar['url_mini'] = $plugin->_plugin->get_avatar_url($this, 32);
$avatar['url_medium'] = $plugin->_plugin->get_avatar_url($this, 64);
$avatar['title'] .= ' (' . $plugin->_plugin->name . ')';
break;
@@ -1336,10 +1353,10 @@ class User extends database_object
{
$upload = array();
if (!empty($_FILES['avatar']['tmp_name']) && $_FILES['avatar']['size'] <= AmpConfig::get('max_upload_size')) {
- $path_info = pathinfo($_FILES['avatar']['name']);
+ $path_info = pathinfo($_FILES['avatar']['name']);
$upload['file'] = $_FILES['avatar']['tmp_name'];
$upload['mime'] = 'image/' . $path_info['extension'];
- $image_data = Art::get_from_source($upload, 'user');
+ $image_data = Art::get_from_source($upload, 'user');
if ($image_data) {
$art = new Art($this->id, 'user');
@@ -1364,7 +1381,6 @@ class User extends database_object
$sql = "UPDATE `user` SET `disabled`='0' WHERE `username` = ?";
Dba::write($sql, array($username));
-
} // activate_user
/**
@@ -1373,7 +1389,7 @@ class User extends database_object
*/
public function get_artists()
{
- $sql = "SELECT `id` FROM `artist` WHERE `user` = ?";
+ $sql = "SELECT `id` FROM `artist` WHERE `user` = ?";
$db_results = Dba::read($sql, array($this->id));
$results = array();
@@ -1399,7 +1415,6 @@ class User extends database_object
//FIXME: combined with the song title to make sure that the REFERER
//FIXME: is in the access list with full rights
return true;
-
} // is_xmlrpc
/**
@@ -1409,9 +1424,9 @@ class User extends database_object
*/
public function get_followers()
{
- $sql = "SELECT `user` FROM `user_follower` WHERE `follow_user` = ?";
+ $sql = "SELECT `user` FROM `user_follower` WHERE `follow_user` = ?";
$db_results = Dba::read($sql, array($this->id));
- $results = array();
+ $results = array();
while ($row = Dba::fetch_assoc($db_results)) {
$results[] = $row['user'];
}
@@ -1425,9 +1440,9 @@ class User extends database_object
*/
public function get_following()
{
- $sql = "SELECT `follow_user` FROM `user_follower` WHERE `user` = ?";
+ $sql = "SELECT `follow_user` FROM `user_follower` WHERE `user` = ?";
$db_results = Dba::read($sql, array($this->id));
- $results = array();
+ $results = array();
while ($row = Dba::fetch_assoc($db_results)) {
$results[] = $row['follow_user'];
}
@@ -1442,7 +1457,7 @@ class User extends database_object
*/
public function is_followed_by($user_id)
{
- $sql = "SELECT `id` FROM `user_follower` WHERE `user` = ? AND `follow_user` = ?";
+ $sql = "SELECT `id` FROM `user_follower` WHERE `user` = ? AND `follow_user` = ?";
$db_results = Dba::read($sql, array($user_id, $this->id));
return (Dba::num_rows($db_results) > 0);
}
@@ -1455,7 +1470,7 @@ class User extends database_object
*/
public function is_following($user_id)
{
- $sql = "SELECT `id` FROM `user_follower` WHERE `user` = ? AND `follow_user` = ?";
+ $sql = "SELECT `id` FROM `user_follower` WHERE `user` = ? AND `follow_user` = ?";
$db_results = Dba::read($sql, array($this->id, $user_id));
return (Dba::num_rows($db_results) > 0);
}
@@ -1467,15 +1482,18 @@ class User extends database_object
*/
public function toggle_follow($user_id)
{
- if (!$user_id || $user_id === $this->id)
+ if (!$user_id || $user_id === $this->id) {
return false;
+ }
$params = array($this->id, $user_id);
if ($this->is_following($user_id)) {
$sql = "DELETE FROM `user_follower` WHERE `user` = ? AND `follow_user` = ?";
} else {
- $sql = "INSERT INTO `user_follower` (`user`, `follow_user`, `follow_date`) VALUES (?, ?, ?)";
+ $sql = "INSERT INTO `user_follower` (`user`, `follow_user`, `follow_date`) VALUES (?, ?, ?)";
$params[] = time();
+
+ Useractivity::post_activity($this->id, 'follow', 'user', $user_id);
}
return Dba::write($sql, $params);
@@ -1484,7 +1502,7 @@ class User extends database_object
/**
* get_display_follow
* Get html code to display the follow/unfollow link
- * @param $display_user_id int|null
+ * @param int|null $display_user_id
* @return string
*/
public function get_display_follow($user_id = null)
@@ -1493,8 +1511,9 @@ class User extends database_object
$user_id = $GLOBALS['user']->id;
}
- if ($user_id === $this->id)
+ if ($user_id === $this->id) {
return "";
+ }
$followed = $this->is_followed_by($user_id);
@@ -1513,7 +1532,7 @@ class User extends database_object
{
$username = Dba::escape($username);
- $sql = "SELECT `id` FROM `user` WHERE `username`='$username'";
+ $sql = "SELECT `id` FROM `user` WHERE `username`='$username'";
$db_results = Dba::read($sql);
if (Dba::num_rows($db_results)) {
@@ -1521,7 +1540,6 @@ class User extends database_object
}
return true;
-
} // check_username
/**
@@ -1547,7 +1565,6 @@ class User extends database_object
}
return true;
-
} // rebuild_all_preferences
/**
@@ -1574,5 +1591,5 @@ class User extends database_object
return true;
}
-
} //end user class
+
diff --git a/sources/lib/class/useractivity.class.php b/sources/lib/class/useractivity.class.php
new file mode 100644
index 0000000..e2809a8
--- /dev/null
+++ b/sources/lib/class/useractivity.class.php
@@ -0,0 +1,238 @@
+.
+ *
+ */
+
+/**
+ * Userflag class
+ *
+ * This user flag/unflag songs, albums, artists, videos, tvshows, movies ... as favorite.
+ *
+ */
+class Useractivity extends database_object
+{
+ /* Variables from DB */
+ public $id;
+ public $user;
+ public $object_type;
+ public $object_id;
+ public $action;
+ public $activity_date;
+
+ /**
+ * Constructor
+ * This is run every time a new object is created, and requires
+ * the id and type of object that we need to pull the flag for
+ */
+ public function __construct($id)
+ {
+ if (!$id) {
+ return false;
+ }
+
+ /* Get the information from the db */
+ $info = $this->get_info($id, 'user_activity');
+
+ foreach ($info as $key=>$value) {
+ $this->$key = $value;
+ } // foreach info
+
+ return true;
+ } // Constructor
+
+ /**
+ * this attempts to build a cache of the data from the passed activities all in one query
+ * @param int[] $ids
+ * @return boolean
+ */
+ public static function build_cache($ids)
+ {
+ if (!is_array($ids) or !count($ids)) {
+ return false;
+ }
+
+ $idlist = '(' . implode(',', $ids) . ')';
+
+ $sql = "SELECT * FROM `user_activity` WHERE `id` IN $idlist";
+ $db_results = Dba::read($sql);
+
+ while ($row = Dba::fetch_assoc($db_results)) {
+ parent::add_to_cache('user_activity',$row['id'],$row);
+ }
+ }
+ /**
+ * gc
+ *
+ * Remove activities for items that no longer exist.
+ */
+ public static function gc($object_type = null, $object_id = null)
+ {
+ $types = array('song', 'album', 'artist', 'video', 'tvshow', 'tvshow_season');
+
+ if ($object_type != null) {
+ if (in_array($object_type, $types)) {
+ $sql = "DELETE FROM `user_activity` WHERE `object_type` = ? AND `object_id` = ?";
+ Dba::write($sql, array($object_type, $object_id));
+ } else {
+ debug_event('userflag', 'Garbage collect on type `' . $object_type . '` is not supported.', 1);
+ }
+ } else {
+ foreach ($types as $type) {
+ Dba::write("DELETE FROM `user_activity` USING `user_activity` LEFT JOIN `$type` ON `$type`.`id` = `user_activity`.`object_id` WHERE `object_type` = '$type' AND `$type`.`id` IS NULL");
+ }
+ }
+ }
+
+ /**
+ * post_activity
+ * @param int $user_id
+ * @param string $activity
+ * @param string $object_type
+ * @param int $object_id
+ */
+ public static function post_activity($user_id, $action, $object_type, $object_id)
+ {
+ // Only save the activity if sociable
+ if (!AmpConfig::get('sociable')) {
+ return false;
+ }
+
+ $sql = "INSERT INTO `user_activity` (`user`, `action`, `object_type`, `object_id`, `activity_date`) VALUES (?, ?, ?, ?, ?)";
+ return Dba::write($sql, array($user_id, $action, $object_type, $object_id, time()));
+ }
+
+ /**
+ * get_activities
+ * @param int $user_id
+ * @param int $limit
+ * @param int $since
+ * @return int[]
+ */
+ public static function get_activities($user_id, $limit = 0, $since = 0)
+ {
+ if ($limit <= 0) {
+ $limit = AmpConfig::get('popular_threshold');
+ }
+
+ $params = array($user_id);
+ $sql = "SELECT `id` FROM `user_activity` WHERE `user` = ?";
+ if ($since > 0) {
+ $sql .= " AND `activity_date` <= ?";
+ $params[] = $since;
+ }
+ $sql .= " ORDER BY `activity_date` DESC LIMIT " . $limit;
+ $db_results = Dba::read($sql, $params);
+ $results = array();
+ while ($row = Dba::fetch_assoc($db_results)) {
+ $results[] = $row['id'];
+ }
+ return $results;
+ }
+
+ /**
+ * get_friends_activities
+ * @param int $user_id
+ * @param int $limit
+ * @param int $since
+ * @return int[]
+ */
+ public static function get_friends_activities($user_id, $limit = 0, $since = 0)
+ {
+ if ($limit <= 0) {
+ $limit = AmpConfig::get('popular_threshold');
+ }
+
+ $params = array($user_id);
+ $sql = "SELECT `user_activity`.`id` FROM `user_activity`" .
+ " INNER JOIN `user_follower` ON `user_follower`.`follow_user` = `user_activity`.`user`"
+ . " WHERE `user_follower`.`user` = ?";
+ if ($since > 0) {
+ $sql .= " AND `user_activity`.`activity_date` <= ?";
+ $params[] = $since;
+ }
+ $sql .= " ORDER BY `user_activity`.`activity_date` DESC LIMIT " . $limit;
+ $db_results = Dba::read($sql, $params);
+ $results = array();
+ while ($row = Dba::fetch_assoc($db_results)) {
+ $results[] = $row['id'];
+ }
+ return $results;
+ }
+
+ /**
+ * show
+ * Show the activity entry.
+ */
+ public function show()
+ {
+ // If user flags aren't enabled don't do anything
+ if (!AmpConfig::get('userflags') || !$this->id) {
+ return false;
+ }
+
+ $user = new User($this->user);
+ $user->format();
+ $libitem = new $this->object_type($this->object_id);
+ $libitem->format();
+
+ echo '
'; + } // show +} //end useractivity class + diff --git a/sources/lib/class/userflag.class.php b/sources/lib/class/userflag.class.php index bb1535f..a276e3d 100644 --- a/sources/lib/class/userflag.class.php +++ b/sources/lib/class/userflag.class.php @@ -2,21 +2,21 @@ /* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * - * LICENSE: GNU General Public License, version 2 (GPLv2) + * LICENSE: GNU Affero General Public License, version 3 (AGPLv3) * Copyright 2001 - 2015 Ampache.org * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License v2 - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see
"); @@ -390,34 +394,54 @@ class vainfo $info['replaygain_album_gain'] = $info['replaygain_album_gain'] ?: floatval($tags['replaygain_album_gain']); $info['replaygain_album_peak'] = $info['replaygain_album_peak'] ?: floatval($tags['replaygain_album_peak']); - $info['track'] = $info['track'] ?: intval($tags['track']); - $info['resolution_x'] = $info['resolution_x'] ?: intval($tags['resolution_x']); - $info['resolution_y'] = $info['resolution_y'] ?: intval($tags['resolution_y']); - $info['display_x'] = $info['display_x'] ?: intval($tags['display_x']); - $info['display_y'] = $info['display_y'] ?: intval($tags['display_y']); - $info['frame_rate'] = $info['frame_rate'] ?: floatval($tags['frame_rate']); + $info['track'] = $info['track'] ?: intval($tags['track']); + $info['resolution_x'] = $info['resolution_x'] ?: intval($tags['resolution_x']); + $info['resolution_y'] = $info['resolution_y'] ?: intval($tags['resolution_y']); + $info['display_x'] = $info['display_x'] ?: intval($tags['display_x']); + $info['display_y'] = $info['display_y'] ?: intval($tags['display_y']); + $info['frame_rate'] = $info['frame_rate'] ?: floatval($tags['frame_rate']); $info['video_bitrate'] = $info['video_bitrate'] ?: intval($tags['video_bitrate']); - $info['audio_codec'] = $info['audio_codec'] ?: trim($tags['audio_codec']); - $info['video_codec'] = $info['video_codec'] ?: trim($tags['video_codec']); - $info['description'] = $info['description'] ?: trim($tags['description']); + $info['audio_codec'] = $info['audio_codec'] ?: trim($tags['audio_codec']); + $info['video_codec'] = $info['video_codec'] ?: trim($tags['video_codec']); + $info['description'] = $info['description'] ?: trim($tags['description']); - $info['tvshow'] = $info['tvshow'] ?: trim($tags['tvshow']); - $info['tvshow_year'] = $info['tvshow_year'] ?: trim($tags['tvshow_year']); - $info['tvshow_season'] = $info['tvshow_season'] ?: trim($tags['tvshow_season']); + $info['tvshow'] = $info['tvshow'] ?: trim($tags['tvshow']); + $info['tvshow_year'] = $info['tvshow_year'] ?: trim($tags['tvshow_year']); + $info['tvshow_season'] = $info['tvshow_season'] ?: trim($tags['tvshow_season']); $info['tvshow_episode'] = $info['tvshow_episode'] ?: trim($tags['tvshow_episode']); - $info['release_date'] = $info['release_date'] ?: trim($tags['release_date']); - - $info['tvshow_art'] = $info['tvshow_art'] ?: trim($tags['tvshow_art']); + $info['release_date'] = $info['release_date'] ?: trim($tags['release_date']); + $info['summary'] = $info['summary'] ?: trim($tags['summary']); + $info['tvshow_summary'] = $info['tvshow_summary'] ?: trim($tags['tvshow_summary']); + + $info['tvshow_art'] = $info['tvshow_art'] ?: trim($tags['tvshow_art']); $info['tvshow_season_art'] = $info['tvshow_season_art'] ?: trim($tags['tvshow_season_art']); - $info['art'] = $info['art'] ?: trim($tags['art']); + $info['art'] = $info['art'] ?: trim($tags['art']); + + if (AmpConfig::get('enable_custom_metadata') && is_array($tags)) { + // Add rest of the tags without typecast to the array + foreach ($tags as $tag => $value) { + if (!isset($info[$tag]) && !is_array($value)) { + $info[$tag] = (!is_array($value)) ? trim($value) : $value; + } + } + } } - + // Some things set the disk number even though there aren't multiple if ($info['totaldisks'] == 1 && $info['disk'] == 1) { unset($info['disk']); unset($info['totaldisks']); } + // Determine the correct file size, do not get fooled by the size which may be returned by id3v2! + if (isset($results['general']['size'])) { + $size = $results['general']['size']; + } else { + $size = Core::get_filesize(Core::conv_lc_file($filename)); + } + + $info['size'] = $info['size'] ?: $size; + return $info; } @@ -536,7 +560,7 @@ class vainfo $results['general'] = $this->_parse_general($this->_raw); - $cleaned = self::clean_tag_info($results, self::get_tag_type($results, 'getid3_tag_order'), $this->filename); + $cleaned = self::clean_tag_info($results, self::get_tag_type($results, 'getid3_tag_order'), $this->filename); $cleaned['raw'] = $results; return $cleaned; @@ -571,7 +595,7 @@ class vainfo $plugin_names = Plugin::get_plugins('get_metadata'); foreach ($tag_order as $tag_source) { if (in_array($tag_source, $plugin_names)) { - $plugin = new Plugin($tag_source); + $plugin = new Plugin($tag_source); $installed_version = Plugin::get_plugin_version($plugin->_plugin->name); if ($installed_version) { if ($plugin->load($GLOBALS['user'])) { @@ -591,26 +615,31 @@ class vainfo private function _parse_general($tags) { $parsed = array(); + + if ((in_array('movie', $this->gather_types)) || (in_array('tvshow', $this->gather_types))) { + $parsed['title'] = $this->formatVideoName(urldecode($this->_pathinfo['filename'])); + } else { + $parsed['title'] = urldecode($this->_pathinfo['filename']); + } - $parsed['title'] = urldecode($this->_pathinfo['filename']); - $parsed['mode'] = $tags['audio']['bitrate_mode']; + $parsed['mode'] = $tags['audio']['bitrate_mode']; if ($parsed['mode'] == 'con') { $parsed['mode'] = 'cbr'; } - $parsed['bitrate'] = $tags['audio']['bitrate']; - $parsed['channels'] = intval($tags['audio']['channels']); - $parsed['rate'] = intval($tags['audio']['sample_rate']); - $parsed['size'] = $this->_forcedSize ?: $tags['filesize']; - $parsed['encoding'] = $tags['encoding']; - $parsed['mime'] = $tags['mime_type']; - $parsed['time'] = ($this->_forcedSize ? ((($this->_forcedSize - $tags['avdataoffset']) * 8) / $tags['bitrate']) : $tags['playtime_seconds']); - $parsed['audio_codec'] = $tags['audio']['dataformat']; - $parsed['video_codec'] = $tags['video']['dataformat']; - $parsed['resolution_x'] = $tags['video']['resolution_x']; - $parsed['resolution_y'] = $tags['video']['resolution_y']; - $parsed['display_x'] = $tags['video']['display_x']; - $parsed['display_y'] = $tags['video']['display_y']; - $parsed['frame_rate'] = $tags['video']['frame_rate']; + $parsed['bitrate'] = $tags['audio']['bitrate']; + $parsed['channels'] = intval($tags['audio']['channels']); + $parsed['rate'] = intval($tags['audio']['sample_rate']); + $parsed['size'] = $this->_forcedSize ?: $tags['filesize']; + $parsed['encoding'] = $tags['encoding']; + $parsed['mime'] = $tags['mime_type']; + $parsed['time'] = ($this->_forcedSize ? ((($this->_forcedSize - $tags['avdataoffset']) * 8) / $tags['bitrate']) : $tags['playtime_seconds']); + $parsed['audio_codec'] = $tags['audio']['dataformat']; + $parsed['video_codec'] = $tags['video']['dataformat']; + $parsed['resolution_x'] = $tags['video']['resolution_x']; + $parsed['resolution_y'] = $tags['video']['resolution_y']; + $parsed['display_x'] = $tags['video']['display_x']; + $parsed['display_y'] = $tags['video']['display_y']; + $parsed['frame_rate'] = $tags['video']['frame_rate']; $parsed['video_bitrate'] = $tags['video']['bitrate']; if (isset($tags['ape'])) { @@ -745,8 +774,8 @@ class vainfo $parsed['track'] = $data[0]; break; case 'discnumber': - $elements = explode('/', $data[0]); - $parsed['disk'] = $elements[0]; + $elements = explode('/', $data[0]); + $parsed['disk'] = $elements[0]; $parsed['totaldisks'] = $elements[1]; break; case 'date': @@ -817,13 +846,17 @@ class vainfo $parsed['genre'] = $this->parseGenres($data); break; case 'part_of_a_set': - $elements = explode('/', $data[0]); - $parsed['disk'] = $elements[0]; + $elements = explode('/', $data[0]); + $parsed['disk'] = $elements[0]; $parsed['totaldisks'] = $elements[1]; break; case 'track_number': $parsed['track'] = $data[0]; break; + case 'comment': + // First array key can be xFF\xFE in case of UTF-8, better to get it this way + $parsed['comment'] = reset($data); + break; case 'comments': $parsed['comment'] = $data[0]; break; @@ -897,8 +930,13 @@ class vainfo $parsed['rating'][$user->id] = $popm['rating'] / 255 * 5; } } + // Rating made by an unknow user, adding it to super user (id=-1) + else { + $parsed['rating'][-1] = $popm['rating'] / 255 * 5; + } } } + return $parsed; } @@ -956,7 +994,7 @@ class vainfo $parsed['mb_artistid'] = $data[0]; break; case 'MusicBrainz Album Type': - $parsed['release_type'] = $data[0]; + $parsed['release_type'] = $data[0]; break; case 'track_number': $parsed['track'] = $data[0]; @@ -984,55 +1022,140 @@ class vainfo return $parsed; } - /** - * _parse_filename - * * This function uses the file and directory patterns to pull out extra tag * information. + * parses TV show name variations: + * 1. title.[date].S#[#]E#[#].ext (Upper/lower case) + * 2. title.[date].#[#]X#[#].ext (both upper/lower case letters + * 3. title.[date].Season #[#] Episode #[#].ext + * 4. title.[date].###.ext (maximum of 9 seasons) + * parse directory path for name, season and episode numbers + * /TV shows/show name [(year)]/[season ]##/##.Episode.Title.ext + * parse movie names: + * title.[date].ext + * /movie title [(date)]/title.ext */ - private function _parse_filename($filename) + private function _parse_filename($filepath) { - $origin = $filename; + $origin = $filepath; $results = array(); - - if (in_array('music', $this->gather_types) || in_array('clip', $this->gather_types)) { - // Correctly detect the slash we need to use here - if (strpos($filename, '/') !== false) { - $slash_type = '/'; - $slash_type_preg = $slash_type; + if (strpos($filepath, '/') !== false) { + $slash_type = '/'; + $slash_type_preg = $slash_type; + } else { + $slash_type = "\\"; + $slash_type_preg = $slash_type . $slash_type; + } + $file = pathinfo($filepath,PATHINFO_FILENAME); + + if (in_array('tvshow', $this->gather_types)) { + $season = array(); + $episode = array(); + $tvyear = array(); + $temp = array(); + preg_match("~(?<=\(\[\<\{)[1|2][0-9]{3}|[1|2][0-9]{3}~", $filepath,$tvyear); + $results['year'] = !empty($tvyear) ? intval($tvyear[0]) : null; + + if (preg_match("~[Ss](\d+)[Ee](\d+)~", $file, $seasonEpisode)) { + $temp = preg_split("~(((\.|_|\s)[Ss]\d+(\.|_)*[Ee]\d+))~",$file,2); + preg_match("~(?<=[Ss])\d+~", $file, $season); + preg_match("~(?<=[Ee])\d+~", $file, $episode); } else { - $slash_type = '\\'; - $slash_type_preg = $slash_type . $slash_type; + if (preg_match("~[\_\-\.\s](\d{1,2})[xX](\d{1,2})~", $file, $seasonEpisode)) { + $temp = preg_split("~[\.\_\s\-\_]\d+[xX]\d{2}[\.\s\-\_]*|$~",$file); + preg_match("~\d+(?=[Xx])~", $file, $season); + preg_match("~(?<=[Xx])\d+~", $file, $episode); + } else { + if (preg_match("~[S|s]eason[\_\-\.\s](\d+)[\.\-\s\_]?\s?[e|E]pisode[\s\-\.\_]?(\d+)[\.\s\-\_]?~", $file, $seasonEpisode)) { + $temp = preg_split("~[\.\s\-\_][S|s]eason[\s\-\.\_](\d+)[\.\s\-\_]?\s?[e|E]pisode[\s\-\.\_](\d+)([\s\-\.\_])*~",$file,3); + preg_match("~(?<=[Ss]eason[\.\s\-\_])\d+~", $file, $season); + preg_match("~(?<=[Ee]pisode[\.\s\-\_])\d+~", $file, $episode); + } else { + if (preg_match("~[\_\-\.\s](\d)(\d\d)[\_\-\.\s]*~", $file, $seasonEpisode)) { + $temp = preg_split("~[\.\s\-\_](\d)(\d\d)[\.\s\-\_]~",$file); + $season[0] = $seasonEpisode[1]; + if (preg_match("~[\_\-\.\s](\d)(\d\d)[\_\-\.\s]~", $file, $seasonEpisode)) { + $temp = preg_split("~[\.\s\-\_](\d)(\d\d)[\.\s\-\_]~",$file); + $season[0] = $seasonEpisode[1]; + $episode[0] = $seasonEpisode[2]; + } + } + } + } + } + + $results['tvshow_season'] = $season[0]; + $results['tvshow_episode'] = $episode[0]; + $results['tvshow'] = $this->formatVideoName($temp[0]); + $results['original_name'] = $this->formatVideoName($temp[1]); + + // Try to identify the show information from parent folder + if (!$results['tvshow']) { + $folders = preg_split("~" . $slash_type . "~", $filepath, -1, PREG_SPLIT_NO_EMPTY); + if ($results['tvshow_season'] && $results['tvshow_episode']) { + // We have season and episode, we assume parent folder is the tvshow name + $filetitle = end($folders); + $results['tvshow'] = $this->formatVideoName($filetitle); + } else { + // Or we assume each parent folder contains one missing information + if (preg_match('/[\/\\\\]([^\/\\\\]*)[\/\\\\]Season (\d{1,2})[\/\\\\]((E|Ep|Episode)\s?(\d{1,2})[\/\\\\])?/i', $filepath, $matches)) { + if ($matches != null) { + $results['tvshow'] = $this->formatVideoName($matches[1]); + $results['tvshow_season'] = $matches[2]; + if (isset($matches[5])) { + $results['tvshow_episode'] = $matches[5]; + } else { + //match pattern like 10.episode name.mp4 + if (preg_match("~^(\d\d)[\_\-\.\s]?(.*)~", $file, $matches)) { + $results['tvshow_episode'] = $matches[1]; + $results['original_name'] = $this->formatVideoName($matches[2]); + } else { + //Fallback to match any 3-digit Season/Episode that fails the standard pattern above. + preg_match("~(\d)(\d\d)[\_\-\.\s]?~", $file, $matches); + $results['tvshow_episode'] = $matches[2]; + } + } + } + } + } } + $results['title'] = $results['tvshow']; + } + + if (in_array('movie', $this->gather_types)) { + $results['original_name'] = $results['title'] = $this->formatVideoName($file); + } + + if (in_array('music', $this->gather_types) || in_array('clip', $this->gather_types)) { // Combine the patterns $pattern = preg_quote($this->_dir_pattern) . $slash_type_preg . preg_quote($this->_file_pattern); - + // Remove first left directories from filename to match pattern $cntslash = substr_count($pattern, preg_quote($slash_type)) + 1; - $filepart = explode($slash_type, $filename); + $filepart = explode($slash_type, $filepath); if (count($filepart) > $cntslash) { - $filename = implode($slash_type, array_slice($filepart, count($filepart) - $cntslash)); + $filepath = implode($slash_type, array_slice($filepart, count($filepart) - $cntslash)); } - + // Pull out the pattern codes into an array preg_match_all('/\%\w/', $pattern, $elements); - + // Mangle the pattern by turning the codes into regex captures $pattern = preg_replace('/\%[Ty]/', '([0-9]+?)', $pattern); $pattern = preg_replace('/\%\w/', '(.+?)', $pattern); $pattern = str_replace('/', '\/', $pattern); $pattern = str_replace(' ', '\s', $pattern); $pattern = '/' . $pattern . '\..+$/'; - + // Pull out our actual matches - preg_match($pattern, $filename, $matches); + preg_match($pattern, $filepath, $matches); if ($matches != null) { // The first element is the full match text $matched = array_shift($matches); - debug_event('vainfo', $pattern . ' matched ' . $matched . ' on ' . $filename, 5); - + debug_event('vainfo', $pattern . ' matched ' . $matched . ' on ' . $filepath, 5); + // Iterate over what we found foreach ($matches as $key => $value) { $new_key = translate_pattern_code($elements['0'][$key]); @@ -1041,162 +1164,34 @@ class vainfo } } - $results['title'] = $results['title'] ?: basename($filename); + $results['title'] = $results['title'] ?: basename($filepath); if ($this->islocal) { $results['size'] = Core::get_filesize(Core::conv_lc_file($origin)); } } } - - if (in_array('tvshow', $this->gather_types)) { - $pathinfo = pathinfo($filename); - $filetitle = $pathinfo['filename']; - - $results = array_merge($results, $this->parseEpisodeName($filetitle)); - if (!$results['tvshow']) { - // Try to identify the show information from parent folder - $filetitle = basename($pathinfo['dirname']); - $results = array_merge($results, $this->parseEpisodeName($filetitle)); - - if (!$results['tvshow']) { - if ($results['tvshow_season'] && $results['tvshow_episode']) { - // We have season and episode, we assume parent folder is the tvshow name - $pathinfo = pathinfo($pathinfo['dirname']); - $filetitle = basename($pathinfo['dirname']); - $results['tvshow'] = $this->fixSerieName($filetitle); - } else { - // Or we assume each parent folder contains one missing information - if (preg_match('/[\/\\\\]([^\/\\\\]*)[\/\\\\]Season (\d{1,2})[\/\\\\]((E|Ep|Episode)\s?(\d{1,2})[\/\\\\])?/i', $filename, $matches)) { - if ($matches != null) { - $results['tvshow'] = $this->fixSerieName($matches[1]); - $results['tvshow_season'] = $matches[2]; - if (isset($matches[5])) { - $results['tvshow_episode'] = $matches[5]; - } - } - } - } - } - } - } - - if (in_array('movie', $this->gather_types)) { - $pathinfo = pathinfo($filename); - $filetitle = $pathinfo['filename']; - $results['title'] = $this->fixVideoReleaseName($filetitle); - if (!$results['title']) { - // Try to identify the movie information from parent folder - $filetitle = basename($pathinfo['dirname']); - $results['title'] = $this->fixVideoReleaseName($filetitle); - } - } - return $results; } - - private function parseEpisodeName($filetitle) + + private function removeCommonAbbreviations($name) { - $patterns = array( - '/(.*)s(\d\d)e(\d\d)(\D.*)/i', - '/(.*)s(\d\d)(\D)(.*)/i', - '/(.*)\D(\d{1,2})x(\d\d)(\D)(.*)/i', - '/(.*)\D(\d{1,2})x(\d\d)$/i', - '/(\D*)[\.|\-|_](\d)(\d\d)([\.|\-|_]\D.*)/i', - '/(\D*)(\d)[^0-9](\d\d)(\D.*)/i' - ); + $abbr = explode(",",AmpConfig::get('common_abbr')); + $commonabbr = preg_replace("~\n~", '',$abbr); + $commonabbr[] = '[1|2][0-9]{3}'; //Remove release year - $results = array(); - for ($i=0;$ifixSerieName($matches[1]);
- if (empty($name)) {
- continue;
- }
-
- $season = floatval($matches[2]);
- if ($season == 0) {
- continue;
- }
-
- $episode = floatval($matches[3]);
- $leftover = $matches[4];
-
- if ($episode == 0) {
- // Some malformed string
- $leftover = $filetitle;
- }
-
- $results['tvshow'] = $name;
- $results['tvshow_season'] = $season;
- $results['tvshow_episode'] = $episode;
- $results['title'] = $this->fixVideoReleaseName($leftover);
- break;
- }
- }
-
- return $results;
+ //scan for brackets, braces, etc and ignore case.
+ for ($i=0; $i< count($commonabbr);$i++) {
+ $commonabbr[$i] = "~\[*|\(*|\<*|\{*\b(?i)" . trim($commonabbr[$i]) . "\b\]*|\)*|\>*|\}*~";
+ }
+ $string = preg_replace($commonabbr,'',$name);
+ return $string;
+ }
+
+ private function formatVideoName($name)
+ {
+ return ucwords(trim($this->removeCommonAbbreviations(str_replace(['.','_','-'], ' ', $name), "\s\t\n\r\0\x0B\.\_\-")));
}
- private function fixSerieName($name)
- {
- $name = str_replace('_', ' ', $name);
- $name = str_replace('.', ' ', $name);
- $name = str_replace(' ', ' ', $name);
- $name = $this->removeStartingDashesAndSpaces($name);
- $name = $this->removeEndingDashesAndSpaces($name);
-
- return ucwords($name);
- }
-
- private function fixVideoReleaseName($name)
- {
- $commonabbr = array(
- 'divx', 'xvid', 'dvdrip', 'hdtv', 'lol', 'axxo', 'repack', 'xor',
- 'pdtv', 'real', 'vtv', 'caph', '2hd', 'proper', 'fqm', 'uncut',
- 'topaz', 'tvt', 'notv', 'fpn', 'fov', 'orenji', '0tv', 'omicron',
- 'dsr', 'ws', 'sys', 'crimson', 'wat', 'hiqt', 'internal', 'brrip',
- 'boheme', 'vost', 'vostfr', 'fastsub', 'addiction'
- );
- for ($i=0; $ifixSerieName($name);
- }
-
- private function removeStartingDashesAndSpaces($name)
- {
- if (empty($name)) {
- return $name;
- }
-
- while (strpos($name, ' ') === 0 || strpos($name, '-') === 0) {
- $name = preg_replace('/^ /', '', $name);
- $name = preg_replace('/^-/', '', $name);
- }
-
- return $name;
- }
-
- private function removeEndingDashesAndSpaces($name)
- {
- if (empty($name)) {
- return $name;
- }
-
- while (strrpos($name, ' ') === strlen($name) - 1 || strrpos($name, '-') === strlen($name) - 1) {
- $name = preg_replace('/ $/', '', $name);
- $name = preg_replace('/-$/', '', $name);
- }
-
- return $name;
- }
/**
* set_broken
@@ -1216,10 +1211,10 @@ class vainfo
$key = array_shift($order);
- $broken = array();
- $broken[$key] = array();
- $broken[$key]['title'] = '**BROKEN** ' . $this->filename;
- $broken[$key]['album'] = 'Unknown (Broken)';
+ $broken = array();
+ $broken[$key] = array();
+ $broken[$key]['title'] = '**BROKEN** ' . $this->filename;
+ $broken[$key]['album'] = 'Unknown (Broken)';
$broken[$key]['artist'] = 'Unknown (Broken)';
return $broken;
@@ -1238,7 +1233,7 @@ class vainfo
$delimiters = AmpConfig::get('additional_genre_delimiters');
if (isset($data) && is_array($data) && count($data) === 1 && isset($delimiters)) {
$pattern = '~[\s]?(' . $delimiters . ')[\s]?~';
- $genres = preg_split($pattern, reset($data));
+ $genres = preg_split($pattern, reset($data));
if ($genres === false) {
throw new Exception('Pattern given in additional_genre_delimiters is not functional. Please ensure is it a valid regex (delimiter ~).');
}
@@ -1248,3 +1243,4 @@ class vainfo
return $data;
}
} // end class vainfo
+
diff --git a/sources/lib/class/video.class.php b/sources/lib/class/video.class.php
index e7b1593..38cee76 100644
--- a/sources/lib/class/video.class.php
+++ b/sources/lib/class/video.class.php
@@ -2,21 +2,21 @@
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
- * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
* Copyright 2001 - 2015 Ampache.org
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License v2
- * as published by the Free Software Foundation.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see '])) {
+ if (is_array($value) and isset($value[''])) {
$attribute = ' ' . $value[''];
- $key = $value['value'];
+ $key = $value['value'];
}
// If it's an array, run again
@@ -258,14 +257,14 @@ class XML_Data
*/
public static function tags($tags)
{
- if (count($tags) > self::$limit OR self::$offset > 0) {
+ if (count($tags) > self::$limit or self::$offset > 0) {
$tags = array_splice($tags,self::$offset,self::$limit);
}
$string = '';
foreach ($tags as $tag_id) {
- $tag = new Tag($tag_id);
+ $tag = new Tag($tag_id);
$counts = $tag->count();
$string .= "\n" .
"\tname]]> \n" .
@@ -294,7 +293,7 @@ class XML_Data
*/
public static function artists($artists)
{
- if (count($artists) > self::$limit OR self::$offset > 0) {
+ if (count($artists) > self::$limit or self::$offset > 0) {
$artists = array_splice($artists,self::$offset,self::$limit);
}
@@ -306,7 +305,7 @@ class XML_Data
$artist = new Artist($artist_id);
$artist->format();
- $rating = new Rating($artist_id,'artist');
+ $rating = new Rating($artist_id,'artist');
$tag_string = self::tags_string($artist->tags);
$string .= "id . "\">\n" .
@@ -339,7 +338,7 @@ class XML_Data
*/
public static function albums($albums)
{
- if (count($albums) > self::$limit OR self::$offset > 0) {
+ if (count($albums) > self::$limit or self::$offset > 0) {
$albums = array_splice($albums,self::$offset,self::$limit);
}
@@ -392,7 +391,7 @@ class XML_Data
*/
public static function playlists($playlists)
{
- if (count($playlists) > self::$limit OR self::$offset > 0) {
+ if (count($playlists) > self::$limit or self::$offset > 0) {
$playlists = array_slice($playlists,self::$offset,self::$limit);
}
@@ -402,7 +401,7 @@ class XML_Data
foreach ($playlists as $playlist_id) {
$playlist = new Playlist($playlist_id);
$playlist->format();
- $item_total = $playlist->get_song_count();
+ $item_total = $playlist->get_media_count('song');
// Build this element
$string .= "id\">\n" .
@@ -427,7 +426,7 @@ class XML_Data
*/
public static function songs($songs,$playlist_data='')
{
- if (count($songs) > self::$limit OR self::$offset > 0) {
+ if (count($songs) > self::$limit or self::$offset > 0) {
$songs = array_slice($songs, self::$offset, self::$limit);
}
@@ -439,14 +438,16 @@ class XML_Data
foreach ($songs as $song_id) {
$song = new Song($song_id);
- // If the song id is invalid/null
- if (!$song->id) {
+ // If the song id is invalid/null or disabled
+ if (!$song->id || !$song->enabled) {
continue;
}
+
+ $song->format();
$playlist_track_string = self::playlist_song_tracks_string($song, $playlist_data);
- $tag_string = self::tags_string(Tag::get_top_tags('song', $song_id));
- $rating = new Rating($song_id, 'song');
- $art_url = Art::url($song->album, 'album', $_REQUEST['auth']);
+ $tag_string = self::tags_string(Tag::get_top_tags('song', $song_id));
+ $rating = new Rating($song_id, 'song');
+ $art_url = Art::url($song->album, 'album', $_REQUEST['auth']);
$string .= "id . "\">\n" .
"\t<![CDATA[" . $song->title . "]]> \n" .
@@ -454,27 +455,47 @@ class XML_Data
'">get_artist_name() .
"]]> \n" .
"\talbum .
- '">get_album_name().
- "]]> \n" .
- $tag_string .
+ '">get_album_name() .
+ "]]>\n";
+ if ($song->albumartist) {
+ $string .= "\talbumartist .
+ "\">get_album_artist_name() . "]]> \n";
+ }
+ $string .= $tag_string .
"\tfile . "]]> \n" .
"\t\n" .
$playlist_track_string .
"\t\n" .
"\t" . $song->year . " \n" .
- "\t" . $song->bitrate . " \n".
- "\t" . $song->mode . " \n".
+ "\t" . $song->bitrate . " \n" .
+ "\t" . $song->rate . " \n" .
+ "\t" . $song->mode . " \n" .
"\t" . $song->mime . " \n" .
"\tid, '', 'api') . "]]> \n" .
- "\t" . $song->size . " \n".
- "\t" . $song->mbid . " \n".
- "\t" . $song->album_mbid . " \n".
- "\t" . $song->artist_mbid . " \n".
+ "\t" . $song->size . " \n" .
+ "\t" . $song->mbid . " \n" .
+ "\t" . $song->album_mbid . " \n" .
+ "\t" . $song->artist_mbid . " \n" .
+ "\t" . $song->albumartist_mbid . " \n" .
"\t" . ($rating->get_user_rating() ?: 0) . " \n" .
"\t" . ($rating->get_user_rating() ?: 0) . " \n" .
"\t" . ($rating->get_average_rating() ?: 0) . " \n" .
- "\n";
+ "\t" . $song->composer . " \n" .
+ "\t" . $song->channels . " \n" .
+ "\tcomment . "]]> \n";
+
+ $string .= "\tlabel . "]]> \n"
+ . "\t" . $song->language . " \n"
+ . "\t" . $song->replaygain_album_gain . " \n"
+ . "\t" . $song->replaygain_album_peak . " \n"
+ . "\t" . $song->replaygain_track_gain . " \n"
+ . "\t" . $song->replaygain_track_peak . " \n";
+ foreach ($song->tags as $tag) {
+ $string .= "\t" . $shout->date . " \n" .
"\t\ttext . "]]> \n";
if ($user->id) {
- $string .= "\t\tusername ."]]> ";
+ $string .= "\t\tusername . "]]> ";
}
$string .= "\tn";
}
@@ -653,6 +674,38 @@ class XML_Data
return $final;
} // shouts
+ /**
+ * timeline
+ *
+ * This handles creating an xml document for an activity list
+ *
+ * @param int[] $activities Activity identifier list
+ * @return string return xml
+ */
+ public static function timeline($activities)
+ {
+ $string = "\n";
+ foreach ($activities as $aid) {
+ $activity = new Useractivity($aid);
+ $shout->format();
+ $user = new User($activity->user);
+ $string .= "\t\n" .
+ "\t\t" . $activity->activity_date . " \n" .
+ "\t\tobject_type . "]]> \n" .
+ "\t\t" . $activity->object_id . " \n" .
+ "\t\ttext . "]]> \n";
+ if ($user->id) {
+ $string .= "\t\tusername . "]]> ";
+ }
+ $string .= "\t n";
+ }
+ $string .= " \n";
+
+ $final = self::_header() . $string . self::_footer();
+
+ return $final;
+ } // timeline
+
/**
* rss_feed
*
@@ -692,16 +745,16 @@ class XML_Data
*
* @return string Header xml tag.
*/
- private static function _header()
+ private static function _header($title = null)
{
switch (self::$type) {
case 'xspf':
$header = "\n" .
- "\n " .
- "Ampache XSPF Playlist \n" .
+ "\n" .
+ "" . ($title ?: "Ampache XSPF Playlist") . " \n" .
"" . scrub_out(AmpConfig::get('site_title')) . " \n" .
"" . scrub_out(AmpConfig::get('site_title')) . " \n" .
- "". AmpConfig::get('web_path') ." \n" .
+ "" . AmpConfig::get('web_path') . " \n" .
"\n";
break;
case 'itunes':
@@ -762,29 +815,30 @@ class XML_Data
public static function podcast(library_item $libitem)
{
- $xml = new SimpleXMLElement(' 0, we can ignore lazy comparison problems
if (!file_put_contents($config_file, $final)) {
- Error::add('general', T_('Error writing config file'));
+ AmpError::add('general', T_('Error writing config file'));
return false;
}
}
@@ -306,23 +305,23 @@ function install_create_config($download = false)
*/
function install_create_account($username, $password, $password2)
{
- if (!strlen($username) OR !strlen($password)) {
- Error::add('general', T_('No Username/Password specified'));
+ if (!strlen($username) or !strlen($password)) {
+ AmpError::add('general', T_('No Username/Password specified'));
return false;
}
if ($password !== $password2) {
- Error::add('general', T_('Passwords do not match'));
+ AmpError::add('general', T_('Passwords do not match'));
return false;
}
if (!Dba::check_database()) {
- Error::add('general', sprintf(T_('Database connection failed: %s'), Dba::error()));
+ AmpError::add('general', sprintf(T_('Database connection failed: %s'), Dba::error()));
return false;
}
if (!Dba::check_database_inserted()) {
- Error::add('general', sprintf(T_('Database select failed: %s'), Dba::error()));
+ AmpError::add('general', sprintf(T_('Database select failed: %s'), Dba::error()));
return false;
}
@@ -332,7 +331,7 @@ function install_create_account($username, $password, $password2)
$insert_id = User::create($username,'Administrator','','',$password,'100');
if (!$insert_id) {
- Error::add('general', sprintf(T_('Administrative user creation failed: %s'), Dba::error()));
+ AmpError::add('general', sprintf(T_('Administrative user creation failed: %s'), Dba::error()));
return false;
}
@@ -340,7 +339,6 @@ function install_create_account($username, $password, $password2)
User::fix_preferences('-1');
return true;
-
} // install_create_account
function command_exists($command)
@@ -350,7 +348,7 @@ function command_exists($command)
}
$whereIsCommand = (PHP_OS == 'WINNT') ? 'where' : 'which';
- $process = proc_open(
+ $process = proc_open(
"$whereIsCommand $command",
array(
0 => array("pipe", "r"), //STDIN
@@ -406,9 +404,9 @@ function install_config_transcode_mode($mode)
'transcode_mkv' => 'allowed',
);
if ($mode == 'ffmpeg' || $mode == 'avconv') {
- $trconfig['transcode_cmd'] = $mode;
- $trconfig['transcode_input'] = '-i %FILE%';
- $trconfig['waveform'] = 'true';
+ $trconfig['transcode_cmd'] = $mode;
+ $trconfig['transcode_input'] = '-i %FILE%';
+ $trconfig['waveform'] = 'true';
$trconfig['generate_video_preview'] = 'true';
AmpConfig::set_by_array($trconfig, true);
@@ -441,31 +439,33 @@ function install_config_use_case($case)
switch ($case) {
case 'minimalist':
- $trconfig['ratings'] = 'false';
- $trconfig['userflags'] = 'false';
- $trconfig['sociable'] = 'false';
- $trconfig['wanted'] = 'false';
- $trconfig['channel'] = 'false';
+ $trconfig['ratings'] = 'false';
+ $trconfig['userflags'] = 'false';
+ $trconfig['sociable'] = 'false';
+ $trconfig['wanted'] = 'false';
+ $trconfig['channel'] = 'false';
$trconfig['live_stream'] = 'false';
- $dbconfig['download'] = '0';
+ $dbconfig['download'] = '0';
$dbconfig['allow_video'] = '0';
- // Hide sidebar by default to have a better 'minimalist first look'.
+ // Default local UI preferences to have a better 'minimalist first look'.
setcookie('sidebar_state', 'collapsed', time() + (30 * 24 * 60 * 60), '/');
+ setcookie('browse_album_grid_view', 'false', time() + (30 * 24 * 60 * 60), '/');
+ setcookie('browse_artist_grid_view', 'false', time() + (30 * 24 * 60 * 60), '/');
break;
case 'community':
- $trconfig['use_auth'] = 'false';
- $trconfig['licensing'] = 'true';
- $trconfig['wanted'] = 'false';
- $trconfig['live_stream'] = 'false';
+ $trconfig['use_auth'] = 'false';
+ $trconfig['licensing'] = 'true';
+ $trconfig['wanted'] = 'false';
+ $trconfig['live_stream'] = 'false';
$trconfig['allow_public_registration'] = 'true';
- $trconfig['cookie_disclaimer'] = 'true';
- $trconfig['share'] = 'true';
+ $trconfig['cookie_disclaimer'] = 'true';
+ $trconfig['share'] = 'true';
- $dbconfig['download'] = '0';
- $dbconfig['share'] = '1';
- $dbconfig['home_now_playing'] = '0';
+ $dbconfig['download'] = '0';
+ $dbconfig['share'] = '1';
+ $dbconfig['home_now_playing'] = '0';
$dbconfig['home_recently_played'] = '0';
break;
default:
@@ -498,7 +498,7 @@ function install_config_backends(Array $backends)
$dbconfig['plex_backend'] = '1';
break;
case 'upnp':
- $dbconfig['upnp_backend'] = '1';
+ $dbconfig['upnp_backend'] = '1';
$dbconfig['stream_beautiful_url'] = '1';
break;
case 'daap':
diff --git a/sources/lib/javascript/.htaccess b/sources/lib/javascript/.htaccess
index 3b8fa6c..edb3570 100644
--- a/sources/lib/javascript/.htaccess
+++ b/sources/lib/javascript/.htaccess
@@ -1,9 +1,10 @@
# Apache 2.4
- Require all granted
+ Require all granted
# Apache 2.2
+ Order deny,allow
Allow from all
\ No newline at end of file
diff --git a/sources/lib/javascript/base.js b/sources/lib/javascript/base.js
index 49f5faa..8fe17d6 100644
--- a/sources/lib/javascript/base.js
+++ b/sources/lib/javascript/base.js
@@ -45,10 +45,10 @@ function initTabs()
$(function() {
var rightmenu = $("#rightbar");
- var rightsubmenu = $("#rightbar .submenu");
var pos = rightmenu.offset();
if (rightmenu.hasClass('rightbar-float')) {
$(window).scroll(function() {
+ var rightsubmenu = $("#rightbar .submenu");
if ($(this).scrollTop() > (pos.top)) {
rightmenu.addClass('fixedrightbar');
rightsubmenu.addClass('fixedrightbarsubmenu');
diff --git a/sources/lib/javascript/dynamicpage.js b/sources/lib/javascript/dynamicpage.js
index 6f502d3..a5047c5 100644
--- a/sources/lib/javascript/dynamicpage.js
+++ b/sources/lib/javascript/dynamicpage.js
@@ -88,7 +88,7 @@ $(function() {
$("body").delegate("form", "submit", function(e) {
// We do not support ajax post with files or login form, neither specific target
var $file = $(this).find("input[type=file]");
- if ($(this).attr('name') !== 'login' && (!$file || !$file.val() || $file.val() === "") && ($(this).attr('target') === undefined || $(this).attr('target') === '')) {
+ if ($(this).attr('name') !== 'login' && $(this).attr('name') !== 'export' && (!$file || !$file.val() || $file.val() === "") && ($(this).attr('target') === undefined || $(this).attr('target') === '')) {
var postData = $(this).serializeArray();
var formURL = $(this).attr("action");
diff --git a/sources/lib/javascript/search-data.php b/sources/lib/javascript/search-data.php
index 2ef41c0..059662d 100644
--- a/sources/lib/javascript/search-data.php
+++ b/sources/lib/javascript/search-data.php
@@ -2,21 +2,21 @@
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
- * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
* Copyright 2001 - 2015 Ampache.org
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License v2
- * as published by the Free Software Foundation
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see $key $value \n";
+ $string .= "\t\t\t$key $value \n";
} elseif ($key == "Date Added") {
- $string .= "\t\t\t$key $value \n";
+ $string .= "\t\t\t$key $value \n";
} elseif (is_string($value)) {
- /* We need to escape the value */
+ /* We need to escape the value */
$string .= "\t\t\t$key \n ".
+ "\n " .
"Ampache XSPF Playlist \n" .
"" . AmpConfig::get('site_title') . " \n" .
"" . AmpConfig::get('site_title') . " \n" .
- "". AmpConfig::get('web_path') ." \n" .
+ "" . AmpConfig::get('web_path') . " \n" .
"\n\n\n\n";
return $header;
default:
@@ -694,7 +700,6 @@ function toggle_visible($element)
echo '\n";
-
} // toggle_visible
function display_notification($message, $timeout = 5000)
@@ -718,7 +723,6 @@ function print_bool($value)
}
return $string;
-
} // print_bool
/**
@@ -732,9 +736,8 @@ function show_now_playing()
Stream::gc_now_playing();
$web_path = AmpConfig::get('web_path');
- $results = Stream::get_now_playing();
- require_once AmpConfig::get('prefix') . '/templates/show_now_playing.inc.php';
-
+ $results = Stream::get_now_playing();
+ require_once AmpConfig::get('prefix') . UI::find_template('show_now_playing.inc.php');
} // show_now_playing
function show_table_render($render = false, $force = false)
@@ -742,11 +745,14 @@ function show_table_render($render = false, $force = false)
// Include table render javascript only once
if ($force || !defined('TABLE_RENDERED')) {
define('TABLE_RENDERED', 1);
+ ?>
+
+
-
-
, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Ahmad alrasheed , 2015
msgid ""
msgstr ""
-"Project-Id-Version: Ampache SVN\n"
-"Report-Msgid-Bugs-To: translations@ampache.org\n"
-"POT-Creation-Date: 2015-05-04 18:17+0200\n"
-"PO-Revision-Date: 2014-10-09 23:10+0100\n"
-"Last-Translator: Manuel Landmann \n"
-"Language-Team: Arabic\n"
-"Language: ar_SA\n"
+"Project-Id-Version: Ampache\n"
+"Report-Msgid-Bugs-To: https://www.transifex.com/projects/p/ampache/\n"
+"POT-Creation-Date: 2015-11-16 01:36+0100\n"
+"PO-Revision-Date: 2015-11-18 08:20+0000\n"
+"Last-Translator: Afterster\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/ampache/ampache/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
-"X-Generator: Poedit 1.6.9\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../../admin/access.php:40
-#, fuzzy
msgid "Deleted"
-msgstr "ØØ°Ù"
+msgstr "تم الØØ°Ù"
#: ../../admin/access.php:40
msgid "Your Access List Entry has been removed"
msgstr ""
-#: ../../admin/access.php:45 ../../admin/users.php:202
+#: ../../admin/access.php:47 ../../admin/users.php:222
msgid "Deletion Request"
msgstr ""
-#: ../../admin/access.php:45
+#: ../../admin/access.php:47
msgid "Are you sure you want to permanently delete"
msgstr ""
-#: ../../admin/access.php:72 ../../lib/class/search.class.php:338
-#: ../../templates/show_song.inc.php:137
-#: ../../templates/show_video.inc.php:129
+#: ../../admin/access.php:74 ../../lib/class/search.class.php:338
+#: ../../templates/show_song.inc.php:222
+#: ../../templates/show_video.inc.php:199
msgid "Added"
-msgstr ""
+msgstr "تم الاضاÙÙ‡"
-#: ../../admin/access.php:72
+#: ../../admin/access.php:74
msgid "Your new Access Control List(s) have been created"
msgstr ""
-#: ../../admin/access.php:86 ../../lib/class/catalog.class.php:1389
-#: ../../lib/class/search.class.php:345 ../../preferences.php:143
-#, fuzzy
+#: ../../admin/access.php:88 ../../lib/class/catalog.class.php:1403
+#: ../../lib/class/search.class.php:345 ../../preferences.php:144
+#: ../../preferences.php:162
msgid "Updated"
-msgstr "تØديث المستخدم"
+msgstr "تم التØديث"
-#: ../../admin/access.php:86
+#: ../../admin/access.php:88
msgid "Access List Entry updated"
msgstr ""
-#: ../../admin/catalog.php:55 ../../admin/catalog.php:62
-#: ../../admin/catalog.php:67 ../../admin/catalog.php:74
-#: ../../admin/catalog.php:81
-#, fuzzy
+#: ../../admin/catalog.php:54 ../../admin/catalog.php:62
+#: ../../admin/catalog.php:66 ../../admin/catalog.php:74
+#: ../../admin/catalog.php:83
msgid "Catalog Update started..."
-msgstr "نوع التسويقي"
+msgstr "ابتدأ تØديث الكاتالوج..."
-#: ../../admin/catalog.php:99
-#, fuzzy
+#: ../../admin/catalog.php:105
msgid "Catalog Deleted"
-msgstr "ØØ°Ù"
+msgstr "تم الغاء الكاتالوج"
-#: ../../admin/catalog.php:99
+#: ../../admin/catalog.php:105
msgid "The Catalog and all associated records have been deleted"
-msgstr ""
+msgstr "تم الغاء الكاتالوج والبيانات المراÙقه"
-#: ../../admin/catalog.php:101 ../../admin/users.php:178
-#: ../../templates/error_page.inc.php:50
+#: ../../admin/catalog.php:107 ../../admin/users.php:192
+#: ../../preferences.php:166 ../../templates/error_page.inc.php:50
msgid "Error"
-msgstr ""
+msgstr "خلل"
-#: ../../admin/catalog.php:101
-#, fuzzy
+#: ../../admin/catalog.php:107
msgid "Cannot delete the catalog"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr "تعذر الغاء الكاتالوج"
-#: ../../admin/catalog.php:106
-#, fuzzy
+#: ../../admin/catalog.php:112
msgid "Catalog Delete"
-msgstr "ØØ°Ù"
+msgstr "Øذ٠الكاتالوج"
-#: ../../admin/catalog.php:106 ../../admin/users.php:210
+#: ../../admin/catalog.php:112 ../../admin/users.php:230
#: ../../broadcast.php:38 ../../channel.php:70 ../../share.php:94
msgid "Confirm Deletion Request"
-msgstr ""
+msgstr "تأكيد الغاء الكاتالوج"
-#: ../../admin/catalog.php:117
-#, fuzzy
+#: ../../admin/catalog.php:125
msgid " Song Enabled"
msgid_plural " Songs Enabled"
-msgstr[0] "عنوان الأغنية"
-msgstr[1] "عنوان الأغنية"
+msgstr[0] ""
+msgstr[1] ""
-#: ../../admin/catalog.php:119
-#, fuzzy
+#: ../../admin/catalog.php:127
msgid "No Disabled Songs selected"
-msgstr "بØØ« المعاقين أغاني"
+msgstr "لا صوتيات معطله مختاره"
-#: ../../admin/catalog.php:122
-#, fuzzy
+#: ../../admin/catalog.php:130
msgid " Disabled Song Processed"
msgid_plural " Disabled Songs Processed"
-msgstr[0] "بØØ« المعاقين أغاني"
-msgstr[1] "بØØ« المعاقين أغاني"
+msgstr[0] ""
+msgstr[1] ""
-#: ../../admin/catalog.php:128 ../../admin/catalog.php:133
-#, fuzzy
+#: ../../admin/catalog.php:135 ../../admin/catalog.php:139
msgid "Catalog Clean started..."
-msgstr "نوع التسويقي"
+msgstr "تنظي٠الكاتالوج بدأ..."
-#: ../../admin/catalog.php:143
-#, fuzzy
+#: ../../admin/catalog.php:151
msgid "Catalog Updated"
-msgstr "نوع التسويقي"
-
-#: ../../admin/catalog.php:152
-msgid "Subdirectory update started..."
-msgstr ""
+msgstr "تم تØديث الكاتالوج"
#: ../../admin/catalog.php:161
+msgid "Subdirectory update started..."
+msgstr "تØديث المجلد Ùرعي بدأ.."
+
+#: ../../admin/catalog.php:172
msgid "Error: Please select a catalog type"
-msgstr ""
+msgstr "خلل: يرجى اختيار نوع الكاتالوج"
-#: ../../admin/catalog.php:165
-#, fuzzy
+#: ../../admin/catalog.php:176
msgid "Error: Name not specified"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
-
-#: ../../admin/catalog.php:186
-#, fuzzy
-msgid "Catalog Creation started..."
-msgstr "نوع التسويقي"
+msgstr "خلل: لم يتم تØديد الاسم"
#: ../../admin/catalog.php:195
+msgid "Catalog Creation started..."
+msgstr "بدأ انشاء الكاتالوج..."
+
+#: ../../admin/catalog.php:207
msgid "Catalog statistics cleared"
-msgstr ""
+msgstr "تم Ù…Ø³Ø Ø§Øصائيات الكاتالوج"
-#: ../../admin/catalog.php:205
+#: ../../admin/catalog.php:220
msgid "Now Playing Cleared"
-msgstr ""
+msgstr "تم Ù…Ø³Ø Ù‚Ø§Ø¦Ù…Ø© الجاري عرضهم"
-#: ../../admin/catalog.php:205
+#: ../../admin/catalog.php:220
msgid "All now playing data has been cleared"
-msgstr ""
+msgstr "تم Ù…Ø³Ø Ø¬Ù…ÙŠØ¹ قائمة الجاري عرضهم"
-#: ../../admin/catalog.php:215
-#, fuzzy
+#: ../../admin/catalog.php:232
msgid "No Disabled songs found"
-msgstr "لا توجد سجلات"
+msgstr "لا توجد صوتيات معطله"
-#: ../../admin/catalog.php:224
-#, fuzzy
+#: ../../admin/catalog.php:244
msgid "Delete Catalog"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr "Øذ٠الكاتالوج"
-#: ../../admin/catalog.php:224
+#: ../../admin/catalog.php:244
msgid "Do you really want to delete this catalog?"
-msgstr ""
+msgstr "هل Ùعلا تريد الغاء هذا الكاتالوج ØŸ"
-#: ../../admin/catalog.php:234
-#, fuzzy
+#: ../../admin/catalog.php:253
msgid "Media Art Search started..."
-msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+msgstr "بدأ البØØ« عن صور الوسائط..."
#: ../../admin/license.php:39
-#, fuzzy
msgid "License Updated"
-msgstr "تØديث Ampache"
+msgstr "تم تØديث الرخصه"
#: ../../admin/license.php:42
-#, fuzzy
msgid "License Created"
-msgstr "تØديث Ampache"
+msgstr "تم انشاء الرخصه"
#: ../../admin/license.php:53
-#, fuzzy
msgid "License Deleted"
-msgstr "ØØ°Ù"
-
-#: ../../admin/mail.php:60
-#, fuzzy
-msgid "E-mail Sent"
-msgstr "البريد الإلكتروني"
-
-#: ../../admin/mail.php:61
-msgid "Your E-mail was successfully sent."
-msgstr ""
+msgstr "تم الغاء الرخصه"
#: ../../admin/mail.php:63
-msgid "E-mail Not Sent"
-msgstr ""
+msgid "E-mail Sent"
+msgstr "تم ارسال البريد الالكتروني"
#: ../../admin/mail.php:64
+msgid "Your E-mail was successfully sent."
+msgstr "تم ارسال البريد الالكتروني بنجاØ"
+
+#: ../../admin/mail.php:66
+msgid "E-mail Not Sent"
+msgstr "لم يتم ارسال البريد الالكتروني"
+
+#: ../../admin/mail.php:67
msgid "Your E-mail was not sent."
-msgstr ""
+msgstr "لم يتم ارسال البريد الالكتروني"
#: ../../admin/modules.php:38
-#, fuzzy
msgid "Install Failed, Controller Error"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr "خطأ بالتنصيب, خلل بالكنترولر"
#: ../../admin/modules.php:53
-#, fuzzy
msgid "Localplay Installed"
-msgstr "المØلية تلعب المعاقين"
+msgstr "تم تنصيب التشغيل المØلي"
#: ../../admin/modules.php:61
-#, fuzzy
msgid "Install Failed, Catalog Error"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr "Ùشل بالتنصيب, خلل بالكاتالوج"
#: ../../admin/modules.php:70
msgid "Plugin Installed"
-msgstr ""
+msgstr "تم تنصيب الاضاÙÙ‡"
#: ../../admin/modules.php:77 ../../admin/modules.php:84
#: ../../admin/modules.php:146
msgid "Are you sure you want to remove this plugin?"
-msgstr ""
+msgstr "هل انت متأكد انك تريد ازاله هذه الاضاÙÙ‡ ØŸ"
#: ../../admin/modules.php:96 ../../admin/modules.php:113
#: ../../admin/modules.php:165
msgid "Plugin Deactivated"
-msgstr ""
+msgstr "تم تعطيل الاضاÙÙ‡"
#: ../../admin/modules.php:105
-#, fuzzy
msgid "Uninstall Failed, Catalog Error"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr "Ùشل ÙÙŠ الازاله, خلل بالكاتالوج"
#: ../../admin/modules.php:128
msgid "Unable to Install Plugin"
-msgstr ""
+msgstr "تعذر تنصيب الاضاÙÙ‡"
#: ../../admin/modules.php:139
-#, fuzzy
msgid "Plugin Activated"
-msgstr "تÙعيل"
+msgstr "تم تÙعيل الاضاÙÙ‡"
#: ../../admin/modules.php:180
msgid "Plugin Upgraded"
-msgstr ""
+msgstr "تم تØديث الاضاÙÙ‡"
#: ../../admin/modules.php:186
msgid "Plugins"
-msgstr ""
+msgstr "الاضاÙات"
#: ../../admin/modules.php:192
-#, fuzzy
msgid "Localplay Controllers"
-msgstr "المراقب المالي المØلي اللعب غير Ù…Øدد"
+msgstr "كنترولز التشغيل المØلي"
#: ../../admin/modules.php:198
-#, fuzzy
msgid "Catalog Types"
-msgstr "نوع التسويقي"
+msgstr "انواع الكاتالوج"
#: ../../admin/shout.php:39
msgid "Shoutbox Post Updated"
-msgstr ""
+msgstr "تم تØديث رسائل الشاوت بوكس"
#: ../../admin/shout.php:51
msgid "Shoutbox Post Deleted"
-msgstr ""
+msgstr "تم الغاء رساله الشاوت بوكس"
#: ../../admin/system.php:51
-#, fuzzy
msgid "Database Charset Updated"
-msgstr "اسم قاعدة البيانات المطلوبة"
+msgstr "تم تØديث ترميز قاعده البيانات"
#: ../../admin/system.php:51
msgid ""
"Your Database and associated tables have been updated to match your "
"currently configured charset"
-msgstr ""
+msgstr "تم تØديث قاعده البيانات والجداول المراÙقه لتطابق اعدادات الترميز الØاليه"
#: ../../admin/system.php:66
msgid "Cache cleared"
-msgstr ""
+msgstr "تم ازاله الذاكره المؤقته"
#: ../../admin/system.php:66
msgid "Your cache has been cleared successfully."
-msgstr ""
+msgstr "تم ازاله الذاكره المؤقته بنجاØ"
-#: ../../admin/users.php:59 ../../admin/users.php:133
-#: ../../lib/class/user.class.php:581
-#, fuzzy
+#: ../../admin/users.php:62 ../../admin/users.php:141
+#: ../../lib/class/user.class.php:593
msgid "Error Username Required"
-msgstr "مطلوب"
+msgstr "خطأ : اسم المستخدم مطلوب"
-#: ../../admin/users.php:63 ../../admin/users.php:138 ../../register.php:121
+#: ../../admin/users.php:66 ../../admin/users.php:146 ../../register.php:121
msgid "Error Username already exists"
-msgstr ""
+msgstr "خطأ : اسم المستخدم مستخدم"
-#: ../../admin/users.php:68 ../../admin/users.php:129
-#: ../../lib/class/user.class.php:585
-#, fuzzy
+#: ../../admin/users.php:71 ../../admin/users.php:137
+#: ../../lib/class/user.class.php:597
msgid "Error Passwords don't match"
-msgstr "كلمة السر لا تعمل"
+msgstr "خطأ : كلمتي السر غير متطابقتين"
-#: ../../admin/users.php:73 ../../admin/users.php:143 ../../register.php:95
+#: ../../admin/users.php:76 ../../admin/users.php:151 ../../register.php:95
msgid "Invalid email address"
-msgstr ""
+msgstr "البريد الالكتروني غير ناÙØ°"
-#: ../../admin/users.php:108
-#, fuzzy
+#: ../../admin/users.php:114
msgid "User Updated"
-msgstr "تØديث Ampache"
+msgstr "تم تØديث المستخدم"
-#: ../../admin/users.php:108
-#, fuzzy
+#: ../../admin/users.php:114
msgid "updated"
-msgstr "صنÙ"
+msgstr "تم التØديث"
-#: ../../admin/users.php:155 ../../register.php:150
-#, fuzzy
+#: ../../admin/users.php:163 ../../register.php:150
msgid "Error: Insert Failed"
-msgstr "مدخل الديسيبل"
+msgstr "خطأ : Ùشل الادخال"
-#: ../../admin/users.php:160 ../../lib/class/democratic.class.php:158
-#: ../../lib/class/shoutbox.class.php:319
+#: ../../admin/users.php:169 ../../lib/class/democratic.class.php:158
+#: ../../lib/class/shoutbox.class.php:328
#: ../../templates/show_add_user.inc.php:85
-#: ../../templates/show_edit_user.inc.php:106
-#: ../../templates/show_preference_admin.inc.php:43
-#: ../../templates/show_preference_box.inc.php:62
+#: ../../templates/show_edit_user.inc.php:109
+#: ../../templates/show_preference_admin.inc.php:49
+#: ../../templates/show_preference_box.inc.php:78
msgid "Guest"
msgstr "ضيÙ"
-#: ../../admin/users.php:160 ../../lib/class/democratic.class.php:161
-#: ../../lib/preferences.php:287 ../../modules/plugins/Flattr.plugin.php:83
-#: ../../modules/plugins/Paypal.plugin.php:86
-#: ../../templates/show_access_list.inc.php:50
+#: ../../admin/users.php:171 ../../lib/class/democratic.class.php:161
+#: ../../lib/preferences.php:295
+#: ../../modules/plugins/Flattr/Flattr.plugin.php:91
+#: ../../modules/plugins/Paypal/Paypal.plugin.php:94
+#: ../../templates/show_access_list.inc.php:55
#: ../../templates/show_add_access.inc.php:42
#: ../../templates/show_add_user.inc.php:86
-#: ../../templates/show_create_democratic.inc.php:42
+#: ../../templates/show_create_democratic.inc.php:44
#: ../../templates/show_edit_access.inc.php:60
-#: ../../templates/show_edit_user.inc.php:107
+#: ../../templates/show_edit_user.inc.php:110
#: ../../templates/show_mail_users.inc.php:32
#: ../../templates/show_manage_shoutbox.inc.php:29
-#: ../../templates/show_manage_shoutbox.inc.php:58
+#: ../../templates/show_manage_shoutbox.inc.php:63
#: ../../templates/show_missing_albums.inc.php:30
-#: ../../templates/show_preference_admin.inc.php:44
-#: ../../templates/show_preference_box.inc.php:63
+#: ../../templates/show_preference_admin.inc.php:52
+#: ../../templates/show_preference_box.inc.php:81
#: ../../templates/show_shared_objects.inc.php:28
#: ../../templates/show_wanted_albums.inc.php:29
msgid "User"
msgstr "مستخدم"
-#: ../../admin/users.php:160 ../../lib/class/democratic.class.php:170
-#: ../../lib/preferences.php:289 ../../templates/show_add_user.inc.php:89
-#: ../../templates/show_create_democratic.inc.php:45
-#: ../../templates/show_democratic_playlist.inc.php:62
-#: ../../templates/show_democratic_playlist.inc.php:109
-#: ../../templates/show_edit_user.inc.php:110
+#: ../../admin/users.php:173 ../../lib/class/democratic.class.php:170
+#: ../../lib/preferences.php:297 ../../templates/show_add_user.inc.php:89
+#: ../../templates/show_create_democratic.inc.php:53
+#: ../../templates/show_democratic_playlist.inc.php:75
+#: ../../templates/show_democratic_playlist.inc.php:150
+#: ../../templates/show_edit_user.inc.php:113
#: ../../templates/show_mail_users.inc.php:33
-#: ../../templates/show_preference_admin.inc.php:45
-#: ../../templates/show_preference_box.inc.php:66
+#: ../../templates/show_preference_admin.inc.php:55
+#: ../../templates/show_preference_box.inc.php:90
#: ../../templates/sidebar.inc.php:39
msgid "Admin"
msgstr "مشرÙ"
#. HINT: %1 Username, %2 Access num
-#: ../../admin/users.php:163
+#: ../../admin/users.php:177
msgid "New User Added"
-msgstr ""
+msgstr "تم اضاÙØ© مستخدم جديد"
-#: ../../admin/users.php:163
+#: ../../admin/users.php:177
#, php-format
msgid "%1$s has been created with an access level of %2$s"
-msgstr ""
+msgstr "%1$s تم انشاءه مع صلاØيات %2$s"
-#: ../../admin/users.php:171
-#, fuzzy
+#: ../../admin/users.php:185
msgid "User Enabled"
-msgstr "اسم المستخدم"
+msgstr "تم تغعيل المستخدم"
-#: ../../admin/users.php:176
-#, fuzzy
+#: ../../admin/users.php:190
msgid "User Disabled"
-msgstr "يعطل"
+msgstr "تم تعطيل المتسخدم"
-#: ../../admin/users.php:178
+#: ../../admin/users.php:192
msgid "Unable to Disabled last Administrator"
+msgstr "لا يمكن تعطيل اخر مشرÙ"
+
+#: ../../admin/users.php:212
+msgid "User Deleted"
+msgstr "تم الغاء المستخدم"
+
+#: ../../admin/users.php:212
+#, php-format
+msgid "%s has been Deleted"
msgstr ""
-#: ../../admin/users.php:194
-#, fuzzy
-msgid "User Deleted"
-msgstr "ØØ°Ù"
-
-#: ../../admin/users.php:194
-#, fuzzy, php-format
-msgid "%s has been Deleted"
-msgstr "ØØ°Ù"
-
-#: ../../admin/users.php:196
-#, fuzzy
+#: ../../admin/users.php:214
msgid "Delete Error"
-msgstr "ØØ°Ù"
+msgstr "Ùشل بالالغاء"
-#: ../../admin/users.php:196
-#, fuzzy
+#: ../../admin/users.php:214
msgid "Unable to delete last Admin User"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr "لا يمكن الغاء اخر مشرÙ"
-#: ../../admin/users.php:203
+#: ../../admin/users.php:223
#, php-format
msgid "Are you sure you want to permanently delete %s?"
msgstr ""
-#: ../../admin/users.php:210
-#, fuzzy
+#: ../../admin/users.php:230
msgid "User Avatar Delete"
-msgstr "ØØ°Ù"
+msgstr "الغاء صوره العرض"
-#: ../../admin/users.php:224
-#, fuzzy
-msgid "User Avater Deleted"
-msgstr "ØØ°Ù"
-
-#: ../../admin/users.php:224
-msgid "User Avatar has been deleted"
+#: ../../admin/users.php:246
+msgid "User Avatar Deleted"
msgstr ""
-#: ../../admin/users.php:230 ../../templates/show_account.inc.php:94
-#: ../../templates/show_edit_user.inc.php:130
-#, fuzzy
-msgid "Generate new API Key"
-msgstr "توليد ملÙ"
+#: ../../admin/users.php:246
+msgid "User Avatar has been deleted"
+msgstr "تم الغاء صوره العرض"
-#: ../../admin/users.php:230
+#: ../../admin/users.php:252 ../../templates/show_account.inc.php:110
+#: ../../templates/show_edit_user.inc.php:133
+msgid "Generate new API Key"
+msgstr ""
+
+#: ../../admin/users.php:252
msgid "Confirm API Key Generation"
msgstr ""
-#: ../../admin/users.php:244
+#: ../../admin/users.php:268
msgid "API Key Generated"
msgstr ""
-#: ../../admin/users.php:244
+#: ../../admin/users.php:268
msgid "New user API Key has been generated."
msgstr ""
-#: ../../albums.php:34 ../../albums.php:52 ../../albums.php:54
-#, fuzzy
+#: ../../albums.php:36 ../../albums.php:56 ../../albums.php:58
msgid "Album Deletion"
-msgstr "عنوان الأغنية"
+msgstr "Ù…Ø³Ø Ø§Ù„Ø§Ù„Ø¨ÙˆÙ…"
-#: ../../albums.php:35
+#: ../../albums.php:37
msgid "Are you sure you want to permanently delete this album?"
-msgstr ""
+msgstr "هل انت متأكد انك تريد Ù…Ø³Ø Ù‡Ø°Ø§ الالبوم نهائيا ØŸ"
-#: ../../albums.php:52
-#, fuzzy
+#: ../../albums.php:56
msgid "Album has been deleted."
-msgstr "ØØ°Ù"
+msgstr "تم Ù…Ø³Ø Ø§Ù„Ø§Ù„Ø¨ÙˆÙ…"
-#: ../../albums.php:54
-#, fuzzy
+#: ../../albums.php:58
msgid "Cannot delete this album."
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr "تعذر Ù…Ø³Ø Ø§Ù„Ø§Ù„Ø¨ÙˆÙ…"
-#: ../../artists.php:36 ../../artists.php:54 ../../artists.php:56
-#, fuzzy
+#: ../../artists.php:38 ../../artists.php:58 ../../artists.php:60
msgid "Artist Deletion"
-msgstr "الÙنان والعنوان"
+msgstr "Ù…Ø³Ø Ø§Ù„Ùنان"
-#: ../../artists.php:37
+#: ../../artists.php:39
msgid "Are you sure you want to permanently delete this artist?"
-msgstr ""
+msgstr "هل انت متأكد انك تريد Ù…Ø³Ø Ù‡Ø°Ø§ الÙنان نهائيا ØŸ"
-#: ../../artists.php:54
-#, fuzzy
+#: ../../artists.php:58
msgid "Artist has been deleted."
-msgstr "ØØ°Ù"
+msgstr "تم Ù…Ø³Ø Ø§Ù„Ùنان"
-#: ../../artists.php:56
-#, fuzzy
+#: ../../artists.php:60
msgid "Cannot delete this artist."
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr "تعذر Ù…Ø³Ø Ø§Ù„Ùنان"
-#: ../../artists.php:90
+#: ../../artists.php:98
msgid "Show Artists starting with"
msgstr ""
-#: ../../arts.php:44
-#, fuzzy
+#: ../../arts.php:50
msgid "Art Cleared"
-msgstr "مدخل الديسيبل"
+msgstr "تم الغاء الصور"
-#: ../../arts.php:44
+#: ../../arts.php:50
msgid "Art information has been removed from the database"
-msgstr ""
+msgstr "تم الغاء الصور من قاعده البيانات"
-#: ../../arts.php:50 ../../arts.php:66 ../../arts.php:135
+#: ../../arts.php:56 ../../arts.php:72 ../../arts.php:139
msgid "Art Not Located"
-msgstr ""
+msgstr "تعذر الوصول للصور"
-#: ../../arts.php:50 ../../arts.php:66 ../../arts.php:135
+#: ../../arts.php:56 ../../arts.php:72 ../../arts.php:139
msgid ""
"Art could not be located at this time. This may be due to write access "
"error, or the file is not received correctly."
msgstr ""
-#: ../../arts.php:62 ../../arts.php:88
-#, fuzzy
+#: ../../arts.php:68 ../../arts.php:94
msgid "Art Inserted"
-msgstr "مدخل الديسيبل"
+msgstr "تم ادخال الصور"
#: ../../bin/broadcast.inc:32
-#, fuzzy
msgid "Starting broadcasts..."
-msgstr "إعدادات %s"
+msgstr "بدأ البث..."
#: ../../bin/broadcast.inc:35
-#, fuzzy
msgid "UPnP broadcast... "
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../bin/broadcast.inc:37
msgid "Done."
-msgstr ""
+msgstr "تم."
#: ../../bin/broadcast.inc:39
msgid "UPnP backend disabled. Broadcast skipped."
msgstr ""
#: ../../bin/catalog_update.inc:41
-#, fuzzy
msgid "Doing all catalog operations"
-msgstr "كتالوج ØÙظ الإعدادات"
+msgstr "جاري عمل جميع عمليات الكاتالوج"
#: ../../bin/catalog_update.inc:48
msgid "Temporary deactivate PHP memory limit"
msgstr ""
#: ../../bin/catalog_update.inc:52
-#, fuzzy
msgid "Cleaning catalog/s"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr "تنظي٠الكاتالوج/ات"
#: ../../bin/catalog_update.inc:56
-#, fuzzy
msgid "Verifying catalog/s"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr "جاري التأكد من الكاتالوج"
#: ../../bin/catalog_update.inc:60
-#, fuzzy
msgid "Adding new media to catalog/s"
-msgstr "استيراد قائمة التشغيل"
+msgstr "جاري اضاÙÙ‡ ملÙات جديده للكاتالوج"
#: ../../bin/catalog_update.inc:64
-#, fuzzy
msgid "Gathering new media art"
-msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+msgstr "جاري جمع صور الملÙات"
#: ../../bin/catalog_update.inc:68
-#, fuzzy
msgid "Importing playlist/s"
-msgstr "استيراد قائمة التشغيل"
+msgstr "جاري استيراد قائمة التشغيل"
#: ../../bin/catalog_update.inc:72
-#, fuzzy
msgid "Database table optimization"
-msgstr "اسم قاعدة البيانات المطلوبة"
+msgstr ""
#: ../../bin/catalog_update.inc:95
-#, fuzzy
msgid "Starting catalog operations..."
-msgstr "إعدادات %s"
+msgstr ""
#: ../../bin/catalog_update.inc:101
msgid "Deactivated PHP memory limit"
@@ -585,14 +527,13 @@ msgid "Gathering art"
msgstr ""
#: ../../bin/catalog_update.inc:114
-#, fuzzy
msgid "Parsing playlists"
-msgstr "التشغيل"
+msgstr ""
#: ../../bin/catalog_update.inc:131
-#, fuzzy, php-format
+#, php-format
msgid "Reading catalog: %s"
-msgstr "إعدادات %s"
+msgstr ""
#: ../../bin/catalog_update.inc:137
msgid "Start cleaning orphaned media entries"
@@ -603,24 +544,20 @@ msgid "Start verifying media related to catalog entries"
msgstr ""
#: ../../bin/catalog_update.inc:151
-#, fuzzy
msgid "Start adding new media"
-msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+msgstr "البدء باضاقة ملÙات جديده"
#: ../../bin/catalog_update.inc:158
-#, fuzzy
msgid "Start searching new media art"
-msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+msgstr "جاري البØØ« عن صور جديده"
#: ../../bin/catalog_update.inc:166
-#, fuzzy
msgid "Optimizing database tables"
-msgstr "اسم قاعدة البيانات المطلوبة"
+msgstr ""
#: ../../bin/catalog_update.inc:191
-#, fuzzy
msgid "- Catalog Update Help -"
-msgstr "نوع التسويقي"
+msgstr ""
#: ../../bin/catalog_update.inc:193
msgid "Usage: catalog_update.inc [CATALOG NAME] [-m|-c|-v|-a|-g|-i|-o]"
@@ -638,7 +575,7 @@ msgstr ""
#: ../../bin/catalog_update.inc:203
msgid "Cleans catalogs from orphaned entries."
-msgstr ""
+msgstr "ازل الملÙات الوØيده من الكاتالوج"
#: ../../bin/catalog_update.inc:205
msgid ""
@@ -647,23 +584,20 @@ msgid ""
msgstr ""
#: ../../bin/catalog_update.inc:207
-#, fuzzy
msgid "Adds new media to catalogs."
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
#: ../../bin/catalog_update.inc:209
msgid "Gathers media Art."
msgstr ""
#: ../../bin/catalog_update.inc:211
-#, fuzzy
msgid "Imports playlists."
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
#: ../../bin/catalog_update.inc:213
-#, fuzzy
msgid "Optimizes Database Tables."
-msgstr "اسم قاعدة البيانات المطلوبة"
+msgstr ""
#: ../../bin/catalog_update.inc:216
msgid ""
@@ -673,65 +607,62 @@ msgstr ""
#: ../../bin/catalog_update.inc:217
msgid ""
-"Depending on your systems performance, this option could need a long time to "
-"finish and extremely slow down other database processes if you have big "
+"Depending on your systems performance, this option could need a long time to"
+" finish and extremely slow down other database processes if you have big "
"catalogs!"
msgstr ""
#: ../../bin/catalog_update.inc:218
msgid ""
-"The switches [-m|-i|-o] can only be used, if one of the other switches [-c|-"
-"v|-a|-g] is used."
+"The switches [-m|-i|-o] can only be used, if one of the other switches "
+"[-c|-v|-a|-g] is used."
msgstr ""
-#: ../../bin/channel_run.inc:44
-#, fuzzy
+#: ../../bin/channel_run.inc:46
msgid "- Channel "
-msgstr "ØÙظ التغييرات"
+msgstr ""
-#: ../../bin/channel_run.inc:47 ../../bin/websocket_run.inc:42
+#: ../../bin/channel_run.inc:49 ../../bin/websocket_run.inc:42
msgid "- Verbose"
msgstr ""
-#: ../../bin/channel_run.inc:52 ../../bin/websocket_run.inc:47
+#: ../../bin/channel_run.inc:54 ../../bin/websocket_run.inc:47
msgid "- Port "
msgstr ""
-#: ../../bin/channel_run.inc:69
-#, fuzzy
+#: ../../bin/channel_run.inc:71
msgid "Starting Channel..."
-msgstr "إعدادات %s"
+msgstr ""
-#: ../../bin/channel_run.inc:73
-#, fuzzy
+#: ../../bin/channel_run.inc:75
msgid "Unknown channel."
-msgstr "غير معروÙ"
+msgstr ""
-#: ../../bin/channel_run.inc:88
+#: ../../bin/channel_run.inc:90
msgid "Found available port "
msgstr ""
-#: ../../bin/channel_run.inc:105
+#: ../../bin/channel_run.inc:107
msgid "Listening on "
msgstr ""
-#: ../../bin/channel_run.inc:473
+#: ../../bin/channel_run.inc:306
msgid "- Channel Listening -"
msgstr ""
-#: ../../bin/channel_run.inc:475
+#: ../../bin/channel_run.inc:308
msgid "Usage: channel_run.inc [-c {CHANNEL ID}|-p {PORT}|-v]"
msgstr ""
-#: ../../bin/channel_run.inc:478
+#: ../../bin/channel_run.inc:311
msgid "Channel id to start"
msgstr ""
-#: ../../bin/channel_run.inc:480
+#: ../../bin/channel_run.inc:313
msgid "Listening port, default get an available port automatically"
msgstr ""
-#: ../../bin/channel_run.inc:482 ../../bin/websocket_run.inc:74
+#: ../../bin/channel_run.inc:315 ../../bin/websocket_run.inc:74
msgid "Verbose"
msgstr ""
@@ -791,14 +722,14 @@ msgid "Finished checking file names for valid characters"
msgstr ""
#: ../../bin/fix_filenames.inc:104
-#, fuzzy, php-format
+#, php-format
msgid "ERROR: Unable to open %s"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
#: ../../bin/fix_filenames.inc:110
-#, fuzzy, php-format
+#, php-format
msgid "ERROR: Unable to chdir to %s"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
#: ../../bin/fix_filenames.inc:133
msgid "Translation failure, stripping non-valid characters"
@@ -828,9 +759,9 @@ msgid "Not Renaming..."
msgstr ""
#: ../../bin/fix_filenames.inc:182
-#, fuzzy, php-format
+#, php-format
msgid "Error: Unable to create %s move failed, stopping"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
#: ../../bin/fix_filenames.inc:194
msgid "Error: Copy Failed, not deleting old file"
@@ -842,9 +773,9 @@ msgid "Error: Size Inconsistency, not deleting %s"
msgstr ""
#: ../../bin/fix_filenames.inc:210 ../../bin/sort_files.inc:295
-#, fuzzy, php-format
+#, php-format
msgid "Error: Unable to delete %s"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
#: ../../bin/fix_filenames.inc:212
msgid "File Moved..."
@@ -856,35 +787,30 @@ msgid "Created %s user %s with password %s"
msgstr ""
#: ../../bin/install/add_user.inc:54
-#, fuzzy
msgid "User creation failed"
-msgstr "MySQL الإدارية اسم المستخدم"
+msgstr ""
#: ../../bin/install/install_db.inc:68
-#, fuzzy
msgid "Existing Ampache installation found."
-msgstr "Ampache التثبيت."
+msgstr ""
#: ../../bin/install/install_db.inc:70
msgid "Force specified, proceeding anyway."
msgstr ""
#: ../../bin/install/install_db.inc:73
-#, fuzzy
msgid "Exiting."
-msgstr "Ùوق القائمة"
+msgstr ""
#: ../../bin/install/install_db.inc:89
-#, fuzzy
msgid "Database creation failed"
-msgstr "الديسيبل الربط"
+msgstr ""
#: ../../bin/install/install_db.inc:101
-#, fuzzy
msgid "Config file creation failed"
-msgstr "خطأ : لم يتم العثور على مل٠أو غير صالØ"
+msgstr ""
-#: ../../bin/install/update_db.inc:44 ../../update.php:81
+#: ../../bin/install/update_db.inc:44 ../../update.php:82
msgid "The following updates need to be performed:"
msgstr ""
@@ -905,9 +831,8 @@ msgid "Access Denied, config migration failed"
msgstr ""
#: ../../bin/print_tags.inc:37
-#, fuzzy
msgid "File not found."
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../bin/print_tags.inc:43
#, php-format
@@ -929,23 +854,22 @@ msgid "Final results seen by Ampache using %s:"
msgstr ""
#: ../../bin/print_tags.inc:78
-#, fuzzy, php-format
+#, php-format
msgid "%s Version %s"
-msgstr "النسخة"
+msgstr ""
#: ../../bin/print_tags.inc:80
-#, fuzzy
msgid "Usage:"
-msgstr "مستخدم"
+msgstr ""
#: ../../bin/print_tags.inc:82
msgid "php print_tags.inc "
msgstr ""
#: ../../bin/sort_files.inc:61
-#, fuzzy, php-format
+#, php-format
msgid "Starting Catalog: %s"
-msgstr "إعدادات %s"
+msgstr ""
#: ../../bin/sort_files.inc:75
msgid "Moving File..."
@@ -967,9 +891,9 @@ msgid "Making %s Directory"
msgstr ""
#: ../../bin/sort_files.inc:236
-#, fuzzy, php-format
+#, php-format
msgid "Error: Unable to create %s move failed"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
#. HINT: %1$s: file, %2$s: directory
#: ../../bin/sort_files.inc:249
@@ -983,9 +907,9 @@ msgid "Error: %s already exists"
msgstr ""
#: ../../bin/sort_files.inc:281
-#, fuzzy, php-format
+#, php-format
msgid "Error: Unable to copy file to %s"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
#: ../../bin/websocket_run.inc:67
msgid "- WebSocket server -"
@@ -999,49 +923,50 @@ msgstr ""
msgid "Listening port, default 8100"
msgstr ""
-#: ../../bin/write_playlists.inc:38
-#, fuzzy, php-format
+#: ../../bin/write_playlists.inc:40
+#, php-format
msgid "Error: Directory %s is not writable"
-msgstr "خطأ : لم يتم العثور على مل٠أو غير صالØ"
-
-#: ../../bin/write_playlists.inc:59
-msgid "This will dump a collection of m3u playlists based on type"
msgstr ""
-#: ../../bin/write_playlists.inc:60
-#, fuzzy
-msgid "Types:"
-msgstr "نوع"
+#: ../../bin/write_playlists.inc:92
+msgid "This will dump a collection of playlists files based on type"
+msgstr ""
-#: ../../bin/write_playlists.inc:61
+#: ../../bin/write_playlists.inc:93
+msgid "Types:"
+msgstr ""
+
+#: ../../bin/write_playlists.inc:94
+msgid "Dumps all of your Playlists"
+msgstr ""
+
+#: ../../bin/write_playlists.inc:95
msgid "Dumps all Albums as individual playlists"
msgstr ""
-#: ../../bin/write_playlists.inc:62
-msgid "Dumps all of your Playlists as m3u's"
-msgstr ""
-
-#: ../../bin/write_playlists.inc:63
+#: ../../bin/write_playlists.inc:96
msgid "Dumps all Artists as individual playlists"
msgstr ""
+#: ../../bin/write_playlists.inc:97
+msgid "Extensions: m3u (default), xspf, pls"
+msgstr ""
+
#: ../../broadcast.php:38
-#, fuzzy
msgid "Broadcast Delete"
-msgstr "الÙنان والعنوان"
+msgstr ""
#: ../../broadcast.php:51
-#, fuzzy
msgid "Broadcast Deleted"
-msgstr "الÙنان والعنوان"
+msgstr ""
#: ../../broadcast.php:51
msgid "The Broadcast has been deleted"
msgstr ""
-#: ../../browse.php:92 ../../lib/class/browse.class.php:264
-#: ../../templates/sidebar_home.inc.php:38
-#: ../../templates/sidebar_home.inc.php:62
+#: ../../browse.php:92 ../../lib/class/browse.class.php:262
+#: ../../templates/sidebar_home.inc.php:42
+#: ../../templates/sidebar_home.inc.php:97
msgid "Tag Cloud"
msgstr "الوسم الغيمة"
@@ -1050,24 +975,20 @@ msgid "Unauthorized."
msgstr ""
#: ../../channel.php:61
-#, fuzzy
msgid "Channel Created"
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../channel.php:70
-#, fuzzy
msgid "Channel Delete"
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../channel.php:83
-#, fuzzy
msgid "Channel Deleted"
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../channel.php:83
-#, fuzzy
msgid "The Channel has been deleted"
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../democratic.php:57
msgid "The Requested Playlist has been deleted."
@@ -1077,181 +998,174 @@ msgstr ""
msgid "Error: Ampache SQL Username or Password missing"
msgstr ""
-#: ../../install.php:173
-#, fuzzy
+#: ../../install.php:175
msgid "Error: Config files not found or unreadable"
-msgstr "خطأ : لم يتم العثور على مل٠أو غير صالØ"
+msgstr ""
-#: ../../labels.php:34 ../../labels.php:52 ../../labels.php:54
-#, fuzzy
+#: ../../labels.php:36 ../../labels.php:56 ../../labels.php:58
msgid "Label Deletion"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../labels.php:35
+#: ../../labels.php:37
msgid "Are you sure you want to permanently delete this label?"
msgstr ""
-#: ../../labels.php:52
-#, fuzzy
+#: ../../labels.php:56
msgid "Label has been deleted."
-msgstr "ØØ°Ù"
+msgstr ""
-#: ../../labels.php:54
-#, fuzzy
+#: ../../labels.php:58
msgid "Cannot delete this label."
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
-#: ../../labels.php:81
-#, fuzzy
+#: ../../labels.php:85
msgid "Label Added"
-msgstr "أض٠الماضي"
+msgstr ""
-#: ../../labels.php:106
-#, fuzzy
+#: ../../labels.php:110
msgid "Label cannot be found."
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../lib/class/access.class.php:155 ../../lib/class/access.class.php:159
-#, fuzzy
+#: ../../lib/class/access.class.php:157 ../../lib/class/access.class.php:161
msgid "Invalid IPv4 / IPv6 Address Entered"
-msgstr "عناوين IPv4 أو IPv6"
+msgstr ""
-#: ../../lib/class/access.class.php:163 ../../lib/class/access.class.php:164
+#: ../../lib/class/access.class.php:165 ../../lib/class/access.class.php:166
msgid "IP Address Version Mismatch"
msgstr ""
-#: ../../lib/class/access.class.php:218
+#: ../../lib/class/access.class.php:220
msgid "Duplicate ACL defined"
msgstr ""
-#: ../../lib/class/access.class.php:458 ../../lib/class/access.class.php:479
-#: ../../lib/ui.lib.php:466 ../../templates/browse_filters.inc.php:74
-#: ../../templates/list_header.inc.php:117
+#: ../../lib/class/access.class.php:459 ../../lib/class/access.class.php:481
+#: ../../lib/ui.lib.php:463 ../../templates/browse_filters.inc.php:110
+#: ../../templates/list_header.inc.php:137
#: ../../templates/show_add_access.inc.php:38
-#: ../../templates/show_add_access.inc.php:55
-#: ../../templates/show_add_access.inc.php:61
+#: ../../templates/show_add_access.inc.php:58
+#: ../../templates/show_add_access.inc.php:70
#: ../../templates/show_edit_access.inc.php:72
#: ../../templates/show_export.inc.php:35
#: ../../templates/show_mail_users.inc.php:31
-#: ../../templates/show_random.inc.php:48
+#: ../../templates/show_random.inc.php:66
msgid "All"
msgstr "الكل"
-#: ../../lib/class/access.class.php:461
+#: ../../lib/class/access.class.php:462
#: ../../templates/show_add_access.inc.php:35
#: ../../templates/show_edit_access.inc.php:69
-#: ../../templates/show_graphs.inc.php:82
+#: ../../templates/show_graphs.inc.php:89
#: ../../templates/show_tagcloud.inc.php:33
msgid "View"
msgstr "عرض"
-#: ../../lib/class/access.class.php:464
+#: ../../lib/class/access.class.php:465
#: ../../templates/show_add_access.inc.php:36
#: ../../templates/show_edit_access.inc.php:70
msgid "Read"
msgstr "يقرأ"
-#: ../../lib/class/access.class.php:467
+#: ../../lib/class/access.class.php:468
#: ../../templates/show_add_access.inc.php:37
#: ../../templates/show_edit_access.inc.php:71
msgid "Read/Write"
msgstr "قراءة وكتابة"
-#: ../../lib/class/access.class.php:495
-#: ../../templates/show_add_access.inc.php:53
+#: ../../lib/class/access.class.php:498
#: ../../templates/show_add_access.inc.php:54
-#: ../../templates/show_add_access.inc.php:55
-#: ../../templates/show_add_access.inc.php:67
+#: ../../templates/show_add_access.inc.php:56
+#: ../../templates/show_add_access.inc.php:58
+#: ../../templates/show_add_access.inc.php:82
#: ../../templates/show_edit_access.inc.php:38
msgid "API/RPC"
msgstr ""
-#: ../../lib/class/access.class.php:497
-#: ../../templates/show_add_access.inc.php:59
-#: ../../templates/show_add_access.inc.php:60
-#: ../../templates/show_add_access.inc.php:61
+#: ../../lib/class/access.class.php:500
#: ../../templates/show_add_access.inc.php:66
+#: ../../templates/show_add_access.inc.php:68
+#: ../../templates/show_add_access.inc.php:70
+#: ../../templates/show_add_access.inc.php:80
#: ../../templates/show_edit_access.inc.php:37
msgid "Local Network Definition"
msgstr "تعري٠الشبكة المØلية"
-#: ../../lib/class/access.class.php:499
-#: ../../templates/show_add_access.inc.php:65
+#: ../../lib/class/access.class.php:502
+#: ../../templates/show_add_access.inc.php:78
#: ../../templates/show_edit_access.inc.php:36
msgid "Web Interface"
msgstr "واجهة ويب"
-#: ../../lib/class/access.class.php:502
-#: ../../templates/show_add_access.inc.php:54
-#: ../../templates/show_add_access.inc.php:60
-#: ../../templates/show_add_access.inc.php:64
+#: ../../lib/class/access.class.php:505
+#: ../../templates/show_add_access.inc.php:56
+#: ../../templates/show_add_access.inc.php:68
+#: ../../templates/show_add_access.inc.php:76
#: ../../templates/show_edit_access.inc.php:35
msgid "Stream Access"
msgstr "تيار الوصول"
-#: ../../lib/class/album.class.php:394 ../../lib/class/artist.class.php:656
+#: ../../lib/class/album.class.php:397 ../../lib/class/artist.class.php:662
#: ../../templates/show_album_group_disks.inc.php:50
#: ../../templates/show_lyrics.inc.php:32
-#, fuzzy
msgid "Unknown (Orphaned)"
-msgstr "غير معروÙ"
+msgstr ""
-#: ../../lib/class/album.class.php:630
-#: ../../lib/class/subsonic_xml_data.class.php:398
-#: ../../server/search.ajax.php:85
-#: ../../templates/show_album_group_disks.inc.php:99
+#: ../../lib/class/album.class.php:632
+#: ../../lib/class/subsonic_xml_data.class.php:420
+#: ../../server/search.ajax.php:87
+#: ../../templates/show_album_group_disks.inc.php:122
#: ../../templates/show_album.inc.php:31
-#: ../../templates/show_edit_album_row.inc.php:65
-#: ../../templates/show_song_previews.inc.php:36
+#: ../../templates/show_edit_album_row.inc.php:70
+#: ../../templates/show_song_previews.inc.php:40
msgid "Disk"
msgstr ""
-#: ../../lib/class/album.class.php:642 ../../lib/class/browse.class.php:227
-#: ../../lib/class/upnp_api.class.php:319 ../../lib/ui.lib.php:165
-#: ../../server/search.ajax.php:55 ../../templates/header.inc.php:355
-#: ../../templates/show_label.inc.php:91
-#: ../../templates/show_labels.inc.php:41
-#: ../../templates/show_labels.inc.php:69
-#: ../../templates/show_random.inc.php:29
-#: ../../templates/show_search_form.inc.php:30
-#: ../../templates/show_stats.inc.php:34 ../../templates/show_user.inc.php:103
+#: ../../lib/class/album.class.php:644 ../../lib/class/browse.class.php:225
+#: ../../lib/class/upnp_api.class.php:327 ../../lib/ui.lib.php:177
+#: ../../server/search.ajax.php:57 ../../templates/header.inc.php:409
+#: ../../templates/show_label.inc.php:119
+#: ../../templates/show_labels.inc.php:52
+#: ../../templates/show_labels.inc.php:92
+#: ../../templates/show_random.inc.php:43
+#: ../../templates/show_random.inc.php:46
+#: ../../templates/show_search_form.inc.php:44
+#: ../../templates/show_search_form.inc.php:47
+#: ../../templates/show_stats.inc.php:34 ../../templates/show_user.inc.php:142
#: ../../templates/sidebar_home.inc.php:34
-#: ../../templates/sidebar_home.inc.php:134
+#: ../../templates/sidebar_home.inc.php:228
#: ../../templates/sidebar.light.inc.php:28
msgid "Artists"
msgstr "الÙنانون"
-#: ../../lib/class/album.class.php:642 ../../lib/class/album.class.php:643
-#: ../../templates/show_edit_album_row.inc.php:37
-#, fuzzy
+#: ../../lib/class/album.class.php:644 ../../lib/class/album.class.php:645
+#: ../../templates/show_edit_album_row.inc.php:38
msgid "Various"
-msgstr "السابق"
+msgstr ""
-#: ../../lib/class/album.class.php:663
+#: ../../lib/class/album.class.php:664
msgid "Album MusicBrainzID"
msgstr ""
-#: ../../lib/class/album.class.php:666
+#: ../../lib/class/album.class.php:667
msgid "Release Group MusicBrainzID"
msgstr ""
-#: ../../lib/class/album.class.php:669 ../../lib/class/artist.class.php:488
-#: ../../lib/class/clip.class.php:125 ../../lib/class/search.class.php:222
-#: ../../lib/class/song.class.php:1360
-#: ../../templates/browse_filters.inc.php:66
-#: ../../templates/show_add_upload.inc.php:176
-#: ../../templates/show_albums.inc.php:36
-#: ../../templates/show_albums.inc.php:94
-#: ../../templates/show_artists.inc.php:36
-#: ../../templates/show_artists.inc.php:94
-#: ../../templates/show_democratic_playlist.inc.php:59
-#: ../../templates/show_democratic_playlist.inc.php:106
+#: ../../lib/class/album.class.php:670 ../../lib/class/artist.class.php:484
+#: ../../lib/class/clip.class.php:121 ../../lib/class/search.class.php:222
+#: ../../lib/class/search.class.php:420 ../../lib/class/song.class.php:1391
+#: ../../templates/browse_filters.inc.php:97
+#: ../../templates/show_add_upload.inc.php:179
+#: ../../templates/show_albums.inc.php:42
+#: ../../templates/show_albums.inc.php:131
+#: ../../templates/show_artists.inc.php:42
+#: ../../templates/show_artists.inc.php:131
+#: ../../templates/show_democratic_playlist.inc.php:69
+#: ../../templates/show_democratic_playlist.inc.php:144
#: ../../templates/show_disabled_songs.inc.php:31
-#: ../../templates/show_disabled_songs.inc.php:57
+#: ../../templates/show_disabled_songs.inc.php:70
#: ../../templates/show_duplicates.inc.php:29
-#: ../../templates/show_duplicates.inc.php:68
+#: ../../templates/show_duplicates.inc.php:80
#: ../../templates/show_edit_album_row.inc.php:31
-#: ../../templates/show_edit_song_row.inc.php:32
+#: ../../templates/show_edit_song_row.inc.php:34
#: ../../templates/show_lyrics.inc.php:53
#: ../../templates/show_missing_albums.inc.php:28
#: ../../templates/show_missing_artists.inc.php:27
@@ -1259,124 +1173,114 @@ msgstr ""
#: ../../templates/show_partial_clip.inc.php:23
#: ../../templates/show_partial_clips.inc.php:23
#: ../../templates/show_partial_edit_clip_row.inc.php:24
-#: ../../templates/show_playlist_songs.inc.php:33
-#: ../../templates/show_playlist_songs.inc.php:72
+#: ../../templates/show_playlist_songs.inc.php:35
+#: ../../templates/show_playlist_songs.inc.php:86
#: ../../templates/show_recently_played.inc.php:33
-#: ../../templates/show_recently_played.inc.php:152
+#: ../../templates/show_recently_played.inc.php:184
#: ../../templates/show_recommended_artists.inc.php:30
-#: ../../templates/show_recommended_artists.inc.php:79
+#: ../../templates/show_recommended_artists.inc.php:108
#: ../../templates/show_search_bar.inc.php:33
-#: ../../templates/show_song.inc.php:108
-#: ../../templates/show_song_previews.inc.php:33
-#: ../../templates/show_songs.inc.php:33 ../../templates/show_songs.inc.php:82
-#: ../../templates/show_tagcloud.inc.php:26
+#: ../../templates/show_song.inc.php:193
+#: ../../templates/show_song_previews.inc.php:37
+#: ../../templates/show_songs.inc.php:35
+#: ../../templates/show_songs.inc.php:107
+#: ../../templates/show_tagcloud.inc.php:24
#: ../../templates/show_wanted_albums.inc.php:27
-#: ../../templates/sidebar_home.inc.php:96
+#: ../../templates/sidebar_home.inc.php:158
msgid "Artist"
msgstr "الÙنان"
-#: ../../lib/class/album.class.php:672 ../../lib/class/search.class.php:215
-#: ../../templates/show_add_upload.inc.php:186
-#: ../../templates/show_albums.inc.php:34
-#: ../../templates/show_albums.inc.php:92
-#: ../../templates/show_democratic_playlist.inc.php:58
-#: ../../templates/show_democratic_playlist.inc.php:105
+#: ../../lib/class/album.class.php:673 ../../lib/class/search.class.php:215
+#: ../../templates/show_add_upload.inc.php:192
+#: ../../templates/show_albums.inc.php:40
+#: ../../templates/show_albums.inc.php:129
+#: ../../templates/show_democratic_playlist.inc.php:67
+#: ../../templates/show_democratic_playlist.inc.php:142
#: ../../templates/show_disabled_songs.inc.php:30
-#: ../../templates/show_disabled_songs.inc.php:56
+#: ../../templates/show_disabled_songs.inc.php:69
#: ../../templates/show_duplicates.inc.php:30
-#: ../../templates/show_duplicates.inc.php:69
-#: ../../templates/show_edit_song_row.inc.php:41
+#: ../../templates/show_duplicates.inc.php:81
+#: ../../templates/show_edit_song_row.inc.php:45
#: ../../templates/show_lyrics.inc.php:46
#: ../../templates/show_missing_albums.inc.php:27
#: ../../templates/show_now_playing_row.inc.php:43
-#: ../../templates/show_playlist_songs.inc.php:34
-#: ../../templates/show_playlist_songs.inc.php:73
+#: ../../templates/show_playlist_songs.inc.php:36
+#: ../../templates/show_playlist_songs.inc.php:87
#: ../../templates/show_recently_played.inc.php:32
-#: ../../templates/show_recently_played.inc.php:151
+#: ../../templates/show_recently_played.inc.php:183
#: ../../templates/show_search_bar.inc.php:32
-#: ../../templates/show_song.inc.php:112
-#: ../../templates/show_song_previews.inc.php:34
-#: ../../templates/show_songs.inc.php:34 ../../templates/show_songs.inc.php:83
+#: ../../templates/show_song.inc.php:197
+#: ../../templates/show_song_previews.inc.php:38
+#: ../../templates/show_songs.inc.php:36
+#: ../../templates/show_songs.inc.php:108
#: ../../templates/show_tagcloud.inc.php:25
#: ../../templates/show_wanted_albums.inc.php:26
-#: ../../templates/sidebar_home.inc.php:95
+#: ../../templates/sidebar_home.inc.php:157
msgid "Album"
msgstr "الألبوم"
-#: ../../lib/class/ampache_rss.class.php:91
-#: ../../lib/class/localplay.class.php:629 ../../templates/header.inc.php:38
+#: ../../lib/class/ampache_rss.class.php:92
+#: ../../lib/class/localplay.class.php:607 ../../templates/header.inc.php:40
#: ../../templates/show_localplay_status.inc.php:31
#: ../../templates/show_now_playing.inc.php:33
-#, fuzzy
msgid "Now Playing"
-msgstr "وتظهر قائمة التشغيل"
+msgstr ""
-#: ../../lib/class/ampache_rss.class.php:92 ../../templates/header.inc.php:39
+#: ../../lib/class/ampache_rss.class.php:93 ../../templates/header.inc.php:43
#: ../../templates/show_recently_played.inc.php:24
-#: ../../templates/show_user.inc.php:101
-#, fuzzy
+#: ../../templates/show_user.inc.php:139
msgid "Recently Played"
-msgstr "اللعب ÙÙŠ الوقت الØاضر"
+msgstr ""
-#: ../../lib/class/ampache_rss.class.php:93 ../../templates/header.inc.php:40
-#, fuzzy
+#: ../../lib/class/ampache_rss.class.php:94 ../../templates/header.inc.php:46
msgid "Newest Albums"
-msgstr "البوم"
+msgstr ""
-#: ../../lib/class/ampache_rss.class.php:94 ../../templates/header.inc.php:41
-#, fuzzy
+#: ../../lib/class/ampache_rss.class.php:95 ../../templates/header.inc.php:49
msgid "Newest Artists"
-msgstr "البوم"
+msgstr ""
-#: ../../lib/class/ampache_rss.class.php:95 ../../templates/header.inc.php:43
-#, fuzzy
+#: ../../lib/class/ampache_rss.class.php:96 ../../templates/header.inc.php:54
msgid "Newest Shouts"
-msgstr "ÙÙŠ مرØلة ما بعد الصيØØ©"
+msgstr ""
-#: ../../lib/class/ampache_rss.class.php:152
+#: ../../lib/class/ampache_rss.class.php:150
msgid "RSS Feed"
msgstr ""
-#: ../../lib/class/ampache_rss.class.php:232
+#: ../../lib/class/ampache_rss.class.php:227
msgid "seconds ago"
msgstr ""
-#: ../../lib/class/ampache_rss.class.php:232
+#: ../../lib/class/ampache_rss.class.php:227
msgid "minutes ago"
msgstr ""
-#: ../../lib/class/ampache_rss.class.php:232
+#: ../../lib/class/ampache_rss.class.php:227
msgid "hours ago"
msgstr ""
-#: ../../lib/class/ampache_rss.class.php:232
-#, fuzzy
+#: ../../lib/class/ampache_rss.class.php:227
msgid "days ago"
-msgstr "سنة"
+msgstr ""
-#: ../../lib/class/ampache_rss.class.php:232
+#: ../../lib/class/ampache_rss.class.php:227
msgid "weeks ago"
msgstr ""
-#: ../../lib/class/ampache_rss.class.php:232
+#: ../../lib/class/ampache_rss.class.php:227
msgid "months ago"
msgstr ""
-#: ../../lib/class/ampache_rss.class.php:232
-#, fuzzy
+#: ../../lib/class/ampache_rss.class.php:227
msgid "years ago"
-msgstr "سنة"
-
-#: ../../lib/class/ampache_rss.class.php:362
-msgid "Shout by"
msgstr ""
-#: ../../lib/class/ampache_rss.class.php:362
-#: ../../modules/plugins/Flattr.plugin.php:83
-#: ../../modules/plugins/Paypal.plugin.php:86
-#, fuzzy
+#: ../../lib/class/ampache_rss.class.php:354
+#: ../../modules/plugins/Flattr/Flattr.plugin.php:91
+#: ../../modules/plugins/Paypal/Paypal.plugin.php:94
msgid "on"
-msgstr "بلا"
+msgstr ""
#: ../../lib/class/ampconfig.class.php:85
#, php-format
@@ -1392,460 +1296,448 @@ msgid "Login Failed: timestamp out of range"
msgstr ""
#: ../../lib/class/api.class.php:172 ../../lib/class/api.class.php:184
-#: ../../lib/class/api.class.php:264
-#, fuzzy
+#: ../../lib/class/api.class.php:263
msgid "Error Invalid Handshake - "
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
#: ../../lib/class/api.class.php:183 ../../lib/class/api.class.php:184
-#: ../../lib/class/api.class.php:264
-#, fuzzy
+#: ../../lib/class/api.class.php:263
msgid "Invalid Username/Password"
-msgstr "لا اسم المستخدم / كلمة السر المØددة"
+msgstr ""
-#: ../../lib/class/api.class.php:661 ../../lib/class/api.class.php:679
-#: ../../lib/class/api.class.php:698
-#, fuzzy
+#: ../../lib/class/api.class.php:642 ../../lib/class/api.class.php:660
+#: ../../lib/class/api.class.php:678
msgid "Access denied to this playlist."
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../lib/class/api.class.php:789 ../../lib/class/api.class.php:851
-#: ../../server/xml.server.php:101
-#, fuzzy
+#: ../../lib/class/api.class.php:796 ../../lib/class/api.class.php:857
+#: ../../server/xml.server.php:102
msgid "Invalid Request"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
-#: ../../lib/class/api.class.php:811 ../../lib/class/api.class.php:829
+#: ../../lib/class/api.class.php:817 ../../lib/class/api.class.php:835
msgid "Media Object Invalid or Not Specified"
msgstr ""
-#: ../../lib/class/art.class.php:1233
-#, fuzzy
-msgid "Error: Unable to open"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+#: ../../lib/class/api.class.php:1050
+msgid "Wrong library item type."
+msgstr ""
-#: ../../lib/class/art.class.php:1709 ../../lib/class/shoutbox.class.php:300
-#: ../../modules/plugins/CatalogFavorites.plugin.php:99
+#: ../../lib/class/api.class.php:1054
+msgid "Library item not found."
+msgstr ""
+
+#: ../../lib/class/art.class.php:1244
+msgid "Error: Unable to open"
+msgstr ""
+
+#: ../../lib/class/art.class.php:1730 ../../lib/class/shoutbox.class.php:309
+#: ../../modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php:112
#: ../../templates/rightbar.inc.php:25
-#: ../../templates/show_album_group_disks.inc.php:61
#: ../../templates/show_album_group_disks.inc.php:62
-#: ../../templates/show_album_group_disks.inc.php:113
-#: ../../templates/show_album.inc.php:96 ../../templates/show_album.inc.php:97
-#: ../../templates/show_album_row.inc.php:27
-#: ../../templates/show_artist_row.inc.php:27
+#: ../../templates/show_album_group_disks.inc.php:64
+#: ../../templates/show_album_group_disks.inc.php:137
+#: ../../templates/show_album.inc.php:114
+#: ../../templates/show_album.inc.php:116
+#: ../../templates/show_album_row.inc.php:28
+#: ../../templates/show_artist_row.inc.php:28
#: ../../templates/show_broadcast_row.inc.php:27
#: ../../templates/show_channel_row.inc.php:27
-#: ../../templates/show_democratic.inc.php:41
+#: ../../templates/show_democratic.inc.php:50
#: ../../templates/show_localplay_control.inc.php:27
-#: ../../templates/show_manage_democratic.inc.php:49
-#: ../../templates/show_playlist_row.inc.php:27
-#: ../../templates/show_playlist_song_row.inc.php:27
-#: ../../templates/show_playlist_songs.inc.php:69
-#: ../../templates/show_random_albums.inc.php:46
-#: ../../templates/show_random_videos.inc.php:44
-#: ../../templates/show_recently_played.inc.php:101
-#: ../../templates/show_search_row.inc.php:27
-#: ../../templates/show_song.inc.php:61
-#: ../../templates/show_song_preview_row.inc.php:26
-#: ../../templates/show_song_row.inc.php:27
-#: ../../templates/show_tvshow_row.inc.php:27
-#: ../../templates/show_tvshow_season_row.inc.php:27
-#: ../../templates/show_video.inc.php:78
-#: ../../templates/show_video_row.inc.php:32
+#: ../../templates/show_manage_democratic.inc.php:56
+#: ../../templates/show_playlist_row.inc.php:28
+#: ../../templates/show_playlist_song_row.inc.php:31
+#: ../../templates/show_playlist_songs.inc.php:83
+#: ../../templates/show_random_albums.inc.php:59
+#: ../../templates/show_random_videos.inc.php:49
+#: ../../templates/show_recently_played.inc.php:106
+#: ../../templates/show_search_row.inc.php:28
+#: ../../templates/show_song.inc.php:91
+#: ../../templates/show_song_preview_row.inc.php:28
+#: ../../templates/show_song_row.inc.php:37
+#: ../../templates/show_tvshow_row.inc.php:28
+#: ../../templates/show_tvshow_season_row.inc.php:28
+#: ../../templates/show_video.inc.php:104
+#: ../../templates/show_video_row.inc.php:33
msgid "Play"
msgstr "تشغيل"
-#: ../../lib/class/art.class.php:1717
-#, fuzzy
+#: ../../lib/class/art.class.php:1738
msgid "Edit/Find Art"
-msgstr "الÙنان"
+msgstr ""
-#: ../../lib/class/art.class.php:1720
+#: ../../lib/class/art.class.php:1741
msgid "Do you really want to reset art?"
msgstr ""
-#: ../../lib/class/art.class.php:1721
-#, fuzzy
+#: ../../lib/class/art.class.php:1742
msgid "Reset Art"
-msgstr "البوم الÙÙ†"
+msgstr ""
-#: ../../lib/class/artist.class.php:485
+#: ../../lib/class/artist.class.php:481
msgid "Artist MusicBrainzID"
msgstr ""
-#: ../../lib/class/autoupdate.class.php:229
+#: ../../lib/class/autoupdate.class.php:230
msgid "Update available"
msgstr ""
-#: ../../lib/class/autoupdate.class.php:232
+#: ../../lib/class/autoupdate.class.php:233
msgid "See"
msgstr ""
-#: ../../lib/class/autoupdate.class.php:232
-#, fuzzy
-msgid "changes"
-msgstr "ØÙظ التغييرات"
-
#: ../../lib/class/autoupdate.class.php:233
+msgid "changes"
+msgstr ""
+
+#: ../../lib/class/autoupdate.class.php:234
msgid "or"
msgstr ""
-#: ../../lib/class/autoupdate.class.php:233
-#, fuzzy
+#: ../../lib/class/autoupdate.class.php:234
msgid "download"
-msgstr "تنزيل"
-
-#: ../../lib/class/autoupdate.class.php:245
-msgid "Updating Ampache sources with `git pull` ..."
msgstr ""
-#: ../../lib/class/autoupdate.class.php:249
+#: ../../lib/class/autoupdate.class.php:247
+msgid "Updating Ampache sources with `"
+msgstr ""
+
+#: ../../lib/class/autoupdate.class.php:251
+#: ../../lib/class/autoupdate.class.php:266
msgid "Done"
msgstr ""
-#: ../../lib/class/broadcast.class.php:356
-#, fuzzy
-msgid "Broadcast edit"
-msgstr "الÙنان والعنوان"
+#: ../../lib/class/autoupdate.class.php:262
+msgid "Updating dependencies with `"
+msgstr ""
-#: ../../lib/class/broadcast.class.php:356
-#: ../../lib/class/channel.class.php:180 ../../lib/class/share.class.php:200
-#: ../../templates/show_access_list.inc.php:70
-#: ../../templates/show_album_group_disks.inc.php:143
-#: ../../templates/show_album.inc.php:162
-#: ../../templates/show_album_row.inc.php:92
-#: ../../templates/show_artist.inc.php:165
-#: ../../templates/show_artist_row.inc.php:89
-#: ../../templates/show_label.inc.php:71
-#: ../../templates/show_label_row.inc.php:46
+#: ../../lib/class/broadcast.class.php:358
+msgid "Broadcast edit"
+msgstr ""
+
+#: ../../lib/class/broadcast.class.php:358
+#: ../../lib/class/channel.class.php:186 ../../lib/class/share.class.php:206
+#: ../../templates/show_access_list.inc.php:87
+#: ../../templates/show_album_group_disks.inc.php:195
+#: ../../templates/show_album.inc.php:255
+#: ../../templates/show_album_row.inc.php:125
+#: ../../templates/show_artist.inc.php:262
+#: ../../templates/show_artist_row.inc.php:110
+#: ../../templates/show_label.inc.php:90
#: ../../templates/show_license_row.inc.php:28
-#: ../../templates/show_live_stream_row.inc.php:37
-#: ../../templates/show_playlist_row.inc.php:73
-#: ../../templates/show_search_row.inc.php:55
+#: ../../templates/show_live_stream_row.inc.php:41
+#: ../../templates/show_playlist_row.inc.php:97
+#: ../../templates/show_search_row.inc.php:64
#: ../../templates/show_shout_row.inc.php:31
-#: ../../templates/show_song.inc.php:91 ../../templates/show_song.inc.php:92
-#: ../../templates/show_song_row.inc.php:82
-#: ../../templates/show_tagcloud.inc.php:59
-#: ../../templates/show_tvshow.inc.php:73
-#: ../../templates/show_tvshow_row.inc.php:56
-#: ../../templates/show_tvshow_season.inc.php:68
-#: ../../templates/show_tvshow_season_row.inc.php:55
-#: ../../templates/show_user.inc.php:64 ../../templates/show_user.inc.php:67
-#: ../../templates/show_user_row.inc.php:53
-#: ../../templates/show_video.inc.php:99
-#: ../../templates/show_video.inc.php:100
-#: ../../templates/show_video_row.inc.php:94
+#: ../../templates/show_song.inc.php:165 ../../templates/show_song.inc.php:166
+#: ../../templates/show_song_row.inc.php:118
+#: ../../templates/show_tagcloud.inc.php:64
+#: ../../templates/show_tvshow.inc.php:96
+#: ../../templates/show_tvshow_row.inc.php:73
+#: ../../templates/show_tvshow_season.inc.php:88
+#: ../../templates/show_tvshow_season_row.inc.php:74
+#: ../../templates/show_user.inc.php:75 ../../templates/show_user.inc.php:85
+#: ../../templates/show_user_row.inc.php:86
+#: ../../templates/show_video.inc.php:162
+#: ../../templates/show_video.inc.php:163
+#: ../../templates/show_video_row.inc.php:116
msgid "Edit"
msgstr "تØرير"
-#: ../../lib/class/broadcast.class.php:357
-#: ../../lib/class/channel.class.php:181 ../../lib/class/share.class.php:201
-#: ../../templates/rightbar.inc.php:122
-#: ../../templates/show_access_list.inc.php:71
-#: ../../templates/show_account.inc.php:87
-#: ../../templates/show_album.inc.php:178
-#: ../../templates/show_album_row.inc.php:97
-#: ../../templates/show_artist.inc.php:175
-#: ../../templates/show_artist_row.inc.php:94
-#: ../../templates/show_catalog_row.inc.php:46
-#: ../../templates/show_democratic_playlist.inc.php:92
-#: ../../templates/show_edit_user.inc.php:120
-#: ../../templates/show_label.inc.php:81
-#: ../../templates/show_label_row.inc.php:51
+#: ../../lib/class/broadcast.class.php:359
+#: ../../lib/class/channel.class.php:187 ../../lib/class/share.class.php:207
+#: ../../templates/rightbar.inc.php:140
+#: ../../templates/show_access_list.inc.php:91
+#: ../../templates/show_account.inc.php:103
+#: ../../templates/show_album.inc.php:285
+#: ../../templates/show_album.inc.php:286
+#: ../../templates/show_album_row.inc.php:131
+#: ../../templates/show_artist.inc.php:278
+#: ../../templates/show_artist.inc.php:279
+#: ../../templates/show_artist_row.inc.php:120
+#: ../../templates/show_catalog_row.inc.php:58
+#: ../../templates/show_democratic_playlist.inc.php:122
+#: ../../templates/show_edit_user.inc.php:123
+#: ../../templates/show_label.inc.php:106
+#: ../../templates/show_label.inc.php:107
+#: ../../templates/show_label_row.inc.php:49
#: ../../templates/show_license_row.inc.php:31
-#: ../../templates/show_live_stream_row.inc.php:41
-#: ../../templates/show_localplay_instances.inc.php:40
-#: ../../templates/show_localplay_playlist.inc.php:50
-#: ../../templates/show_manage_democratic.inc.php:50
-#: ../../templates/show_playlist.inc.php:107
-#: ../../templates/show_playlist_row.inc.php:75
-#: ../../templates/show_playlist_song_row.inc.php:69
+#: ../../templates/show_live_stream_row.inc.php:47
+#: ../../templates/show_localplay_instances.inc.php:52
+#: ../../templates/show_localplay_playlist.inc.php:59
+#: ../../templates/show_manage_democratic.inc.php:60
+#: ../../templates/show_playlist.inc.php:159
+#: ../../templates/show_playlist_row.inc.php:100
+#: ../../templates/show_playlist_song_row.inc.php:84
#: ../../templates/show_pvmsg_row.inc.php:34
#: ../../templates/show_pvmsgs.inc.php:40
-#: ../../templates/show_search.inc.php:47
-#: ../../templates/show_search_row.inc.php:57
+#: ../../templates/show_search.inc.php:57
+#: ../../templates/show_search_row.inc.php:68
#: ../../templates/show_shout_row.inc.php:34
-#: ../../templates/show_song.inc.php:102
-#: ../../templates/show_song_row.inc.php:94
-#: ../../templates/show_tagcloud.inc.php:63
-#: ../../templates/show_tvshow.inc.php:83
-#: ../../templates/show_tvshow_row.inc.php:61
-#: ../../templates/show_tvshow_season.inc.php:78
-#: ../../templates/show_tvshow_season_row.inc.php:60
-#: ../../templates/show_user_row.inc.php:63
-#: ../../templates/show_video.inc.php:105
-#: ../../templates/show_video_row.inc.php:99
+#: ../../templates/show_song.inc.php:185
+#: ../../templates/show_song_row.inc.php:139
+#: ../../templates/show_tagcloud.inc.php:71
+#: ../../templates/show_tvshow.inc.php:112
+#: ../../templates/show_tvshow.inc.php:113
+#: ../../templates/show_tvshow_row.inc.php:84
+#: ../../templates/show_tvshow_season.inc.php:104
+#: ../../templates/show_tvshow_season.inc.php:105
+#: ../../templates/show_tvshow_season_row.inc.php:84
+#: ../../templates/show_user_row.inc.php:106
+#: ../../templates/show_video.inc.php:173
+#: ../../templates/show_video_row.inc.php:124
msgid "Delete"
msgstr "ØØ°Ù"
-#: ../../lib/class/broadcast.class.php:369
-#, fuzzy
+#: ../../lib/class/broadcast.class.php:371
msgid "Broadcast"
-msgstr "الÙنان والعنوان"
+msgstr ""
-#: ../../lib/class/broadcast.class.php:382
-#, fuzzy
+#: ../../lib/class/broadcast.class.php:384
msgid "Unbroadcast"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../lib/class/browse.class.php:205 ../../lib/class/browse.class.php:286
-#: ../../lib/class/upnp_api.class.php:367 ../../server/index.ajax.php:318
-#: ../../server/search.ajax.php:117 ../../templates/show_albums.inc.php:37
-#: ../../templates/show_albums.inc.php:95
-#: ../../templates/show_artists.inc.php:38
-#: ../../templates/show_artists.inc.php:96
-#: ../../templates/show_label.inc.php:92
-#: ../../templates/show_label.inc.php:106
+#: ../../lib/class/browse.class.php:203 ../../lib/class/browse.class.php:284
+#: ../../lib/class/upnp_api.class.php:375 ../../server/index.ajax.php:324
+#: ../../server/search.ajax.php:119 ../../templates/show_albums.inc.php:43
+#: ../../templates/show_albums.inc.php:132
+#: ../../templates/show_artists.inc.php:44
+#: ../../templates/show_artists.inc.php:133
+#: ../../templates/show_label.inc.php:120
+#: ../../templates/show_label.inc.php:134
#: ../../templates/show_manage_democratic.inc.php:31
-#: ../../templates/show_random.inc.php:27
+#: ../../templates/show_random.inc.php:29
+#: ../../templates/show_random.inc.php:32
#: ../../templates/show_recommended_artists.inc.php:32
-#: ../../templates/show_recommended_artists.inc.php:81
-#: ../../templates/show_search_form.inc.php:28
+#: ../../templates/show_recommended_artists.inc.php:110
+#: ../../templates/show_search_form.inc.php:30
+#: ../../templates/show_search_form.inc.php:33
#: ../../templates/show_stats.inc.php:35 ../../templates/show_stats.inc.php:75
-#: ../../templates/sidebar_home.inc.php:132
+#: ../../templates/sidebar_home.inc.php:226
msgid "Songs"
msgstr "الأغاني"
-#: ../../lib/class/browse.class.php:211 ../../lib/class/upnp_api.class.php:343
-#: ../../lib/ui.lib.php:161 ../../server/search.ajax.php:88
-#: ../../templates/browse_filters.inc.php:63
-#: ../../templates/show_artist.inc.php:185
-#: ../../templates/show_artists.inc.php:39
-#: ../../templates/show_artists.inc.php:97
-#: ../../templates/show_random.inc.php:28
+#: ../../lib/class/browse.class.php:209 ../../lib/class/upnp_api.class.php:351
+#: ../../lib/ui.lib.php:173 ../../server/search.ajax.php:90
+#: ../../templates/browse_filters.inc.php:92
+#: ../../templates/show_artist.inc.php:291
+#: ../../templates/show_artists.inc.php:45
+#: ../../templates/show_artists.inc.php:134
+#: ../../templates/show_random.inc.php:36
+#: ../../templates/show_random.inc.php:39
#: ../../templates/show_recommended_artists.inc.php:33
-#: ../../templates/show_recommended_artists.inc.php:82
-#: ../../templates/show_search_form.inc.php:29
+#: ../../templates/show_recommended_artists.inc.php:111
+#: ../../templates/show_search_form.inc.php:37
+#: ../../templates/show_search_form.inc.php:40
#: ../../templates/show_stats.inc.php:33
#: ../../templates/sidebar_home.inc.php:33
-#: ../../templates/sidebar_home.inc.php:133
+#: ../../templates/sidebar_home.inc.php:227
msgid "Albums"
msgstr "البوم"
-#: ../../lib/class/browse.class.php:223 ../../server/search.ajax.php:226
-#, fuzzy
+#: ../../lib/class/browse.class.php:221 ../../server/search.ajax.php:229
msgid "Users"
-msgstr "مستخدم"
+msgstr ""
-#: ../../lib/class/browse.class.php:233
-#: ../../templates/sidebar_home.inc.php:48
+#: ../../lib/class/browse.class.php:231 ../../lib/class/upnp_api.class.php:447
+#: ../../templates/sidebar_home.inc.php:62
msgid "Radio Stations"
msgstr "Ù…Øطات إذاعية"
-#: ../../lib/class/browse.class.php:238 ../../lib/class/upnp_api.class.php:391
-#: ../../server/search.ajax.php:146 ../../templates/header.inc.php:361
-#: ../../templates/show_user.inc.php:105
-#: ../../templates/sidebar_home.inc.php:39
-#: ../../templates/sidebar_home.inc.php:135
+#: ../../lib/class/browse.class.php:236 ../../lib/class/upnp_api.class.php:399
+#: ../../server/search.ajax.php:148 ../../templates/header.inc.php:418
+#: ../../templates/show_user.inc.php:146
+#: ../../templates/sidebar_home.inc.php:43
+#: ../../templates/sidebar_home.inc.php:229
#: ../../templates/sidebar.light.inc.php:29
msgid "Playlists"
msgstr "التشغيل"
-#: ../../lib/class/browse.class.php:242
-#, fuzzy
+#: ../../lib/class/browse.class.php:240
msgid "Playlist Songs"
-msgstr "التشغيل"
+msgstr ""
-#: ../../lib/class/browse.class.php:246
-#, fuzzy
+#: ../../lib/class/browse.class.php:244
msgid "Current Playlist"
-msgstr "اللعب ÙÙŠ الوقت الØاضر"
+msgstr ""
-#: ../../lib/class/browse.class.php:251 ../../lib/class/upnp_api.class.php:415
-#: ../../templates/sidebar_home.inc.php:40
-#, fuzzy
+#: ../../lib/class/browse.class.php:249 ../../lib/class/upnp_api.class.php:423
+#: ../../templates/sidebar_home.inc.php:44
msgid "Smart Playlists"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../lib/class/browse.class.php:255 ../../templates/show_stats.inc.php:27
+#: ../../lib/class/browse.class.php:253 ../../templates/show_stats.inc.php:27
#: ../../templates/sidebar_admin.inc.php:24
-#, fuzzy
msgid "Catalogs"
-msgstr "نوع التسويقي"
+msgstr ""
-#: ../../lib/class/browse.class.php:259
+#: ../../lib/class/browse.class.php:257
msgid "Shoutbox Records"
msgstr ""
-#: ../../lib/class/browse.class.php:270
-#: ../../templates/show_search_form.inc.php:31
+#: ../../lib/class/browse.class.php:268
+#: ../../templates/show_search_form.inc.php:51
+#: ../../templates/show_search_form.inc.php:54
#: ../../templates/show_stats.inc.php:36 ../../templates/show_stats.inc.php:76
-#: ../../templates/sidebar_home.inc.php:137
+#: ../../templates/sidebar_home.inc.php:233
msgid "Videos"
msgstr "الÙيديو"
-#: ../../lib/class/browse.class.php:274
+#: ../../lib/class/browse.class.php:272
#: ../../templates/show_democratic.inc.php:23
-#, fuzzy
msgid "Democratic Playlist"
-msgstr "إدارة التشغيل الديمقراطية"
+msgstr ""
-#: ../../lib/class/browse.class.php:278
-#, fuzzy
+#: ../../lib/class/browse.class.php:276
msgid "Wanted Albums"
-msgstr "البوم"
+msgstr ""
-#: ../../lib/class/browse.class.php:282
-#: ../../templates/sidebar_home.inc.php:118
-#, fuzzy
+#: ../../lib/class/browse.class.php:280
+#: ../../templates/sidebar_home.inc.php:198
msgid "Shared Objects"
-msgstr "ØØ°Ù"
+msgstr ""
-#: ../../lib/class/browse.class.php:290 ../../templates/show_song.inc.php:124
-#: ../../templates/show_video.inc.php:122
-#: ../../templates/sidebar_home.inc.php:42
-#, fuzzy
+#: ../../lib/class/browse.class.php:288 ../../templates/show_song.inc.php:209
+#: ../../templates/show_video.inc.php:192
+#: ../../templates/sidebar_home.inc.php:48
msgid "Channels"
-msgstr "ØÙظ التغييرات"
+msgstr ""
-#: ../../lib/class/browse.class.php:294
-#: ../../templates/sidebar_home.inc.php:45
-#, fuzzy
+#: ../../lib/class/browse.class.php:292
+#: ../../templates/sidebar_home.inc.php:55
msgid "Broadcasts"
-msgstr "الÙنان والعنوان"
+msgstr ""
-#: ../../lib/class/browse.class.php:298
+#: ../../lib/class/browse.class.php:296
msgid "Media Licenses"
msgstr ""
-#: ../../lib/class/browse.class.php:302 ../../lib/class/upnp_api.class.php:627
-#: ../../templates/sidebar_home.inc.php:59
-#, fuzzy
+#: ../../lib/class/browse.class.php:300 ../../lib/class/upnp_api.class.php:675
+#: ../../templates/sidebar_home.inc.php:88
msgid "TV Shows"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../lib/class/browse.class.php:306 ../../templates/show_tvshow.inc.php:93
-#: ../../templates/show_tvshows.inc.php:38
-#: ../../templates/show_tvshows.inc.php:80
-#, fuzzy
+#: ../../lib/class/browse.class.php:304
+#: ../../templates/show_tvshow.inc.php:125
+#: ../../templates/show_tvshows.inc.php:44
+#: ../../templates/show_tvshows.inc.php:114
msgid "Seasons"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../lib/class/browse.class.php:310
-#: ../../templates/show_tvshow_season.inc.php:88
-#: ../../templates/show_tvshow_seasons.inc.php:36
-#: ../../templates/show_tvshow_seasons.inc.php:75
-#: ../../templates/show_tvshows.inc.php:37
-#: ../../templates/show_tvshows.inc.php:79
+#: ../../lib/class/browse.class.php:308
+#: ../../templates/show_tvshow_season.inc.php:117
+#: ../../templates/show_tvshow_seasons.inc.php:42
+#: ../../templates/show_tvshow_seasons.inc.php:109
+#: ../../templates/show_tvshows.inc.php:43
+#: ../../templates/show_tvshows.inc.php:113
msgid "Episodes"
msgstr ""
-#: ../../lib/class/browse.class.php:315 ../../lib/class/upnp_api.class.php:691
-#: ../../templates/sidebar_home.inc.php:60
+#: ../../lib/class/browse.class.php:313 ../../lib/class/upnp_api.class.php:739
+#: ../../templates/sidebar_home.inc.php:91
msgid "Movies"
msgstr ""
-#: ../../lib/class/browse.class.php:320 ../../lib/class/upnp_api.class.php:667
+#: ../../lib/class/browse.class.php:318 ../../lib/class/upnp_api.class.php:715
msgid "Clips"
msgstr ""
-#: ../../lib/class/browse.class.php:325 ../../lib/class/upnp_api.class.php:715
-#: ../../templates/sidebar_home.inc.php:61
+#: ../../lib/class/browse.class.php:323 ../../lib/class/upnp_api.class.php:763
+#: ../../templates/sidebar_home.inc.php:94
msgid "Personal Videos"
msgstr ""
-#: ../../lib/class/browse.class.php:330 ../../server/search.ajax.php:176
-#: ../../templates/show_artist.inc.php:196
-#: ../../templates/show_artist.inc.php:250
-#: ../../templates/show_edit_artist_row.inc.php:58
-#: ../../templates/sidebar_home.inc.php:36
+#: ../../lib/class/browse.class.php:328 ../../server/search.ajax.php:178
+#: ../../templates/show_artist.inc.php:312
+#: ../../templates/show_artist.inc.php:380
+#: ../../templates/show_edit_artist_row.inc.php:62
+#: ../../templates/sidebar_home.inc.php:38
msgid "Labels"
msgstr ""
-#: ../../lib/class/browse.class.php:334
-#, fuzzy
+#: ../../lib/class/browse.class.php:332
msgid "Private Messages"
-msgstr "تÙعيل"
+msgstr ""
-#: ../../lib/class/browse.class.php:376 ../../templates/rightbar.inc.php:129
-#: ../../templates/show_recently_played.inc.php:168
+#: ../../lib/class/browse.class.php:373 ../../templates/rightbar.inc.php:154
+#: ../../templates/show_recently_played.inc.php:203
msgid "More"
msgstr ""
-#: ../../lib/class/catalog.class.php:506 ../../lib/class/catalog.class.php:509
-#: ../../lib/class/catalog.class.php:512 ../../lib/class/user.class.php:971
-#: ../../lib/preferences.php:314 ../../templates/show_user.inc.php:23
-#: ../../templates/show_users.inc.php:64
+#: ../../lib/class/catalog.class.php:513 ../../lib/class/catalog.class.php:516
+#: ../../lib/class/catalog.class.php:519 ../../lib/class/user.class.php:998
+#: ../../lib/preferences.php:339 ../../templates/show_user.inc.php:23
+#: ../../templates/show_users.inc.php:81
msgid "Never"
msgstr "أبدا"
-#: ../../lib/class/catalog.class.php:586
+#: ../../lib/class/catalog.class.php:593
msgid "day"
msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-#: ../../lib/class/catalog.class.php:588
+#: ../../lib/class/catalog.class.php:595
msgid "hour"
msgid_plural "hours"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-#: ../../lib/class/catalog.class.php:633
+#: ../../lib/class/catalog.class.php:640
msgid "Catalog Insert Failed check debug logs"
msgstr ""
-#: ../../lib/class/catalog.class.php:1396
+#: ../../lib/class/catalog.class.php:1410
msgid "No Update Needed"
msgstr ""
-#: ../../lib/class/catalog.class.php:1607
+#: ../../lib/class/catalog.class.php:1630
#, php-format
msgid "Catalog Clean Done. %d file removed."
msgid_plural "Catalog Clean Done. %d files removed."
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-#: ../../lib/class/catalog.class.php:1632
+#: ../../lib/class/catalog.class.php:1655
#, php-format
msgid "Catalog Verify Done. %d of %d files updated."
msgstr ""
-#: ../../lib/class/catalog.class.php:1785
-#, fuzzy
+#: ../../lib/class/catalog.class.php:1821
msgid "Failed to create playlist."
-msgstr "إدارة التشغيل الديمقراطية"
+msgstr ""
-#: ../../lib/class/catalog.class.php:1802
+#: ../../lib/class/catalog.class.php:1838
msgid "No valid songs found in playlist file."
msgstr ""
-#: ../../lib/class/channel.class.php:178
-#, fuzzy
+#: ../../lib/class/catalog.class.php:2195
+msgid ""
+"This subdirectory is not part of an existing catalog. Update cannot be "
+"processed."
+msgstr ""
+
+#: ../../lib/class/channel.class.php:184
msgid "Start Channel"
-msgstr "ØÙظ التغييرات"
+msgstr ""
-#: ../../lib/class/channel.class.php:179
-#, fuzzy
+#: ../../lib/class/channel.class.php:185
msgid "Stop Channel"
-msgstr "ØÙظ التغييرات"
+msgstr ""
-#: ../../lib/class/channel.class.php:180
-#, fuzzy
+#: ../../lib/class/channel.class.php:186
msgid "Channel edit"
-msgstr "ØØ°Ù"
+msgstr ""
-#: ../../lib/class/channel.class.php:331
+#: ../../lib/class/channel.class.php:337
msgid "Running"
msgstr ""
-#: ../../lib/class/channel.class.php:333
-#: ../../lib/class/localplay.class.php:631
-#, fuzzy
+#: ../../lib/class/channel.class.php:339
+#: ../../lib/class/localplay.class.php:609
msgid "Stopped"
-msgstr "توقÙ"
+msgstr ""
#: ../../lib/class/democratic.class.php:153
#: ../../lib/class/video.class.php:283
@@ -1859,85 +1751,80 @@ msgstr ""
#: ../../lib/class/democratic.class.php:164
#: ../../templates/show_add_user.inc.php:87
-#: ../../templates/show_create_democratic.inc.php:43
-#: ../../templates/show_edit_user.inc.php:108
-#: ../../templates/show_preference_box.inc.php:64
+#: ../../templates/show_create_democratic.inc.php:47
+#: ../../templates/show_edit_user.inc.php:111
+#: ../../templates/show_preference_box.inc.php:84
msgid "Content Manager"
msgstr "إدارة المØتوى"
#: ../../lib/class/democratic.class.php:167
#: ../../templates/show_add_user.inc.php:88
-#: ../../templates/show_create_democratic.inc.php:44
-#: ../../templates/show_edit_user.inc.php:109
-#: ../../templates/show_preference_box.inc.php:65
+#: ../../templates/show_create_democratic.inc.php:50
+#: ../../templates/show_edit_user.inc.php:112
+#: ../../templates/show_preference_box.inc.php:87
msgid "Catalog Manager"
msgstr "المدير التسويقي"
-#: ../../lib/class/label.class.php:150 ../../lib/class/search.class.php:243
-#: ../../templates/show_edit_song_row.inc.php:69
-#: ../../templates/show_labels.inc.php:39
-#: ../../templates/show_labels.inc.php:67
-#: ../../templates/show_search_bar.inc.php:37
-#: ../../templates/show_song.inc.php:120
+#: ../../lib/class/label.class.php:152 ../../lib/class/search.class.php:243
+#: ../../templates/show_edit_song_row.inc.php:82
+#: ../../templates/show_labels.inc.php:50
+#: ../../templates/show_labels.inc.php:90
+#: ../../templates/show_search_bar.inc.php:38
+#: ../../templates/show_song.inc.php:205
msgid "Label"
msgstr ""
#: ../../lib/class/live_stream.class.php:185
-#: ../../lib/class/live_stream.class.php:216
-#, fuzzy
+#: ../../lib/class/live_stream.class.php:222
msgid "Name Required"
-msgstr "مطلوب"
+msgstr ""
#: ../../lib/class/live_stream.class.php:193
msgid "Invalid URL must be mms:// , https:// or http://"
msgstr ""
-#: ../../lib/class/live_stream.class.php:224
+#: ../../lib/class/live_stream.class.php:199
+#: ../../lib/class/live_stream.class.php:230
+#: ../../lib/class/live_stream.class.php:236
msgid "Invalid URL must be http:// or https://"
msgstr ""
-#: ../../lib/class/live_stream.class.php:230
-#, fuzzy
+#: ../../lib/class/live_stream.class.php:243
msgid "Invalid Catalog"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
-#: ../../lib/class/localplay.class.php:633
-#, fuzzy
+#: ../../lib/class/localplay.class.php:611
msgid "Paused"
-msgstr "وقÙØ©"
+msgstr ""
-#: ../../lib/class/localplay.class.php:635
-#: ../../lib/class/tvshow_episode.class.php:72
-#: ../../lib/class/user.class.php:974 ../../lib/class/video.class.php:735
-#: ../../lib/general.lib.php:219
-#: ../../modules/localplay/mpd.controller.php:503
-#: ../../templates/show_user.inc.php:24 ../../templates/show_users.inc.php:65
+#: ../../lib/class/localplay.class.php:613
+#: ../../lib/class/tvshow_episode.class.php:71
+#: ../../lib/class/user.class.php:1005 ../../lib/class/video.class.php:733
+#: ../../lib/general.lib.php:211
+#: ../../modules/localplay/mpd/mpd.controller.php:491
+#: ../../templates/show_user.inc.php:24 ../../templates/show_users.inc.php:82
msgid "Unknown"
msgstr "غير معروÙ"
#: ../../lib/class/playlist_object.abstract.php:70
#: ../../templates/show_edit_playlist_row.inc.php:37
#: ../../templates/show_edit_search_row.inc.php:37
-#, fuzzy
msgid "Private"
-msgstr "تÙعيل"
+msgstr ""
-#: ../../lib/class/privatemsg.class.php:139
-#, fuzzy
+#: ../../lib/class/privatemsg.class.php:141
msgid "Error: Subject Required"
-msgstr "مطلوب"
+msgstr ""
-#: ../../lib/class/privatemsg.class.php:144
-#, fuzzy
+#: ../../lib/class/privatemsg.class.php:146
msgid "Error: Unknown user"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
-#: ../../lib/class/privatemsg.class.php:164
-#, fuzzy
+#: ../../lib/class/privatemsg.class.php:166
msgid "Private Message"
-msgstr "تÙعيل"
+msgstr ""
-#: ../../lib/class/privatemsg.class.php:165
+#: ../../lib/class/privatemsg.class.php:167
#, php-format
msgid ""
"You just received a new private message from %s.\n"
@@ -1951,36 +1838,34 @@ msgid ""
" "
msgstr ""
-#: ../../lib/class/query.class.php:100
+#: ../../lib/class/query.class.php:99
msgid "Browse not found or expired, try reloading the page"
msgstr ""
-#: ../../lib/class/registration.class.php:54
-#, fuzzy, php-format
+#: ../../lib/class/registration.class.php:53
+#, php-format
msgid "New User Registration at %s"
-msgstr "تاريخ التسجيل"
+msgstr ""
-#: ../../lib/class/registration.class.php:56
+#: ../../lib/class/registration.class.php:55
#, php-format
msgid ""
"Thank you for registering\n"
"\n"
"\n"
-"Please keep this e-mail for your records. Your account information is as "
-"follows:\n"
+"Please keep this e-mail for your records. Your account information is as follows:\n"
"----------------------\n"
"Username: %s\n"
"----------------------\n"
"\n"
-"Your account is currently inactive. You cannot use it until you've visited "
-"the following link:\n"
+"Your account is currently inactive. You cannot use it until you've visited the following link:\n"
"\n"
"%s\n"
"\n"
"Thank you for registering\n"
msgstr ""
-#: ../../lib/class/registration.class.php:78
+#: ../../lib/class/registration.class.php:77
#, php-format
msgid ""
"A new user has registered\n"
@@ -1993,12 +1878,12 @@ msgid ""
"\n"
msgstr ""
-#: ../../lib/class/registration.class.php:106
+#: ../../lib/class/registration.class.php:104
#, php-format
msgid "Account enabled at %s"
msgstr ""
-#: ../../lib/class/registration.class.php:107
+#: ../../lib/class/registration.class.php:105
#, php-format
msgid ""
"Your account %s has been enabled\n"
@@ -2026,9 +1911,8 @@ msgid "is not"
msgstr ""
#: ../../lib/class/search.class.php:86
-#, fuzzy
msgid "is greater than"
-msgstr "خلق تاريخ"
+msgstr ""
#: ../../lib/class/search.class.php:92
msgid "is less than"
@@ -2051,14 +1935,12 @@ msgid "does not contain"
msgstr ""
#: ../../lib/class/search.class.php:126
-#, fuzzy
msgid "starts with"
-msgstr "يبدأ"
+msgstr ""
#: ../../lib/class/search.class.php:134
-#, fuzzy
msgid "ends with"
-msgstr "يبدأ"
+msgstr ""
#: ../../lib/class/search.class.php:148
msgid "sounds like"
@@ -2081,65 +1963,64 @@ msgid "Any searchable text"
msgstr ""
#: ../../lib/class/search.class.php:208 ../../lib/class/search.class.php:413
-#: ../../lib/class/song.class.php:1363 ../../lib/class/video.class.php:299
-#: ../../templates/show_democratic_playlist.inc.php:57
-#: ../../templates/show_democratic_playlist.inc.php:104
+#: ../../lib/class/song.class.php:1394 ../../lib/class/video.class.php:298
+#: ../../templates/show_democratic_playlist.inc.php:65
+#: ../../templates/show_democratic_playlist.inc.php:140
#: ../../templates/show_disabled_songs.inc.php:29
-#: ../../templates/show_disabled_songs.inc.php:55
+#: ../../templates/show_disabled_songs.inc.php:68
#: ../../templates/show_duplicate.inc.php:29
#: ../../templates/show_edit_song_row.inc.php:27
#: ../../templates/show_edit_video_row.inc.php:31
#: ../../templates/show_search_bar.inc.php:31
-#: ../../templates/show_song.inc.php:107
-#: ../../templates/show_video.inc.php:110
-#: ../../templates/show_videos.inc.php:33
-#: ../../templates/show_videos.inc.php:85
+#: ../../templates/show_song.inc.php:192
+#: ../../templates/show_video.inc.php:180
+#: ../../templates/show_videos.inc.php:38
+#: ../../templates/show_videos.inc.php:114
msgid "Title"
msgstr "العنوان"
#: ../../lib/class/search.class.php:229
-#: ../../templates/show_edit_song_row.inc.php:65
-#: ../../templates/show_song.inc.php:113
+#: ../../templates/show_edit_song_row.inc.php:78
+#: ../../templates/show_song.inc.php:198
msgid "Composer"
msgstr ""
#: ../../lib/class/search.class.php:236
#: ../../templates/show_manage_shoutbox.inc.php:31
-#: ../../templates/show_manage_shoutbox.inc.php:60
-#: ../../templates/show_song.inc.php:119
-#, fuzzy
+#: ../../templates/show_manage_shoutbox.inc.php:65
+#: ../../templates/show_song.inc.php:204
msgid "Comment"
-msgstr "ID3 التعليق"
+msgstr ""
-#: ../../lib/class/search.class.php:251 ../../lib/class/search.class.php:473
-#: ../../lib/class/search.class.php:507 ../../lib/class/tag.class.php:691
+#: ../../lib/class/search.class.php:251 ../../lib/class/search.class.php:480
+#: ../../lib/class/search.class.php:514 ../../lib/class/tag.class.php:707
#: ../../templates/show_search_bar.inc.php:35
msgid "Tag"
msgstr "الوسم"
-#: ../../lib/class/search.class.php:258 ../../lib/class/search.class.php:481
+#: ../../lib/class/search.class.php:258 ../../lib/class/search.class.php:488
#: ../../templates/show_disabled_songs.inc.php:32
-#: ../../templates/show_disabled_songs.inc.php:58
+#: ../../templates/show_disabled_songs.inc.php:71
#: ../../templates/show_duplicates.inc.php:34
-#: ../../templates/show_duplicates.inc.php:73
+#: ../../templates/show_duplicates.inc.php:85
#: ../../templates/show_import_playlist.inc.php:28
-#: ../../templates/show_song.inc.php:132
-#: ../../templates/show_video.inc.php:124
+#: ../../templates/show_song.inc.php:217
+#: ../../templates/show_video.inc.php:194
msgid "Filename"
msgstr "اسم الملÙ"
-#: ../../lib/class/search.class.php:265 ../../lib/class/search.class.php:420
-#: ../../lib/class/search.class.php:495 ../../templates/show_albums.inc.php:38
-#: ../../templates/show_albums.inc.php:96
-#: ../../templates/show_edit_album_row.inc.php:61
-#: ../../templates/show_edit_song_row.inc.php:73
+#: ../../lib/class/search.class.php:265 ../../lib/class/search.class.php:427
+#: ../../lib/class/search.class.php:502 ../../templates/show_albums.inc.php:44
+#: ../../templates/show_albums.inc.php:133
+#: ../../templates/show_edit_album_row.inc.php:66
+#: ../../templates/show_edit_song_row.inc.php:86
#: ../../templates/show_edit_tvshow_row.inc.php:35
-#: ../../templates/show_graphs.inc.php:66
+#: ../../templates/show_graphs.inc.php:71
#: ../../templates/show_missing_albums.inc.php:29
#: ../../templates/show_partial_edit_movie_row.inc.php:32
#: ../../templates/show_partial_movie.inc.php:22
#: ../../templates/show_partial_movies.inc.php:24
-#: ../../templates/show_song.inc.php:115
+#: ../../templates/show_song.inc.php:200
#: ../../templates/show_wanted_albums.inc.php:28
msgid "Year"
msgstr "سنة"
@@ -2148,117 +2029,113 @@ msgstr "سنة"
msgid "Length (in minutes)"
msgstr ""
-#: ../../lib/class/search.class.php:280 ../../lib/class/search.class.php:442
-#: ../../templates/show_albums.inc.php:45
-#: ../../templates/show_albums.inc.php:103
-#: ../../templates/show_artists.inc.php:47
-#: ../../templates/show_artists.inc.php:105
-#: ../../templates/show_now_playing_row.inc.php:92
-#: ../../templates/show_now_playing_video_row.inc.php:60
-#: ../../templates/show_playlists.inc.php:35
-#: ../../templates/show_playlists.inc.php:70
-#: ../../templates/show_playlist_songs.inc.php:41
-#: ../../templates/show_playlist_songs.inc.php:78
-#: ../../templates/show_recommended_artists.inc.php:37
-#: ../../templates/show_recommended_artists.inc.php:86
-#: ../../templates/show_song.inc.php:32 ../../templates/show_songs.inc.php:45
-#: ../../templates/show_songs.inc.php:91
-#: ../../templates/show_tvshow_seasons.inc.php:39
-#: ../../templates/show_tvshow_seasons.inc.php:78
-#: ../../templates/show_tvshows.inc.php:42
-#: ../../templates/show_tvshows.inc.php:84
-#: ../../templates/show_video.inc.php:58
-#: ../../templates/show_videos.inc.php:49
-#: ../../templates/show_videos.inc.php:101
+#: ../../lib/class/search.class.php:280 ../../lib/class/search.class.php:449
+#: ../../templates/show_albums.inc.php:57
+#: ../../templates/show_albums.inc.php:145
+#: ../../templates/show_artists.inc.php:59
+#: ../../templates/show_artists.inc.php:147
+#: ../../templates/show_now_playing_row.inc.php:113
+#: ../../templates/show_now_playing_video_row.inc.php:66
+#: ../../templates/show_playlists.inc.php:39
+#: ../../templates/show_playlists.inc.php:92
+#: ../../templates/show_playlist_songs.inc.php:44
+#: ../../templates/show_playlist_songs.inc.php:94
+#: ../../templates/show_recommended_artists.inc.php:39
+#: ../../templates/show_recommended_artists.inc.php:116
+#: ../../templates/show_song.inc.php:36 ../../templates/show_songs.inc.php:51
+#: ../../templates/show_songs.inc.php:121
+#: ../../templates/show_tvshow_seasons.inc.php:48
+#: ../../templates/show_tvshow_seasons.inc.php:114
+#: ../../templates/show_tvshows.inc.php:51
+#: ../../templates/show_tvshows.inc.php:120
+#: ../../templates/show_video.inc.php:67
+#: ../../templates/show_videos.inc.php:59
+#: ../../templates/show_videos.inc.php:135
msgid "Rating"
msgstr "تصنيÙ"
-#: ../../lib/class/search.class.php:298 ../../templates/show_albums.inc.php:40
-#: ../../templates/show_albums.inc.php:98
-#: ../../templates/show_artists.inc.php:42
-#: ../../templates/show_artists.inc.php:100
-#: ../../templates/show_song.inc.php:139 ../../templates/show_songs.inc.php:38
-#: ../../templates/show_songs.inc.php:87
-#: ../../templates/show_video.inc.php:131
-#: ../../templates/show_videos.inc.php:44
-#: ../../templates/show_videos.inc.php:96
-#, fuzzy
+#: ../../lib/class/search.class.php:298 ../../templates/show_albums.inc.php:47
+#: ../../templates/show_albums.inc.php:136
+#: ../../templates/show_artists.inc.php:49
+#: ../../templates/show_artists.inc.php:138
+#: ../../templates/show_song.inc.php:224 ../../templates/show_songs.inc.php:41
+#: ../../templates/show_songs.inc.php:113
+#: ../../templates/show_video.inc.php:201
+#: ../../templates/show_videos.inc.php:50
+#: ../../templates/show_videos.inc.php:126
msgid "# Played"
-msgstr "تشغيل"
+msgstr ""
#: ../../lib/class/search.class.php:306
#: ../../templates/show_add_channel.inc.php:102
-#: ../../templates/show_channels.inc.php:37
+#: ../../templates/show_channels.inc.php:39
#: ../../templates/show_duplicates.inc.php:32
-#: ../../templates/show_duplicates.inc.php:71
+#: ../../templates/show_duplicates.inc.php:83
#: ../../templates/show_edit_channel_row.inc.php:84
-#: ../../templates/show_song.inc.php:123
+#: ../../templates/show_song.inc.php:208
msgid "Bitrate"
msgstr ""
-#: ../../lib/class/search.class.php:331 ../../templates/show_album.inc.php:75
-#: ../../templates/show_artist.inc.php:72
-#, fuzzy
+#: ../../lib/class/search.class.php:331 ../../templates/show_album.inc.php:87
+#: ../../templates/show_artist.inc.php:91
msgid "Played"
-msgstr "تشغيل"
+msgstr ""
-#: ../../lib/class/search.class.php:358 ../../lib/class/search.class.php:465
-#: ../../templates/browse_filters.inc.php:72
+#: ../../lib/class/search.class.php:358 ../../lib/class/search.class.php:472
+#: ../../templates/browse_filters.inc.php:107
#: ../../templates/show_add_live_stream.inc.php:54
#: ../../templates/show_export.inc.php:32
-#, fuzzy
msgid "Catalog"
-msgstr "نوع التسويقي"
+msgstr ""
-#: ../../lib/class/search.class.php:371 ../../lib/ui.lib.php:120
+#: ../../lib/class/search.class.php:371 ../../lib/ui.lib.php:132
#: ../../templates/show_manage_democratic.inc.php:26
#: ../../templates/show_search_bar.inc.php:34
-#: ../../templates/sidebar_home.inc.php:70
-#: ../../templates/sidebar_home.inc.php:97
+#: ../../templates/sidebar_home.inc.php:108
+#: ../../templates/sidebar_home.inc.php:109
+#: ../../templates/sidebar_home.inc.php:159
msgid "Playlist"
msgstr "التشغيل"
#: ../../lib/class/search.class.php:378
-#: ../../templates/show_playlists.inc.php:28
-#: ../../templates/show_playlists.inc.php:63
-#: ../../templates/show_searches.inc.php:38
-#: ../../templates/show_searches.inc.php:66
+#: ../../templates/show_playlists.inc.php:30
+#: ../../templates/show_playlists.inc.php:83
+#: ../../templates/show_searches.inc.php:45
+#: ../../templates/show_searches.inc.php:81
msgid "Playlist Name"
msgstr "الاسم التشغيل"
#: ../../lib/class/search.class.php:391
-#, fuzzy
msgid "Smart Playlist"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
#: ../../lib/class/search.class.php:404
-#: ../../templates/show_add_upload.inc.php:196
-#: ../../templates/show_edit_song_row.inc.php:84
-#, fuzzy
+#: ../../templates/show_add_upload.inc.php:203
+#: ../../templates/show_edit_song_row.inc.php:99
msgid "Music License"
-msgstr "التهيئة مسبقا"
-
-#: ../../lib/class/search.class.php:427
-msgid "Image Width"
msgstr ""
#: ../../lib/class/search.class.php:434
+msgid "Image Width"
+msgstr ""
+
+#: ../../lib/class/search.class.php:441
msgid "Image Height"
msgstr ""
-#: ../../lib/class/search.class.php:489 ../../lib/class/search.class.php:515
-#: ../../lib/class/search.class.php:523
+#: ../../lib/class/search.class.php:496 ../../lib/class/search.class.php:522
+#: ../../lib/class/search.class.php:530
#: ../../templates/cookie_disclaimer.inc.php:16
-#: ../../templates/show_access_list.inc.php:46
+#: ../../templates/show_access_list.inc.php:47
#: ../../templates/show_add_access.inc.php:27
#: ../../templates/show_add_channel.inc.php:35
#: ../../templates/show_add_label.inc.php:27
#: ../../templates/show_add_live_stream.inc.php:27
#: ../../templates/show_add_playlist.inc.php:27
-#: ../../templates/show_broadcasts.inc.php:29
-#: ../../templates/show_catalogs.inc.php:27
-#: ../../templates/show_catalogs.inc.php:55
-#: ../../templates/show_channels.inc.php:30
+#: ../../templates/show_broadcasts.inc.php:31
+#: ../../templates/show_catalogs.inc.php:29
+#: ../../templates/show_catalogs.inc.php:64
+#: ../../templates/show_channels.inc.php:32
#: ../../templates/show_create_democratic.inc.php:27
#: ../../templates/show_edit_access.inc.php:27
#: ../../templates/show_edit_album_row.inc.php:27
@@ -2267,82 +2144,79 @@ msgstr ""
#: ../../templates/show_edit_catalog.inc.php:28
#: ../../templates/show_edit_channel_row.inc.php:44
#: ../../templates/show_edit_label_row.inc.php:27
-#: ../../templates/show_edit_license.inc.php:30
+#: ../../templates/show_edit_license.inc.php:33
#: ../../templates/show_edit_live_stream_row.inc.php:27
#: ../../templates/show_edit_playlist_row.inc.php:27
#: ../../templates/show_edit_search_row.inc.php:27
#: ../../templates/show_edit_tag_row.inc.php:27
#: ../../templates/show_edit_tvshow_row.inc.php:27
-#: ../../templates/show_live_streams.inc.php:30
-#: ../../templates/show_live_streams.inc.php:55
+#: ../../templates/show_live_streams.inc.php:32
+#: ../../templates/show_live_streams.inc.php:64
#: ../../templates/show_localplay_controllers.inc.php:29
-#: ../../templates/show_localplay_controllers.inc.php:63
-#: ../../templates/show_localplay_playlist.inc.php:32
-#: ../../templates/show_localplay_playlist.inc.php:62
+#: ../../templates/show_localplay_controllers.inc.php:78
+#: ../../templates/show_localplay_playlist.inc.php:34
+#: ../../templates/show_localplay_playlist.inc.php:77
#: ../../templates/show_manage_license.inc.php:35
-#: ../../templates/show_manage_license.inc.php:56
+#: ../../templates/show_manage_license.inc.php:61
#: ../../templates/show_plugins.inc.php:29
-#: ../../templates/show_plugins.inc.php:69
+#: ../../templates/show_plugins.inc.php:80
#: ../../templates/show_stats.inc.php:70
msgid "Name"
msgstr "اسم"
-#: ../../lib/class/search.class.php:501
+#: ../../lib/class/search.class.php:508
#: ../../templates/show_concerts.inc.php:28
-#: ../../templates/show_concerts.inc.php:53
+#: ../../templates/show_concerts.inc.php:62
msgid "Place"
msgstr ""
-#: ../../lib/class/search.class.php:529
+#: ../../lib/class/search.class.php:536
#: ../../templates/show_add_label.inc.php:34
#: ../../templates/show_edit_label_row.inc.php:31
-#: ../../templates/show_labels.inc.php:40
-#: ../../templates/show_labels.inc.php:68
+#: ../../templates/show_labels.inc.php:51
+#: ../../templates/show_labels.inc.php:91
msgid "Category"
msgstr ""
-#: ../../lib/class/search.class.php:537
-#: ../../modules/catalog/remote.catalog.php:110
-#: ../../modules/catalog/subsonic.catalog.php:110
-#: ../../modules/localplay/xbmc.controller.php:199
+#: ../../lib/class/search.class.php:544
+#: ../../modules/catalog/remote/remote.catalog.php:103
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:103
+#: ../../modules/localplay/xbmc/xbmc.controller.php:190
#: ../../templates/show_add_user.inc.php:29
#: ../../templates/show_edit_user.inc.php:32
#: ../../templates/show_install_account.inc.php:51
-#: ../../templates/show_login_form.inc.php:61
+#: ../../templates/show_login_form.inc.php:60
#: ../../templates/show_now_playing_row.inc.php:25
#: ../../templates/show_now_playing_video_row.inc.php:27
#: ../../templates/show_recently_played.inc.php:34
-#: ../../templates/show_recently_played.inc.php:153
-#: ../../templates/show_user_registration.inc.php:81
-#: ../../templates/show_users.inc.php:43 ../../templates/show_users.inc.php:74
+#: ../../templates/show_recently_played.inc.php:185
+#: ../../templates/show_user_registration.inc.php:85
+#: ../../templates/show_users.inc.php:50 ../../templates/show_users.inc.php:95
msgid "Username"
msgstr "اسم المستخدم"
-#: ../../lib/class/share.class.php:200
-#, fuzzy
+#: ../../lib/class/share.class.php:206
msgid "Share edit"
-msgstr "ØØ°Ù"
+msgstr ""
-#: ../../lib/class/share.class.php:341 ../../lib/class/share.class.php:343
+#: ../../lib/class/share.class.php:350 ../../lib/class/share.class.php:352
#: ../../templates/show_shares.inc.php:23
-#, fuzzy
msgid "Share"
-msgstr "يتدÙÙ‚"
+msgstr ""
-#: ../../lib/class/share.class.php:351
-#, fuzzy
+#: ../../lib/class/share.class.php:360
msgid "Advanced Share"
-msgstr "المتقدمة"
+msgstr ""
-#: ../../lib/class/share.class.php:366
+#: ../../lib/class/share.class.php:375
msgid "Temporary direct link"
msgstr ""
-#: ../../lib/class/shoutbox.class.php:219
+#: ../../lib/class/shoutbox.class.php:232
msgid "New shout on your content"
msgstr ""
-#: ../../lib/class/shoutbox.class.php:220
+#: ../../lib/class/shoutbox.class.php:233
#, php-format
msgid ""
"You just received a new shout from %s on your content `%s`.\n"
@@ -2356,903 +2230,914 @@ msgid ""
" "
msgstr ""
-#: ../../lib/class/shoutbox.class.php:301
-#: ../../templates/show_add_label.inc.php:74
+#: ../../lib/class/shoutbox.class.php:310
+#: ../../templates/show_add_label.inc.php:80
#: ../../templates/show_add_live_stream.inc.php:62
-#: ../../templates/show_catalog_row.inc.php:40
-#: ../../templates/show_labels.inc.php:28
-#: ../../templates/show_live_stream.inc.php:28
-#: ../../templates/show_searches.inc.php:28
+#: ../../templates/show_catalog_row.inc.php:46
+#: ../../templates/show_labels.inc.php:29
+#: ../../templates/show_live_stream.inc.php:31
+#: ../../templates/show_searches.inc.php:30
msgid "Add"
msgstr "إضاÙØ©"
-#: ../../lib/class/shoutbox.class.php:304
-#: ../../templates/show_album_group_disks.inc.php:125
-#: ../../templates/show_album.inc.php:124
-#: ../../templates/show_album.inc.php:125
-#: ../../templates/show_album_row.inc.php:78
-#: ../../templates/show_artist.inc.php:136
-#: ../../templates/show_artist.inc.php:137
-#: ../../templates/show_artist_row.inc.php:78
-#: ../../templates/show_html5_player.inc.php:144
-#: ../../templates/show_label.inc.php:57 ../../templates/show_label.inc.php:58
-#: ../../templates/show_label_row.inc.php:40
-#: ../../templates/show_song.inc.php:74
-#: ../../templates/show_song_row.inc.php:71
-#: ../../templates/show_video.inc.php:85
-#: ../../templates/show_video_row.inc.php:83
+#: ../../lib/class/shoutbox.class.php:313
+#: ../../templates/show_album_group_disks.inc.php:153
+#: ../../templates/show_album.inc.php:172
+#: ../../templates/show_album.inc.php:176
+#: ../../templates/show_album_row.inc.php:103
+#: ../../templates/show_artist.inc.php:198
+#: ../../templates/show_artist.inc.php:202
+#: ../../templates/show_artist_row.inc.php:102
+#: ../../templates/show_html5_player.inc.php:164
+#: ../../templates/show_label.inc.php:62 ../../templates/show_label.inc.php:66
+#: ../../templates/show_label_row.inc.php:42
+#: ../../templates/show_song.inc.php:119
+#: ../../templates/show_song_row.inc.php:101
+#: ../../templates/show_video.inc.php:121
+#: ../../templates/show_video_row.inc.php:96
msgid "Post Shout"
msgstr "ÙÙŠ مرØلة ما بعد الصيØØ©"
-#: ../../lib/class/shoutbox.class.php:308
+#: ../../lib/class/shoutbox.class.php:317
msgid "by"
msgstr ""
-#: ../../lib/class/song.class.php:1336
-#: ../../templates/show_html5_player.inc.php:141
-#, fuzzy
+#: ../../lib/class/song.class.php:1368
+#: ../../templates/show_html5_player.inc.php:161
msgid "Show Lyrics"
-msgstr "وتظهر قائمة التشغيل"
+msgstr ""
-#: ../../lib/class/song.class.php:1357
+#: ../../lib/class/song.class.php:1388
msgid "Track MusicBrainzID"
msgstr ""
-#: ../../lib/class/stream_playlist.class.php:516
+#: ../../lib/class/stream_playlist.class.php:585
msgid "Vote added"
msgstr ""
-#: ../../lib/class/tvshow.class.php:197
-#: ../../lib/class/tvshow_episode.class.php:179
-#: ../../lib/class/tvshow_season.class.php:155
+#: ../../lib/class/tvshow.class.php:194
+#: ../../lib/class/tvshow_episode.class.php:176
+#: ../../lib/class/tvshow_season.class.php:154
#: ../../templates/show_add_catalog.inc.php:77
#: ../../templates/show_edit_tvshow_season_row.inc.php:31
#: ../../templates/show_partial_tvshow_episode.inc.php:23
#: ../../templates/show_partial_tvshow_episodes.inc.php:25
-#: ../../templates/show_tvshow_seasons.inc.php:35
-#: ../../templates/show_tvshow_seasons.inc.php:74
-#: ../../templates/show_tvshows.inc.php:36
-#: ../../templates/show_tvshows.inc.php:78
-#, fuzzy
+#: ../../templates/show_tvshow_seasons.inc.php:41
+#: ../../templates/show_tvshow_seasons.inc.php:108
+#: ../../templates/show_tvshows.inc.php:42
+#: ../../templates/show_tvshows.inc.php:112
msgid "TV Show"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../lib/class/tvshow_episode.class.php:182
-#: ../../lib/class/tvshow_season.class.php:134
-#: ../../lib/class/tvshow_season.class.php:158
+#: ../../lib/class/tvshow_episode.class.php:179
+#: ../../lib/class/tvshow_season.class.php:133
+#: ../../lib/class/tvshow_season.class.php:157
#: ../../templates/show_edit_tvshow_season_row.inc.php:27
#: ../../templates/show_partial_tvshow_episode.inc.php:24
#: ../../templates/show_partial_tvshow_episodes.inc.php:24
-#: ../../templates/show_tvshow_seasons.inc.php:34
-#: ../../templates/show_tvshow_seasons.inc.php:73
-#, fuzzy
+#: ../../templates/show_tvshow_seasons.inc.php:40
+#: ../../templates/show_tvshow_seasons.inc.php:107
msgid "Season"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../lib/class/tvshow_episode.class.php:186
+#: ../../lib/class/tvshow_episode.class.php:183
#: ../../templates/show_partial_tvshow_episode.inc.php:25
#: ../../templates/show_partial_tvshow_episodes.inc.php:23
msgid "Episode"
msgstr ""
-#: ../../lib/class/update.class.php:544
+#: ../../lib/class/update.class.php:567
msgid "No updates needed."
msgstr ""
-#: ../../lib/class/update.class.php:546
+#: ../../lib/class/update.class.php:569
msgid "Return to main page"
msgstr ""
-#: ../../lib/class/update.class.php:2574 ../../lib/class/update.class.php:2590
-#: ../../lib/class/update.class.php:2606
+#: ../../lib/class/update.class.php:2595 ../../lib/class/update.class.php:2611
+#: ../../lib/class/update.class.php:2627
msgid "File copy error."
msgstr ""
-#: ../../lib/class/update.class.php:2581 ../../lib/class/update.class.php:2597
-#: ../../lib/class/update.class.php:2613
+#: ../../lib/class/update.class.php:2602 ../../lib/class/update.class.php:2618
+#: ../../lib/class/update.class.php:2634
msgid "Cannot copy default .htaccess file."
msgstr ""
-#: ../../lib/class/upnp_api.class.php:436
+#: ../../lib/class/upnp_api.class.php:468
#: ../../templates/show_add_catalog.inc.php:72
msgid "Music"
msgstr ""
-#: ../../lib/class/upnp_api.class.php:736
+#: ../../lib/class/upnp_api.class.php:784
#: ../../templates/show_now_playing_video_row.inc.php:41
#: ../../templates/show_tagcloud.inc.php:27
-#, fuzzy
msgid "Video"
-msgstr "الÙيديو"
+msgstr ""
-#: ../../lib/class/user.class.php:996 ../../templates/show_objects.inc.php:44
-#: ../../templates/show_tagcloud.inc.php:83
+#: ../../lib/class/useractivity.class.php:207
+msgid "commented on"
+msgstr ""
+
+#: ../../lib/class/useractivity.class.php:210
+msgid "uploaded"
+msgstr ""
+
+#: ../../lib/class/useractivity.class.php:213
+msgid "played"
+msgstr ""
+
+#: ../../lib/class/useractivity.class.php:216
+msgid "favorited"
+msgstr ""
+
+#: ../../lib/class/useractivity.class.php:219
+msgid "started to follow"
+msgstr ""
+
+#: ../../lib/class/useractivity.class.php:222
+msgid "did something on"
+msgstr ""
+
+#: ../../lib/class/user.class.php:1031 ../../templates/show_objects.inc.php:53
+#: ../../templates/show_tagcloud.inc.php:98
msgid "Not Enough Data"
msgstr "البيانات غير كاÙية"
-#: ../../lib/class/user.class.php:1279
-#, fuzzy
+#: ../../lib/class/user.class.php:1319
msgid "User avatar"
-msgstr "مستخدم للعقارات"
+msgstr ""
-#: ../../lib/class/user.class.php:1473
+#: ../../lib/class/user.class.php:1515
msgid "Unfollow"
msgstr ""
-#: ../../lib/class/user.class.php:1473
+#: ../../lib/class/user.class.php:1515
msgid "Follow"
msgstr ""
-#: ../../lib/class/video.class.php:760
+#: ../../lib/class/video.class.php:758
msgid "Afar"
msgstr ""
-#: ../../lib/class/video.class.php:761
+#: ../../lib/class/video.class.php:759
msgid "Abkhazian"
msgstr ""
-#: ../../lib/class/video.class.php:762
-#, fuzzy
+#: ../../lib/class/video.class.php:760
msgid "Avestan"
-msgstr "درجة نشطة"
+msgstr ""
-#: ../../lib/class/video.class.php:763
+#: ../../lib/class/video.class.php:761
msgid "Afrikaans"
msgstr ""
-#: ../../lib/class/video.class.php:764
+#: ../../lib/class/video.class.php:762
msgid "Akan"
msgstr ""
-#: ../../lib/class/video.class.php:765
+#: ../../lib/class/video.class.php:763
msgid "Amharic"
msgstr ""
-#: ../../lib/class/video.class.php:766
+#: ../../lib/class/video.class.php:764
msgid "Aragonese"
msgstr ""
-#: ../../lib/class/video.class.php:767
+#: ../../lib/class/video.class.php:765
msgid "Arabic"
msgstr ""
-#: ../../lib/class/video.class.php:768
+#: ../../lib/class/video.class.php:766
msgid "Assamese"
msgstr ""
-#: ../../lib/class/video.class.php:769
+#: ../../lib/class/video.class.php:767
msgid "Avaric"
msgstr ""
-#: ../../lib/class/video.class.php:770
+#: ../../lib/class/video.class.php:768
msgid "Aymara"
msgstr ""
-#: ../../lib/class/video.class.php:771
+#: ../../lib/class/video.class.php:769
msgid "Azerbaijani"
msgstr ""
-#: ../../lib/class/video.class.php:772
+#: ../../lib/class/video.class.php:770
msgid "Bashkir"
msgstr ""
-#: ../../lib/class/video.class.php:773
-#, fuzzy
+#: ../../lib/class/video.class.php:771
msgid "Belarusian"
-msgstr "النسخة"
+msgstr ""
-#: ../../lib/class/video.class.php:774
+#: ../../lib/class/video.class.php:772
msgid "Bulgarian"
msgstr ""
-#: ../../lib/class/video.class.php:775
+#: ../../lib/class/video.class.php:773
msgid "Bihari"
msgstr ""
-#: ../../lib/class/video.class.php:776
+#: ../../lib/class/video.class.php:774
msgid "Bislama"
msgstr ""
-#: ../../lib/class/video.class.php:777
+#: ../../lib/class/video.class.php:775
msgid "Bambara"
msgstr ""
-#: ../../lib/class/video.class.php:778
+#: ../../lib/class/video.class.php:776
msgid "Bengali"
msgstr ""
-#: ../../lib/class/video.class.php:779
+#: ../../lib/class/video.class.php:777
msgid "Tibetan"
msgstr ""
-#: ../../lib/class/video.class.php:780
+#: ../../lib/class/video.class.php:778
msgid "Breton"
msgstr ""
-#: ../../lib/class/video.class.php:781
+#: ../../lib/class/video.class.php:779
msgid "Bosnian"
msgstr ""
-#: ../../lib/class/video.class.php:782
-#, fuzzy
+#: ../../lib/class/video.class.php:780
msgid "Catalan"
-msgstr "نوع التسويقي"
+msgstr ""
-#: ../../lib/class/video.class.php:783
+#: ../../lib/class/video.class.php:781
msgid "Chechen"
msgstr ""
-#: ../../lib/class/video.class.php:784
+#: ../../lib/class/video.class.php:782
msgid "Chamorro"
msgstr ""
-#: ../../lib/class/video.class.php:785
+#: ../../lib/class/video.class.php:783
msgid "Corsican"
msgstr ""
-#: ../../lib/class/video.class.php:786
+#: ../../lib/class/video.class.php:784
msgid "Cree"
msgstr ""
-#: ../../lib/class/video.class.php:787
+#: ../../lib/class/video.class.php:785
msgid "Czech"
msgstr ""
-#: ../../lib/class/video.class.php:788
+#: ../../lib/class/video.class.php:786
msgid "Church Slavic"
msgstr ""
-#: ../../lib/class/video.class.php:789
+#: ../../lib/class/video.class.php:787
msgid "Chuvash"
msgstr ""
-#: ../../lib/class/video.class.php:790
+#: ../../lib/class/video.class.php:788
msgid "Welsh"
msgstr ""
-#: ../../lib/class/video.class.php:791
+#: ../../lib/class/video.class.php:789
msgid "Danish"
msgstr ""
-#: ../../lib/class/video.class.php:792
+#: ../../lib/class/video.class.php:790
msgid "German"
msgstr ""
-#: ../../lib/class/video.class.php:793
+#: ../../lib/class/video.class.php:791
msgid "Divehi"
msgstr ""
-#: ../../lib/class/video.class.php:794
+#: ../../lib/class/video.class.php:792
msgid "Dzongkha"
msgstr ""
-#: ../../lib/class/video.class.php:795
+#: ../../lib/class/video.class.php:793
msgid "Ewe"
msgstr ""
-#: ../../lib/class/video.class.php:796
+#: ../../lib/class/video.class.php:794
msgid "Greek"
msgstr ""
-#: ../../lib/class/video.class.php:797
+#: ../../lib/class/video.class.php:795
msgid "English"
msgstr ""
-#: ../../lib/class/video.class.php:798
+#: ../../lib/class/video.class.php:796
msgid "Esperanto"
msgstr ""
-#: ../../lib/class/video.class.php:799
+#: ../../lib/class/video.class.php:797
msgid "Spanish"
msgstr ""
-#: ../../lib/class/video.class.php:800
+#: ../../lib/class/video.class.php:798
msgid "Estonian"
msgstr ""
-#: ../../lib/class/video.class.php:801
+#: ../../lib/class/video.class.php:799
msgid "Basque"
msgstr ""
-#: ../../lib/class/video.class.php:802
-#, fuzzy
+#: ../../lib/class/video.class.php:800
msgid "Persian"
-msgstr "النسخة"
+msgstr ""
-#: ../../lib/class/video.class.php:803
+#: ../../lib/class/video.class.php:801
msgid "Fulah"
msgstr ""
-#: ../../lib/class/video.class.php:804
+#: ../../lib/class/video.class.php:802
msgid "Finnish"
msgstr ""
-#: ../../lib/class/video.class.php:805
+#: ../../lib/class/video.class.php:803
msgid "Fijian"
msgstr ""
-#: ../../lib/class/video.class.php:806
+#: ../../lib/class/video.class.php:804
msgid "Faroese"
msgstr ""
-#: ../../lib/class/video.class.php:807
+#: ../../lib/class/video.class.php:805
msgid "French"
msgstr ""
-#: ../../lib/class/video.class.php:808
+#: ../../lib/class/video.class.php:806
msgid "Western Frisian"
msgstr ""
-#: ../../lib/class/video.class.php:809
+#: ../../lib/class/video.class.php:807
msgid "Irish"
msgstr ""
-#: ../../lib/class/video.class.php:810
+#: ../../lib/class/video.class.php:808
msgid "Scottish Gaelic"
msgstr ""
-#: ../../lib/class/video.class.php:811
+#: ../../lib/class/video.class.php:809
msgid "Galician"
msgstr ""
-#: ../../lib/class/video.class.php:812
+#: ../../lib/class/video.class.php:810
msgid "Guarani"
msgstr ""
-#: ../../lib/class/video.class.php:813
+#: ../../lib/class/video.class.php:811
msgid "Gujarati"
msgstr ""
-#: ../../lib/class/video.class.php:814
+#: ../../lib/class/video.class.php:812
msgid "Manx"
msgstr ""
-#: ../../lib/class/video.class.php:815
+#: ../../lib/class/video.class.php:813
msgid "Hausa"
msgstr ""
-#: ../../lib/class/video.class.php:816
+#: ../../lib/class/video.class.php:814
msgid "Hebrew"
msgstr ""
-#: ../../lib/class/video.class.php:817
+#: ../../lib/class/video.class.php:815
msgid "Hindi"
msgstr ""
-#: ../../lib/class/video.class.php:818
+#: ../../lib/class/video.class.php:816
msgid "Hiri Motu"
msgstr ""
-#: ../../lib/class/video.class.php:819
+#: ../../lib/class/video.class.php:817
msgid "Croatian"
msgstr ""
-#: ../../lib/class/video.class.php:820
+#: ../../lib/class/video.class.php:818
msgid "Haitian"
msgstr ""
-#: ../../lib/class/video.class.php:821
+#: ../../lib/class/video.class.php:819
msgid "Hungarian"
msgstr ""
-#: ../../lib/class/video.class.php:822
+#: ../../lib/class/video.class.php:820
msgid "Armenian"
msgstr ""
-#: ../../lib/class/video.class.php:823
+#: ../../lib/class/video.class.php:821
msgid "Herero"
msgstr ""
-#: ../../lib/class/video.class.php:824
+#: ../../lib/class/video.class.php:822
msgid "Interlingua (International Auxiliary Language Association)"
msgstr ""
-#: ../../lib/class/video.class.php:825
+#: ../../lib/class/video.class.php:823
msgid "Indonesian"
msgstr ""
-#: ../../lib/class/video.class.php:826
+#: ../../lib/class/video.class.php:824
msgid "Interlingue"
msgstr ""
-#: ../../lib/class/video.class.php:827
+#: ../../lib/class/video.class.php:825
msgid "Igbo"
msgstr ""
-#: ../../lib/class/video.class.php:828
+#: ../../lib/class/video.class.php:826
msgid "Sichuan Yi"
msgstr ""
-#: ../../lib/class/video.class.php:829
+#: ../../lib/class/video.class.php:827
msgid "Inupiaq"
msgstr ""
-#: ../../lib/class/video.class.php:830
+#: ../../lib/class/video.class.php:828
msgid "Ido"
msgstr ""
-#: ../../lib/class/video.class.php:831
+#: ../../lib/class/video.class.php:829
msgid "Icelandic"
msgstr ""
-#: ../../lib/class/video.class.php:832
+#: ../../lib/class/video.class.php:830
msgid "Italian"
msgstr ""
-#: ../../lib/class/video.class.php:833
+#: ../../lib/class/video.class.php:831
msgid "Inuktitut"
msgstr ""
-#: ../../lib/class/video.class.php:834
+#: ../../lib/class/video.class.php:832
msgid "Japanese"
msgstr ""
-#: ../../lib/class/video.class.php:835
+#: ../../lib/class/video.class.php:833
msgid "Javanese"
msgstr ""
-#: ../../lib/class/video.class.php:836
+#: ../../lib/class/video.class.php:834
msgid "Georgian"
msgstr ""
-#: ../../lib/class/video.class.php:837
+#: ../../lib/class/video.class.php:835
msgid "Kongo"
msgstr ""
-#: ../../lib/class/video.class.php:838
+#: ../../lib/class/video.class.php:836
msgid "Kikuyu"
msgstr ""
-#: ../../lib/class/video.class.php:839
+#: ../../lib/class/video.class.php:837
msgid "Kwanyama"
msgstr ""
-#: ../../lib/class/video.class.php:840
+#: ../../lib/class/video.class.php:838
msgid "Kazakh"
msgstr ""
-#: ../../lib/class/video.class.php:841
+#: ../../lib/class/video.class.php:839
msgid "Kalaallisut"
msgstr ""
-#: ../../lib/class/video.class.php:842
+#: ../../lib/class/video.class.php:840
msgid "Khmer"
msgstr ""
-#: ../../lib/class/video.class.php:843
+#: ../../lib/class/video.class.php:841
msgid "Kannada"
msgstr ""
-#: ../../lib/class/video.class.php:844
+#: ../../lib/class/video.class.php:842
msgid "Korean"
msgstr ""
-#: ../../lib/class/video.class.php:845
+#: ../../lib/class/video.class.php:843
msgid "Kanuri"
msgstr ""
-#: ../../lib/class/video.class.php:846
+#: ../../lib/class/video.class.php:844
msgid "Kashmiri"
msgstr ""
-#: ../../lib/class/video.class.php:847
+#: ../../lib/class/video.class.php:845
msgid "Kurdish"
msgstr ""
-#: ../../lib/class/video.class.php:848
+#: ../../lib/class/video.class.php:846
msgid "Komi"
msgstr ""
-#: ../../lib/class/video.class.php:849
+#: ../../lib/class/video.class.php:847
msgid "Cornish"
msgstr ""
-#: ../../lib/class/video.class.php:850
+#: ../../lib/class/video.class.php:848
msgid "Kirghiz"
msgstr ""
-#: ../../lib/class/video.class.php:851
-#, fuzzy
+#: ../../lib/class/video.class.php:849
msgid "Latin"
-msgstr "تصنيÙ"
+msgstr ""
-#: ../../lib/class/video.class.php:852
+#: ../../lib/class/video.class.php:850
msgid "Luxembourgish"
msgstr ""
-#: ../../lib/class/video.class.php:853
+#: ../../lib/class/video.class.php:851
msgid "Ganda"
msgstr ""
-#: ../../lib/class/video.class.php:854
+#: ../../lib/class/video.class.php:852
msgid "Limburgish"
msgstr ""
-#: ../../lib/class/video.class.php:855
+#: ../../lib/class/video.class.php:853
msgid "Lingala"
msgstr ""
-#: ../../lib/class/video.class.php:856
+#: ../../lib/class/video.class.php:854
msgid "Lao"
msgstr ""
-#: ../../lib/class/video.class.php:857
+#: ../../lib/class/video.class.php:855
msgid "Lithuanian"
msgstr ""
-#: ../../lib/class/video.class.php:858
+#: ../../lib/class/video.class.php:856
msgid "Luba-Katanga"
msgstr ""
-#: ../../lib/class/video.class.php:859
+#: ../../lib/class/video.class.php:857
msgid "Latvian"
msgstr ""
-#: ../../lib/class/video.class.php:860
+#: ../../lib/class/video.class.php:858
msgid "Malagasy"
msgstr ""
-#: ../../lib/class/video.class.php:861
+#: ../../lib/class/video.class.php:859
msgid "Marshallese"
msgstr ""
-#: ../../lib/class/video.class.php:862
+#: ../../lib/class/video.class.php:860
msgid "Maori"
msgstr ""
-#: ../../lib/class/video.class.php:863
+#: ../../lib/class/video.class.php:861
msgid "Macedonian"
msgstr ""
-#: ../../lib/class/video.class.php:864
+#: ../../lib/class/video.class.php:862
msgid "Malayalam"
msgstr ""
-#: ../../lib/class/video.class.php:865
+#: ../../lib/class/video.class.php:863
msgid "Mongolian"
msgstr ""
-#: ../../lib/class/video.class.php:866
+#: ../../lib/class/video.class.php:864
msgid "Marathi"
msgstr ""
-#: ../../lib/class/video.class.php:867
+#: ../../lib/class/video.class.php:865
msgid "Malay"
msgstr ""
-#: ../../lib/class/video.class.php:868
+#: ../../lib/class/video.class.php:866
msgid "Maltese"
msgstr ""
-#: ../../lib/class/video.class.php:869
+#: ../../lib/class/video.class.php:867
msgid "Burmese"
msgstr ""
-#: ../../lib/class/video.class.php:870
+#: ../../lib/class/video.class.php:868
msgid "Nauru"
msgstr ""
-#: ../../lib/class/video.class.php:871
+#: ../../lib/class/video.class.php:869
msgid "Norwegian Bokmal"
msgstr ""
-#: ../../lib/class/video.class.php:872
+#: ../../lib/class/video.class.php:870
msgid "North Ndebele"
msgstr ""
-#: ../../lib/class/video.class.php:873
+#: ../../lib/class/video.class.php:871
msgid "Nepali"
msgstr ""
-#: ../../lib/class/video.class.php:874
+#: ../../lib/class/video.class.php:872
msgid "Ndonga"
msgstr ""
-#: ../../lib/class/video.class.php:875
+#: ../../lib/class/video.class.php:873
msgid "Dutch"
msgstr ""
-#: ../../lib/class/video.class.php:876
+#: ../../lib/class/video.class.php:874
msgid "Norwegian Nynorsk"
msgstr ""
-#: ../../lib/class/video.class.php:877
+#: ../../lib/class/video.class.php:875
msgid "Norwegian"
msgstr ""
-#: ../../lib/class/video.class.php:878
+#: ../../lib/class/video.class.php:876
msgid "South Ndebele"
msgstr ""
-#: ../../lib/class/video.class.php:879
+#: ../../lib/class/video.class.php:877
msgid "Navajo"
msgstr ""
-#: ../../lib/class/video.class.php:880
+#: ../../lib/class/video.class.php:878
msgid "Chichewa"
msgstr ""
-#: ../../lib/class/video.class.php:881
+#: ../../lib/class/video.class.php:879
msgid "Occitan"
msgstr ""
-#: ../../lib/class/video.class.php:882
+#: ../../lib/class/video.class.php:880
msgid "Ojibwa"
msgstr ""
-#: ../../lib/class/video.class.php:883
+#: ../../lib/class/video.class.php:881
msgid "Oromo"
msgstr ""
-#: ../../lib/class/video.class.php:884
+#: ../../lib/class/video.class.php:882
msgid "Oriya"
msgstr ""
-#: ../../lib/class/video.class.php:885
+#: ../../lib/class/video.class.php:883
msgid "Ossetian"
msgstr ""
-#: ../../lib/class/video.class.php:886
+#: ../../lib/class/video.class.php:884
msgid "Panjabi"
msgstr ""
-#: ../../lib/class/video.class.php:887
+#: ../../lib/class/video.class.php:885
msgid "Pali"
msgstr ""
-#: ../../lib/class/video.class.php:888
+#: ../../lib/class/video.class.php:886
msgid "Polish"
msgstr ""
-#: ../../lib/class/video.class.php:889
+#: ../../lib/class/video.class.php:887
msgid "Pashto"
msgstr ""
-#: ../../lib/class/video.class.php:890
+#: ../../lib/class/video.class.php:888
msgid "Portuguese"
msgstr ""
-#: ../../lib/class/video.class.php:891
+#: ../../lib/class/video.class.php:889
msgid "Quechua"
msgstr ""
-#: ../../lib/class/video.class.php:892
+#: ../../lib/class/video.class.php:890
msgid "Raeto-Romance"
msgstr ""
-#: ../../lib/class/video.class.php:893
+#: ../../lib/class/video.class.php:891
msgid "Kirundi"
msgstr ""
-#: ../../lib/class/video.class.php:894
+#: ../../lib/class/video.class.php:892
msgid "Romanian"
msgstr ""
-#: ../../lib/class/video.class.php:895
+#: ../../lib/class/video.class.php:893
msgid "Russian"
msgstr ""
-#: ../../lib/class/video.class.php:896
+#: ../../lib/class/video.class.php:894
msgid "Kinyarwanda"
msgstr ""
-#: ../../lib/class/video.class.php:897
+#: ../../lib/class/video.class.php:895
msgid "Sanskrit"
msgstr ""
-#: ../../lib/class/video.class.php:898
+#: ../../lib/class/video.class.php:896
msgid "Sardinian"
msgstr ""
-#: ../../lib/class/video.class.php:899
+#: ../../lib/class/video.class.php:897
msgid "Sindhi"
msgstr ""
-#: ../../lib/class/video.class.php:900
+#: ../../lib/class/video.class.php:898
msgid "Northern Sami"
msgstr ""
-#: ../../lib/class/video.class.php:901
+#: ../../lib/class/video.class.php:899
msgid "Sango"
msgstr ""
-#: ../../lib/class/video.class.php:902
+#: ../../lib/class/video.class.php:900
msgid "Sinhala"
msgstr ""
-#: ../../lib/class/video.class.php:903
+#: ../../lib/class/video.class.php:901
msgid "Slovak"
msgstr ""
-#: ../../lib/class/video.class.php:904
+#: ../../lib/class/video.class.php:902
msgid "Slovenian"
msgstr ""
-#: ../../lib/class/video.class.php:905
+#: ../../lib/class/video.class.php:903
msgid "Samoan"
msgstr ""
-#: ../../lib/class/video.class.php:906
+#: ../../lib/class/video.class.php:904
msgid "Shona"
msgstr ""
-#: ../../lib/class/video.class.php:907
+#: ../../lib/class/video.class.php:905
msgid "Somali"
msgstr ""
-#: ../../lib/class/video.class.php:908
+#: ../../lib/class/video.class.php:906
msgid "Albanian"
msgstr ""
-#: ../../lib/class/video.class.php:909
+#: ../../lib/class/video.class.php:907
msgid "Serbian"
msgstr ""
-#: ../../lib/class/video.class.php:910
+#: ../../lib/class/video.class.php:908
msgid "Swati"
msgstr ""
-#: ../../lib/class/video.class.php:911
+#: ../../lib/class/video.class.php:909
msgid "Southern Sotho"
msgstr ""
-#: ../../lib/class/video.class.php:912
+#: ../../lib/class/video.class.php:910
msgid "Sundanese"
msgstr ""
-#: ../../lib/class/video.class.php:913
+#: ../../lib/class/video.class.php:911
msgid "Swedish"
msgstr ""
-#: ../../lib/class/video.class.php:914
+#: ../../lib/class/video.class.php:912
msgid "Swahili"
msgstr ""
-#: ../../lib/class/video.class.php:915
+#: ../../lib/class/video.class.php:913
msgid "Tamil"
msgstr ""
-#: ../../lib/class/video.class.php:916
+#: ../../lib/class/video.class.php:914
msgid "Telugu"
msgstr ""
-#: ../../lib/class/video.class.php:917
+#: ../../lib/class/video.class.php:915
msgid "Tajik"
msgstr ""
-#: ../../lib/class/video.class.php:918
+#: ../../lib/class/video.class.php:916
msgid "Thai"
msgstr ""
-#: ../../lib/class/video.class.php:919
+#: ../../lib/class/video.class.php:917
msgid "Tigrinya"
msgstr ""
-#: ../../lib/class/video.class.php:920
+#: ../../lib/class/video.class.php:918
msgid "Turkmen"
msgstr ""
-#: ../../lib/class/video.class.php:921
+#: ../../lib/class/video.class.php:919
msgid "Tagalog"
msgstr ""
-#: ../../lib/class/video.class.php:922
+#: ../../lib/class/video.class.php:920
msgid "Tswana"
msgstr ""
-#: ../../lib/class/video.class.php:923
+#: ../../lib/class/video.class.php:921
msgid "Tonga"
msgstr ""
-#: ../../lib/class/video.class.php:924
+#: ../../lib/class/video.class.php:922
msgid "Turkish"
msgstr ""
-#: ../../lib/class/video.class.php:925
+#: ../../lib/class/video.class.php:923
msgid "Tsonga"
msgstr ""
-#: ../../lib/class/video.class.php:926
+#: ../../lib/class/video.class.php:924
msgid "Tatar"
msgstr ""
-#: ../../lib/class/video.class.php:927
+#: ../../lib/class/video.class.php:925
msgid "Twi"
msgstr ""
-#: ../../lib/class/video.class.php:928
+#: ../../lib/class/video.class.php:926
msgid "Tahitian"
msgstr ""
-#: ../../lib/class/video.class.php:929
+#: ../../lib/class/video.class.php:927
msgid "Uighur"
msgstr ""
-#: ../../lib/class/video.class.php:930
+#: ../../lib/class/video.class.php:928
msgid "Ukrainian"
msgstr ""
-#: ../../lib/class/video.class.php:931
+#: ../../lib/class/video.class.php:929
msgid "Urdu"
msgstr ""
-#: ../../lib/class/video.class.php:932
+#: ../../lib/class/video.class.php:930
msgid "Uzbek"
msgstr ""
-#: ../../lib/class/video.class.php:933
+#: ../../lib/class/video.class.php:931
msgid "Venda"
msgstr ""
-#: ../../lib/class/video.class.php:934
-#, fuzzy
+#: ../../lib/class/video.class.php:932
msgid "Vietnamese"
-msgstr "اسم الملÙ"
+msgstr ""
-#: ../../lib/class/video.class.php:935
+#: ../../lib/class/video.class.php:933
msgid "Volapuk"
msgstr ""
-#: ../../lib/class/video.class.php:936
+#: ../../lib/class/video.class.php:934
msgid "Walloon"
msgstr ""
-#: ../../lib/class/video.class.php:937
+#: ../../lib/class/video.class.php:935
msgid "Wolof"
msgstr ""
-#: ../../lib/class/video.class.php:938
+#: ../../lib/class/video.class.php:936
msgid "Xhosa"
msgstr ""
-#: ../../lib/class/video.class.php:939
+#: ../../lib/class/video.class.php:937
msgid "Yiddish"
msgstr ""
-#: ../../lib/class/video.class.php:940
+#: ../../lib/class/video.class.php:938
msgid "Yoruba"
msgstr ""
-#: ../../lib/class/video.class.php:941
+#: ../../lib/class/video.class.php:939
msgid "Zhuang"
msgstr ""
-#: ../../lib/class/video.class.php:942
+#: ../../lib/class/video.class.php:940
msgid "Chinese"
msgstr ""
-#: ../../lib/class/video.class.php:943
+#: ../../lib/class/video.class.php:941
msgid "Zulu"
msgstr ""
-#: ../../lib/class/wanted.class.php:220
-#, fuzzy
+#: ../../lib/class/wanted.class.php:222
msgid "Unknown Artist"
-msgstr "غير معروÙ"
+msgstr ""
-#: ../../lib/class/wanted.class.php:410
+#: ../../lib/class/wanted.class.php:411
msgid "Accept"
msgstr ""
-#: ../../lib/class/wanted.class.php:414
+#: ../../lib/class/wanted.class.php:415
#: ../../lib/javascript/search-data.php:51
msgid "Remove"
msgstr ""
-#: ../../lib/class/wanted.class.php:417
-#, fuzzy
+#: ../../lib/class/wanted.class.php:418
msgid "Add to wanted list"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../lib/debug.lib.php:295 ../../lib/debug.lib.php:312
+#: ../../lib/debug.lib.php:305 ../../lib/debug.lib.php:322
msgid "OK"
msgstr ""
-#: ../../lib/debug.lib.php:295
+#: ../../lib/debug.lib.php:305
msgid "ERROR"
msgstr ""
-#: ../../lib/debug.lib.php:312
+#: ../../lib/debug.lib.php:322
msgid "WARNING"
msgstr ""
@@ -3261,84 +3146,79 @@ msgid "Unable to connect to database, check your ampache config"
msgstr "Unable to connect to database, check your ampache config"
#: ../../lib/install.lib.php:91
-#, fuzzy
msgid "Unable to query database, check your ampache config"
-msgstr "تعذر اختيار قاعدة البيانات ØŒ والتØقق من اتصالك ampache التهيئة"
+msgstr ""
#: ../../lib/install.lib.php:98
msgid "Existing Database detected, unable to continue installation"
msgstr "اكتشا٠قاعدة البيانات الموجودة ØŒ غير قادرة على الاستمرار ÙÙŠ التثبيت"
-#: ../../lib/install.lib.php:154 ../../lib/install.lib.php:289
+#: ../../lib/install.lib.php:153 ../../lib/install.lib.php:288
msgid "Error writing config file"
msgstr ""
-#: ../../lib/install.lib.php:179
-#, fuzzy
+#: ../../lib/install.lib.php:178
msgid "Error: Invalid database name."
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
-#: ../../lib/install.lib.php:184
-#, fuzzy, php-format
+#: ../../lib/install.lib.php:183
+#, php-format
msgid "Error: Unable to make database connection: %s"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
-#: ../../lib/install.lib.php:194
+#: ../../lib/install.lib.php:193
msgid "Error: Database already exists and overwrite not checked"
msgstr ""
-#: ../../lib/install.lib.php:201
-#, fuzzy, php-format
+#: ../../lib/install.lib.php:200
+#, php-format
msgid "Error: Unable to create database: %s"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
-#: ../../lib/install.lib.php:218
+#: ../../lib/install.lib.php:217
#, php-format
msgid ""
"Error: Unable to create user %1$s with permissions to %2$s on %3$s: %4$s"
msgstr ""
-#: ../../lib/install.lib.php:269
-#, fuzzy
+#: ../../lib/install.lib.php:268
msgid "Invalid configuration settings"
-msgstr "بدء التهيئة"
+msgstr ""
-#: ../../lib/install.lib.php:275
+#: ../../lib/install.lib.php:274
msgid "Database Connection Failed Check Hostname, Username and Password"
msgstr ""
-#: ../../lib/install.lib.php:284
-#, fuzzy
+#: ../../lib/install.lib.php:283
msgid "Config file is not writable"
-msgstr "خطأ : لم يتم العثور على مل٠أو غير صالØ"
+msgstr ""
-#: ../../lib/install.lib.php:310
+#: ../../lib/install.lib.php:309
msgid "No Username/Password specified"
msgstr "لا اسم المستخدم / كلمة السر المØددة"
-#: ../../lib/install.lib.php:315
+#: ../../lib/install.lib.php:314
msgid "Passwords do not match"
msgstr "كلمة السر لا تعمل"
-#: ../../lib/install.lib.php:320
-#, fuzzy, php-format
+#: ../../lib/install.lib.php:319
+#, php-format
msgid "Database connection failed: %s"
-msgstr "الديسيبل الربط"
+msgstr ""
-#: ../../lib/install.lib.php:325
-#, fuzzy, php-format
+#: ../../lib/install.lib.php:324
+#, php-format
msgid "Database select failed: %s"
-msgstr "اسم قاعدة البيانات المطلوبة"
+msgstr ""
-#: ../../lib/install.lib.php:335
-#, fuzzy, php-format
+#: ../../lib/install.lib.php:334
+#, php-format
msgid "Administrative user creation failed: %s"
-msgstr "MySQL الإدارية اسم المستخدم"
+msgstr ""
#: ../../lib/login.php:80
-#, fuzzy
msgid "Error Username or Password incorrect, please try again"
-msgstr "بعد لالكتالوجات"
+msgstr ""
#: ../../lib/login.php:100
msgid "User Disabled please contact Admin"
@@ -3349,268 +3229,257 @@ msgid "User Already Logged in"
msgstr ""
#: ../../lib/login.php:129
-#, fuzzy
msgid "Unable to create local account"
-msgstr "إدارة التشغيل الديمقراطية"
+msgstr ""
-#: ../../lib/preferences.php:206 ../../lib/preferences.php:328
-#: ../../templates/show_disabled_songs.inc.php:64
-#: ../../templates/show_user_row.inc.php:58
+#: ../../lib/preferences.php:210 ../../lib/preferences.php:353
+#: ../../templates/show_disabled_songs.inc.php:77
+#: ../../templates/show_user_row.inc.php:98
msgid "Enable"
msgstr "يمكن"
-#: ../../lib/preferences.php:207 ../../lib/preferences.php:329
-#: ../../templates/show_catalog_types.inc.php:43
+#: ../../lib/preferences.php:211 ../../lib/preferences.php:354
+#: ../../templates/show_catalog_types.inc.php:45
#: ../../templates/show_duplicates.inc.php:27
-#: ../../templates/show_duplicates.inc.php:66
-#: ../../templates/show_localplay_controllers.inc.php:43
-#: ../../templates/show_user_row.inc.php:60
+#: ../../templates/show_duplicates.inc.php:78
+#: ../../templates/show_localplay_controllers.inc.php:45
+#: ../../templates/show_user_row.inc.php:100
msgid "Disable"
msgstr "يعطل"
-#: ../../lib/preferences.php:228 ../../lib/preferences.php:265
-#: ../../lib/ui.lib.php:403 ../../lib/ui.lib.php:493
+#: ../../lib/preferences.php:232 ../../lib/preferences.php:269
+#: ../../lib/ui.lib.php:406 ../../lib/ui.lib.php:489
#: ../../templates/show_adds_catalog.inc.php:27
#: ../../templates/show_gather_art.inc.php:25
-#: ../../templates/show_install_config.inc.php:135
-#: ../../templates/show_search_row.inc.php:45
-#: ../../templates/show_video.inc.php:40
-#: ../../templates/sidebar_localplay.inc.php:50
+#: ../../templates/show_install_config.inc.php:141
+#: ../../templates/show_search_row.inc.php:47
+#: ../../templates/show_video.inc.php:42
+#: ../../templates/sidebar_localplay.inc.php:75
msgid "None"
msgstr "بلا"
-#: ../../lib/preferences.php:230 ../../templates/show_edit_user.inc.php:144
-#: ../../templates/show_playtype_switch.inc.php:33
+#: ../../lib/preferences.php:234 ../../templates/show_edit_user.inc.php:147
+#: ../../templates/show_playtype_switch.inc.php:37
msgid "Stream"
msgstr "يتدÙÙ‚"
-#: ../../lib/preferences.php:233
-#: ../../modules/localplay/httpq.controller.php:469
-#: ../../modules/localplay/mpd.controller.php:469
-#: ../../modules/localplay/vlc.controller.php:479
-#: ../../templates/show_edit_user.inc.php:141
-#: ../../templates/show_playtype_switch.inc.php:37
-#: ../../templates/sidebar_home.inc.php:76
-#: ../../templates/sidebar_modules.inc.php:39
+#: ../../lib/preferences.php:237
+#: ../../modules/localplay/httpq/httpq.controller.php:471
+#: ../../modules/localplay/mpd/mpd.controller.php:457
+#: ../../modules/localplay/vlc/vlc.controller.php:480
+#: ../../templates/show_edit_user.inc.php:144
+#: ../../templates/show_playtype_switch.inc.php:55
+#: ../../templates/sidebar_home.inc.php:127
+#: ../../templates/sidebar_modules.inc.php:40
msgid "Democratic"
msgstr "الديمقراطية"
-#: ../../lib/preferences.php:236 ../../templates/show_edit_user.inc.php:142
-#: ../../templates/show_playtype_switch.inc.php:35
-#: ../../templates/sidebar_home.inc.php:85 ../../templates/sidebar.inc.php:35
-#: ../../templates/sidebar_localplay.inc.php:38
+#: ../../lib/preferences.php:240 ../../templates/show_edit_user.inc.php:145
+#: ../../templates/show_playtype_switch.inc.php:46
+#: ../../templates/sidebar_home.inc.php:141 ../../templates/sidebar.inc.php:35
+#: ../../templates/sidebar_localplay.inc.php:39
+#: ../../templates/sidebar_localplay.inc.php:40
msgid "Localplay"
msgstr "لعب المØلية"
-#: ../../lib/preferences.php:238
-#: ../../templates/show_playtype_switch.inc.php:39
-#, fuzzy
+#: ../../lib/preferences.php:242
+#: ../../templates/show_playtype_switch.inc.php:63
msgid "Web Player"
-msgstr "الشبكة الدرب"
-
-#: ../../lib/preferences.php:245
-msgid "M3U"
-msgstr ""
-
-#: ../../lib/preferences.php:246
-msgid "Simple M3U"
-msgstr ""
-
-#: ../../lib/preferences.php:247
-msgid "PLS"
-msgstr ""
-
-#: ../../lib/preferences.php:248
-msgid "Asx"
msgstr ""
#: ../../lib/preferences.php:249
-msgid "RAM"
+msgid "M3U"
msgstr ""
#: ../../lib/preferences.php:250
+msgid "Simple M3U"
+msgstr ""
+
+#: ../../lib/preferences.php:251
+msgid "PLS"
+msgstr ""
+
+#: ../../lib/preferences.php:252
+msgid "Asx"
+msgstr ""
+
+#: ../../lib/preferences.php:253
+msgid "RAM"
+msgstr ""
+
+#: ../../lib/preferences.php:254
msgid "XSPF"
msgstr ""
-#: ../../lib/preferences.php:286
-#, fuzzy
+#: ../../lib/preferences.php:294
msgid "Disabled"
-msgstr "يعطل"
+msgstr ""
-#: ../../lib/preferences.php:288
-#, fuzzy
+#: ../../lib/preferences.php:296
msgid "Manager"
-msgstr "إدارة المØتوى"
+msgstr ""
-#: ../../lib/preferences.php:305
+#: ../../lib/preferences.php:330
msgid "Send on Add"
msgstr ""
-#: ../../lib/preferences.php:306
+#: ../../lib/preferences.php:331
msgid "Send and Clear on Add"
msgstr ""
-#: ../../lib/preferences.php:307
+#: ../../lib/preferences.php:332
msgid "Clear on Send"
msgstr ""
-#: ../../lib/preferences.php:308 ../../lib/preferences.php:315
-#: ../../lib/preferences.php:351
-#: ../../templates/show_install_config.inc.php:113
+#: ../../lib/preferences.php:333 ../../lib/preferences.php:340
+#: ../../lib/preferences.php:376
+#: ../../templates/show_install_config.inc.php:115
#: ../../templates/show_manage_democratic.inc.php:30
msgid "Default"
msgstr "اÙتراضي"
-#: ../../lib/preferences.php:316
+#: ../../lib/preferences.php:341
msgid "Always"
msgstr ""
-#: ../../lib/preferences.php:352
+#: ../../lib/preferences.php:377
msgid "Year ascending"
msgstr ""
-#: ../../lib/preferences.php:353
+#: ../../lib/preferences.php:378
msgid "Year descending"
msgstr ""
-#: ../../lib/preferences.php:354
+#: ../../lib/preferences.php:379
msgid "Name ascending"
msgstr ""
-#: ../../lib/preferences.php:355
+#: ../../lib/preferences.php:380
msgid "Name descending"
msgstr ""
-#: ../../lib/rating.lib.php:43
+#: ../../lib/preferences.php:391
+msgid "Click for grant Ampache to "
+msgstr ""
+
+#: ../../lib/rating.lib.php:42
msgid "Don't Play"
msgstr ""
-#: ../../lib/rating.lib.php:45
+#: ../../lib/rating.lib.php:44
msgid "It's Pretty Bad"
msgstr ""
-#: ../../lib/rating.lib.php:47
+#: ../../lib/rating.lib.php:46
msgid "It's Ok"
msgstr ""
-#: ../../lib/rating.lib.php:49
+#: ../../lib/rating.lib.php:48
msgid "It's Pretty Good"
msgstr ""
-#: ../../lib/rating.lib.php:51
+#: ../../lib/rating.lib.php:50
msgid "I Love It!"
msgstr ""
-#: ../../lib/rating.lib.php:53
-#, fuzzy
+#: ../../lib/rating.lib.php:52
msgid "It's Insane"
-msgstr "درجة نشطة"
+msgstr ""
-#: ../../lib/rating.lib.php:56
+#: ../../lib/rating.lib.php:55
msgid "Off the Charts!"
msgstr ""
-#: ../../lib/ui.lib.php:108 ../../templates/header.inc.php:349
+#: ../../lib/ui.lib.php:120 ../../templates/header.inc.php:400
#: ../../templates/sidebar.inc.php:33 ../../templates/sidebar.light.inc.php:27
msgid "Home"
msgstr "منزل"
-#: ../../lib/ui.lib.php:111 ../../templates/show_add_upload.inc.php:26
-#: ../../templates/show_album.inc.php:155
-#: ../../templates/show_album.inc.php:156
-#: ../../templates/show_artist.inc.php:158
-#: ../../templates/show_artist.inc.php:159
-#: ../../templates/sidebar_home.inc.php:51
+#: ../../lib/ui.lib.php:123 ../../templates/show_add_upload.inc.php:26
+#: ../../templates/show_album.inc.php:244
+#: ../../templates/show_album.inc.php:246
+#: ../../templates/show_artist.inc.php:251
+#: ../../templates/show_artist.inc.php:253
+#: ../../templates/sidebar_home.inc.php:69
msgid "Upload"
msgstr ""
-#: ../../lib/ui.lib.php:114
-#, fuzzy
+#: ../../lib/ui.lib.php:126
msgid "Local Play"
-msgstr "لعب المØلية"
+msgstr ""
-#: ../../lib/ui.lib.php:117
-#, fuzzy
+#: ../../lib/ui.lib.php:129
msgid "Random Play"
-msgstr "قاعدة التشغيل"
+msgstr ""
-#: ../../lib/ui.lib.php:123 ../../templates/show_search_bar.inc.php:43
-#: ../../templates/show_search_form.inc.php:53
-#: ../../templates/sidebar_home.inc.php:130
-#, fuzzy
+#: ../../lib/ui.lib.php:135 ../../templates/show_search_bar.inc.php:47
+#: ../../templates/show_search_form.inc.php:85
+#: ../../templates/sidebar_home.inc.php:224
msgid "Search"
-msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+msgstr ""
-#: ../../lib/ui.lib.php:126 ../../templates/show_user.inc.php:65
-#: ../../templates/show_user_row.inc.php:54 ../../templates/sidebar.inc.php:37
+#: ../../lib/ui.lib.php:138 ../../templates/show_user.inc.php:79
+#: ../../templates/show_user_row.inc.php:92 ../../templates/sidebar.inc.php:37
#: ../../templates/sidebar_preferences.inc.php:30
-#, fuzzy
msgid "Preferences"
-msgstr "الأÙضلية"
+msgstr ""
-#: ../../lib/ui.lib.php:129 ../../lib/ui.lib.php:133
-#, fuzzy
+#: ../../lib/ui.lib.php:141 ../../lib/ui.lib.php:145
msgid "Admin-Catalog"
-msgstr "نوع التسويقي"
-
-#: ../../lib/ui.lib.php:137
-msgid "Admin-User Management"
-msgstr ""
-
-#: ../../lib/ui.lib.php:141
-msgid "Admin-Mail Users"
-msgstr ""
-
-#: ../../lib/ui.lib.php:145
-msgid "Admin-Manage Access Lists"
msgstr ""
#: ../../lib/ui.lib.php:149
-#, fuzzy
-msgid "Admin-Site Preferences"
-msgstr "تØديث تÙضيلات"
+msgid "Admin-User Management"
+msgstr ""
#: ../../lib/ui.lib.php:153
-#, fuzzy
+msgid "Admin-Mail Users"
+msgstr ""
+
+#: ../../lib/ui.lib.php:157
+msgid "Admin-Manage Access Lists"
+msgstr ""
+
+#: ../../lib/ui.lib.php:161
+msgid "Admin-Site Preferences"
+msgstr ""
+
+#: ../../lib/ui.lib.php:165
msgid "Admin-Manage Modules"
-msgstr "المدير التسويقي"
+msgstr ""
-#: ../../lib/ui.lib.php:157 ../../templates/sidebar_home.inc.php:24
-#, fuzzy
+#: ../../lib/ui.lib.php:169 ../../templates/sidebar_home.inc.php:24
msgid "Browse Music"
-msgstr "تصÙØ"
+msgstr ""
-#: ../../lib/ui.lib.php:169 ../../templates/show_stats.inc.php:26
-#: ../../templates/sidebar_home.inc.php:124
+#: ../../lib/ui.lib.php:181 ../../templates/show_stats.inc.php:26
+#: ../../templates/sidebar_home.inc.php:214
msgid "Statistics"
msgstr "اØصاءات"
-#: ../../lib/ui.lib.php:239 ../../lib/ui.lib.php:294
+#: ../../lib/ui.lib.php:248 ../../lib/ui.lib.php:301
msgid "Add New"
msgstr ""
-#: ../../lib/ui.lib.php:717
+#: ../../lib/ui.lib.php:711
msgid "On"
msgstr ""
-#: ../../lib/ui.lib.php:719
+#: ../../lib/ui.lib.php:713
msgid "Off"
msgstr ""
#: ../../lostpassword.php:39
-#, fuzzy
msgid "Password has been sent"
-msgstr "كلمة السر لا تعمل"
+msgstr ""
#: ../../lostpassword.php:41
-#, fuzzy
msgid "Password has not been sent"
-msgstr "كلمة السر لا تعمل"
+msgstr ""
#: ../../lostpassword.php:60
-#, fuzzy
msgid "Lost Password"
-msgstr "كلمة السر"
+msgstr ""
#: ../../lostpassword.php:64
#, php-format
@@ -3618,450 +3487,436 @@ msgid "A user from %s has requested a password reset for '%s'."
msgstr ""
#: ../../lostpassword.php:66
-#, fuzzy, php-format
+#, php-format
msgid "The password has been set to: %s"
-msgstr "كلمة السر لا تعمل"
+msgstr ""
#: ../../modules/Beets/Catalog.php:123
msgid "Running Beets Update"
msgstr ""
#: ../../modules/Beets/Catalog.php:165
-#: ../../modules/catalog/remote.catalog.php:273
-#: ../../modules/catalog/soundcloud.catalog.php:301
-#: ../../modules/catalog/subsonic.catalog.php:249
-#, fuzzy, php-format
+#: ../../modules/catalog/remote/remote.catalog.php:267
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:295
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:243
+#, php-format
msgid "Unable to Insert Song - %s"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
-#: ../../modules/catalog/beets.catalog.php:85
-#, fuzzy
+#: ../../modules/catalog/beets/beets.catalog.php:85
msgid "Beets Database File"
-msgstr "قاعدة بيانات Ampache اسم المستخدم"
+msgstr ""
-#: ../../modules/catalog/beets.catalog.php:101
+#: ../../modules/catalog/beets/beets.catalog.php:102
msgid "Error: Beets selected, but no Beets DB File provided"
msgstr ""
-#: ../../modules/catalog/beets.catalog.php:111
-#: ../../modules/catalog/beetsremote.catalog.php:112
-#: ../../modules/catalog/dropbox.catalog.php:194
-#: ../../modules/catalog/local.catalog.php:207
-#: ../../modules/catalog/remote.catalog.php:168
-#: ../../modules/catalog/soundcloud.catalog.php:187
-#: ../../modules/catalog/subsonic.catalog.php:169
+#: ../../modules/catalog/beets/beets.catalog.php:112
+#: ../../modules/catalog/beetsremote/beetsremote.catalog.php:113
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:192
+#: ../../modules/catalog/local/local.catalog.php:198
+#: ../../modules/catalog/remote/remote.catalog.php:162
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:181
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:161
#, php-format
msgid "Error: Catalog with %s already exists"
msgstr ""
-#: ../../modules/catalog/beetsremote.catalog.php:86
+#: ../../modules/catalog/beetsremote/beetsremote.catalog.php:86
msgid "Beets Server URI"
msgstr ""
-#: ../../modules/catalog/beetsremote.catalog.php:102
+#: ../../modules/catalog/beetsremote/beetsremote.catalog.php:103
msgid "Error: Beets selected, but path is not a URL"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:70
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:68
msgid "Go to https://www.dropbox.com/developers/apps/create"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:71
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:69
msgid "Select 'Dropbox API app'"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:72
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:70
msgid "Select 'Files and datastores'"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:73
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:71
msgid "Select 'No' at 'Can your app be limited to its own, private folder?'"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:74
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:72
msgid ""
"Select 'Specific file types' at 'What type of files does your app need "
"access to?'"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:75
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:73
msgid "Check Videos and Audio files"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:76
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:74
msgid "Give a name to your application and create it"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:78
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:76
msgid "Copy your App key and App secret in the following fields."
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:79
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:77
msgid ""
"After preparing the catalog with pressing the 'Add catalog' button,
" "you have to 'Make it ready' on the catalog table." msgstr "" -#: ../../modules/catalog/dropbox.catalog.php:116 -#: ../../templates/show_account.inc.php:93 -#: ../../templates/show_edit_user.inc.php:129 +#: ../../modules/catalog/dropbox/dropbox.catalog.php:114 +#: ../../templates/show_account.inc.php:109 +#: ../../templates/show_edit_user.inc.php:132 msgid "API Key" msgstr "" -#: ../../modules/catalog/dropbox.catalog.php:117 -#: ../../modules/catalog/soundcloud.catalog.php:114 +#: ../../modules/catalog/dropbox/dropbox.catalog.php:115 +#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:107 #: ../../templates/show_add_share.inc.php:35 msgid "Secret" msgstr "" -#: ../../modules/catalog/dropbox.catalog.php:118 -#: ../../modules/catalog/local.catalog.php:111 +#: ../../modules/catalog/dropbox/dropbox.catalog.php:116 +#: ../../modules/catalog/local/local.catalog.php:104 #: ../../templates/show_stats.inc.php:71 msgid "Path" msgstr "مسار" -#: ../../modules/catalog/dropbox.catalog.php:119 +#: ../../modules/catalog/dropbox/dropbox.catalog.php:117 msgid "Get chunked files on analyze" msgstr "" -#: ../../modules/catalog/dropbox.catalog.php:178 -#, fuzzy +#: ../../modules/catalog/dropbox/dropbox.catalog.php:176 msgid "Error: API Key and Secret Required for Dropbox Catalogs" -msgstr "بعد لالكتالوجات" +msgstr "" -#: ../../modules/catalog/dropbox.catalog.php:184 +#: ../../modules/catalog/dropbox/dropbox.catalog.php:182 msgid "Invalid: "
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:215
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:213
#, php-format
msgid "Go to %s to generate the authorization code, then enter it bellow."
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:254
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:252
msgid "Running Dropbox Remote Update"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:296
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:294
#, php-format
msgid "Catalog Update Finished. Total Media: [%s]"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:298
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:296
msgid "No media updated, do you respect the patterns?"
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:301
-#: ../../modules/catalog/dropbox.catalog.php:443
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:299
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:441
msgid "API Error: cannot connect to Dropbox."
msgstr ""
-#: ../../modules/catalog/dropbox.catalog.php:333
+#: ../../modules/catalog/dropbox/dropbox.catalog.php:331
msgid "API Error: Cannot access file/folder at "
msgstr ""
-#: ../../modules/catalog/local.catalog.php:184
-#, fuzzy
+#: ../../modules/catalog/local/local.catalog.php:175
msgid "Error: Path not specified"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
-#: ../../modules/catalog/local.catalog.php:190
+#: ../../modules/catalog/local/local.catalog.php:181
msgid "Error: Defined Path is inside an existing catalog"
msgstr ""
-#: ../../modules/catalog/local.catalog.php:197
+#: ../../modules/catalog/local/local.catalog.php:188
#, php-format
msgid "Error: %s is not readable or does not exist"
msgstr ""
-#: ../../modules/catalog/local.catalog.php:246
-#, fuzzy, php-format
+#: ../../modules/catalog/local/local.catalog.php:237
+#, php-format
msgid "Error: Unable to open %s"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
-#: ../../modules/catalog/local.catalog.php:253
-#: ../../modules/catalog/local.catalog.php:316
-#, fuzzy, php-format
+#: ../../modules/catalog/local/local.catalog.php:244
+#: ../../modules/catalog/local/local.catalog.php:307
+#, php-format
msgid "Error: Unable to change to directory %s"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
#. HINT: FullFile
-#: ../../modules/catalog/local.catalog.php:341
-#, fuzzy, php-format
+#: ../../modules/catalog/local/local.catalog.php:332
+#, php-format
msgid "Error: Unable to get filesize for %s"
-msgstr "خطأ : تعذر الاتصال لجعل قاعدة البيانات"
+msgstr ""
#. HINT: FullFile
-#: ../../modules/catalog/local.catalog.php:348
+#: ../../modules/catalog/local/local.catalog.php:339
#, php-format
msgid "%s is not readable by ampache"
msgstr ""
#. HINT: FullFile
-#: ../../modules/catalog/local.catalog.php:370
+#: ../../modules/catalog/local/local.catalog.php:361
#, php-format
msgid "%s does not match site charset"
msgstr ""
-#: ../../modules/catalog/local.catalog.php:480
+#: ../../modules/catalog/local/local.catalog.php:471
msgid "N/A"
msgstr ""
-#: ../../modules/catalog/local.catalog.php:486
+#: ../../modules/catalog/local/local.catalog.php:477
#, php-format
msgid ""
"Catalog Update Finished. Total Time: [%s] Total Media: [%s] Media Per "
"Second: [%s]"
msgstr ""
-#: ../../modules/catalog/local.catalog.php:566
+#: ../../modules/catalog/local/local.catalog.php:556
#, php-format
msgid "%s does not exist or is not readable"
msgstr ""
-#: ../../modules/catalog/local.catalog.php:596
+#: ../../modules/catalog/local/local.catalog.php:585
msgid "Catalog Root unreadable, stopping clean"
msgstr ""
-#: ../../modules/catalog/local.catalog.php:620
+#: ../../modules/catalog/local/local.catalog.php:609
msgid "All files would be removed. Doing nothing"
msgstr ""
-#: ../../modules/catalog/local.catalog.php:659
+#: ../../modules/catalog/local/local.catalog.php:648
#, php-format
msgid "Error File Not Found or 0 Bytes: %s"
msgstr ""
-#: ../../modules/catalog/remote.catalog.php:109
+#: ../../modules/catalog/remote/remote.catalog.php:102
msgid "Uri"
msgstr ""
-#: ../../modules/catalog/remote.catalog.php:111
-#: ../../modules/catalog/subsonic.catalog.php:111
-#: ../../modules/localplay/httpq.controller.php:208
-#: ../../modules/localplay/mpd.controller.php:239
-#: ../../modules/localplay/vlc.controller.php:194
-#: ../../modules/localplay/xbmc.controller.php:200
+#: ../../modules/catalog/remote/remote.catalog.php:104
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:104
+#: ../../modules/localplay/httpq/httpq.controller.php:199
+#: ../../modules/localplay/mpd/mpd.controller.php:228
+#: ../../modules/localplay/vlc/vlc.controller.php:183
+#: ../../modules/localplay/xbmc/xbmc.controller.php:191
#: ../../templates/show_add_user.inc.php:63
-#: ../../templates/show_edit_user.inc.php:84
+#: ../../templates/show_edit_user.inc.php:87
#: ../../templates/show_install_account.inc.php:57
-#: ../../templates/show_login_form.inc.php:65
-#: ../../templates/show_user_registration.inc.php:122
+#: ../../templates/show_login_form.inc.php:64
+#: ../../templates/show_user_registration.inc.php:158
msgid "Password"
msgstr "كلمة السر"
-#: ../../modules/catalog/remote.catalog.php:152
+#: ../../modules/catalog/remote/remote.catalog.php:146
msgid "Error: Remote selected, but path is not a URL"
msgstr ""
-#: ../../modules/catalog/remote.catalog.php:157
-#, fuzzy
+#: ../../modules/catalog/remote/remote.catalog.php:151
msgid "Error: Username and Password Required for Remote Catalogs"
-msgstr "بعد لالكتالوجات"
+msgstr ""
-#: ../../modules/catalog/remote.catalog.php:185
+#: ../../modules/catalog/remote/remote.catalog.php:179
msgid "Running Remote Update"
msgstr ""
-#: ../../modules/catalog/remote.catalog.php:219
+#: ../../modules/catalog/remote/remote.catalog.php:213
msgid "Error connecting to remote server"
msgstr ""
-#: ../../modules/catalog/remote.catalog.php:246
+#: ../../modules/catalog/remote/remote.catalog.php:240
#, php-format
msgid "%u remote catalog(s) found (%u songs)"
msgstr ""
-#: ../../modules/catalog/remote.catalog.php:281
+#: ../../modules/catalog/remote/remote.catalog.php:275
msgid "Completed updating remote catalog(s)."
msgstr ""
-#: ../../modules/catalog/soundcloud.catalog.php:113
-#, fuzzy
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:106
msgid "User ID"
-msgstr "مستخدم"
+msgstr ""
-#: ../../modules/catalog/soundcloud.catalog.php:177
-#, fuzzy
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:171
msgid "Error: UserID and Secret Required for SoundCloud Catalogs"
-msgstr "بعد لالكتالوجات"
+msgstr ""
-#: ../../modules/catalog/soundcloud.catalog.php:240
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:234
msgid "Running SoundCloud Remote Update"
msgstr ""
-#: ../../modules/catalog/soundcloud.catalog.php:309
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:303
msgid "Completed updating SoundCloud catalog(s)."
msgstr ""
-#: ../../modules/catalog/soundcloud.catalog.php:309
-#: ../../modules/catalog/subsonic.catalog.php:267
-#, fuzzy
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:303
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:263
msgid "Songs added."
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../modules/catalog/soundcloud.catalog.php:314
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:308
msgid "API Error: cannot get song list."
msgstr ""
-#: ../../modules/catalog/soundcloud.catalog.php:317
-#: ../../modules/catalog/soundcloud.catalog.php:374
-#: ../../modules/catalog/soundcloud.catalog.php:447
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:311
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:367
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:440
msgid "API Error: cannot connect to SoundCloud."
msgstr ""
-#: ../../modules/catalog/soundcloud.catalog.php:320
-#: ../../modules/catalog/soundcloud.catalog.php:378
-#: ../../modules/catalog/soundcloud.catalog.php:451
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:314
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:371
+#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:444
msgid "SoundCloud exception: "
msgstr ""
-#: ../../modules/catalog/subsonic.catalog.php:109
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:102
msgid "URI"
msgstr ""
-#: ../../modules/catalog/subsonic.catalog.php:154
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:146
msgid "Error: Subsonic selected, but path is not a URL"
msgstr ""
-#: ../../modules/catalog/subsonic.catalog.php:159
-#, fuzzy
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:151
msgid "Error: Username and Password Required for Subsonic Catalogs"
-msgstr "بعد لالكتالوجات"
+msgstr ""
-#: ../../modules/catalog/subsonic.catalog.php:189
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:181
msgid "Running Subsonic Remote Update"
msgstr ""
-#: ../../modules/catalog/subsonic.catalog.php:257
-#, fuzzy
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:252
msgid "Song Error."
-msgstr "البوم الÙÙ†"
+msgstr ""
-#: ../../modules/catalog/subsonic.catalog.php:262
-#, fuzzy
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:258
msgid "Album Error."
-msgstr "البوم الÙÙ†"
+msgstr ""
-#: ../../modules/catalog/subsonic.catalog.php:267
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:263
msgid "Completed updating Subsonic catalog(s)."
msgstr ""
-#: ../../modules/catalog/subsonic.catalog.php:272
-#, fuzzy
+#: ../../modules/catalog/subsonic/subsonic.catalog.php:269
msgid "Artist Error."
-msgstr "الكتابة التهيئة"
+msgstr ""
-#: ../../modules/localplay/httpq.controller.php:205
-#: ../../modules/localplay/mpd.controller.php:236
-#: ../../modules/localplay/upnp.controller.php:179
-#: ../../modules/localplay/vlc.controller.php:191
-#: ../../modules/localplay/xbmc.controller.php:196
-#, fuzzy
+#: ../../modules/localplay/httpq/httpq.controller.php:196
+#: ../../modules/localplay/mpd/mpd.controller.php:225
+#: ../../modules/localplay/upnp/upnp.controller.php:179
+#: ../../modules/localplay/vlc/vlc.controller.php:180
+#: ../../modules/localplay/xbmc/xbmc.controller.php:187
msgid "Instance Name"
-msgstr "إضاÙØ© درجة"
+msgstr ""
-#: ../../modules/localplay/httpq.controller.php:206
-#: ../../modules/localplay/mpd.controller.php:237
-#: ../../modules/localplay/vlc.controller.php:192
-#: ../../modules/localplay/xbmc.controller.php:197
-#, fuzzy
+#: ../../modules/localplay/httpq/httpq.controller.php:197
+#: ../../modules/localplay/mpd/mpd.controller.php:226
+#: ../../modules/localplay/vlc/vlc.controller.php:181
+#: ../../modules/localplay/xbmc/xbmc.controller.php:188
msgid "Hostname"
-msgstr "MySQL المضيÙ"
+msgstr ""
-#: ../../modules/localplay/httpq.controller.php:207
-#: ../../modules/localplay/mpd.controller.php:238
-#: ../../modules/localplay/vlc.controller.php:193
-#: ../../modules/localplay/xbmc.controller.php:198
+#: ../../modules/localplay/httpq/httpq.controller.php:198
+#: ../../modules/localplay/mpd/mpd.controller.php:227
+#: ../../modules/localplay/vlc/vlc.controller.php:182
+#: ../../modules/localplay/xbmc/xbmc.controller.php:189
#: ../../templates/show_add_channel.inc.php:63
-#: ../../templates/show_channels.inc.php:32
+#: ../../templates/show_channels.inc.php:34
#: ../../templates/show_edit_channel_row.inc.php:60
msgid "Port"
msgstr ""
-#: ../../modules/localplay/httpq.controller.php:473
-#: ../../modules/localplay/mpd.controller.php:473
-#: ../../modules/localplay/vlc.controller.php:483
+#: ../../modules/localplay/httpq/httpq.controller.php:475
+#: ../../modules/localplay/mpd/mpd.controller.php:461
+#: ../../modules/localplay/vlc/vlc.controller.php:484
#: ../../templates/show_add_channel.inc.php:76
-#: ../../templates/show_channels.inc.php:34
+#: ../../templates/show_channels.inc.php:36
#: ../../templates/show_edit_channel_row.inc.php:69
#: ../../templates/show_edit_search_row.inc.php:42
#: ../../templates/show_localplay_status.inc.php:48
-#: ../../templates/show_searches.inc.php:41
-#: ../../templates/show_searches.inc.php:69
-#: ../../templates/sidebar_home.inc.php:92
+#: ../../templates/show_searches.inc.php:48
+#: ../../templates/show_searches.inc.php:84
+#: ../../templates/sidebar_home.inc.php:154
msgid "Random"
msgstr "عشوائية"
-#: ../../modules/localplay/upnp.controller.php:180
+#: ../../modules/localplay/upnp/upnp.controller.php:180
#: ../../templates/show_add_channel.inc.php:49
#: ../../templates/show_edit_channel_row.inc.php:52
msgid "URL"
msgstr ""
-#: ../../modules/plugins/CatalogFavorites.plugin.php:101
-#: ../../templates/show_album_group_disks.inc.php:66
-#: ../../templates/show_album_group_disks.inc.php:67
-#: ../../templates/show_album_group_disks.inc.php:115
-#: ../../templates/show_album.inc.php:101
-#: ../../templates/show_album.inc.php:102
-#: ../../templates/show_album_row.inc.php:29
-#: ../../templates/show_artist_row.inc.php:29
-#: ../../templates/show_playlist_row.inc.php:29
-#: ../../templates/show_playlist_song_row.inc.php:29
-#: ../../templates/show_random_albums.inc.php:48
-#: ../../templates/show_random_videos.inc.php:46
-#: ../../templates/show_recently_played.inc.php:103
-#: ../../templates/show_search_row.inc.php:29
-#: ../../templates/show_song.inc.php:63
-#: ../../templates/show_song_preview_row.inc.php:28
-#: ../../templates/show_song_row.inc.php:29
-#: ../../templates/show_tvshow_row.inc.php:29
-#: ../../templates/show_tvshow_season_row.inc.php:29
-#: ../../templates/show_video.inc.php:80
-#: ../../templates/show_video_row.inc.php:34
-#, fuzzy
+#: ../../modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php:114
+#: ../../templates/show_album_group_disks.inc.php:70
+#: ../../templates/show_album_group_disks.inc.php:72
+#: ../../templates/show_album_group_disks.inc.php:139
+#: ../../templates/show_album.inc.php:122
+#: ../../templates/show_album.inc.php:124
+#: ../../templates/show_album_row.inc.php:30
+#: ../../templates/show_artist_row.inc.php:30
+#: ../../templates/show_playlist_row.inc.php:32
+#: ../../templates/show_playlist_song_row.inc.php:33
+#: ../../templates/show_random_albums.inc.php:63
+#: ../../templates/show_random_videos.inc.php:53
+#: ../../templates/show_recently_played.inc.php:110
+#: ../../templates/show_search_row.inc.php:30
+#: ../../templates/show_song.inc.php:95
+#: ../../templates/show_song_preview_row.inc.php:30
+#: ../../templates/show_song_row.inc.php:41
+#: ../../templates/show_tvshow_row.inc.php:30
+#: ../../templates/show_tvshow_season_row.inc.php:30
+#: ../../templates/show_video.inc.php:108
+#: ../../templates/show_video_row.inc.php:37
msgid "Play last"
-msgstr "التشغيل"
+msgstr ""
-#: ../../modules/plugins/CatalogFavorites.plugin.php:104
-#: ../../templates/show_album_group_disks.inc.php:73
-#: ../../templates/show_album_group_disks.inc.php:74
-#: ../../templates/show_album_group_disks.inc.php:119
-#: ../../templates/show_album.inc.php:109
-#: ../../templates/show_album.inc.php:110
-#: ../../templates/show_album_row.inc.php:51
-#: ../../templates/show_artist_row.inc.php:51
-#: ../../templates/show_playlist_row.inc.php:40
-#: ../../templates/show_playlist_song_row.inc.php:37
-#: ../../templates/show_random_albums.inc.php:51
-#: ../../templates/show_recently_played.inc.php:114
-#: ../../templates/show_search_row.inc.php:37
-#: ../../templates/show_song.inc.php:70
-#: ../../templates/show_song_preview_row.inc.php:38
-#: ../../templates/show_song_row.inc.php:40
-#, fuzzy
+#: ../../modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php:117
+#: ../../templates/show_album_group_disks.inc.php:83
+#: ../../templates/show_album_group_disks.inc.php:85
+#: ../../templates/show_album_group_disks.inc.php:143
+#: ../../templates/show_album.inc.php:136
+#: ../../templates/show_album.inc.php:138
+#: ../../templates/show_album_row.inc.php:55
+#: ../../templates/show_artist_row.inc.php:55
+#: ../../templates/show_playlist_row.inc.php:43
+#: ../../templates/show_playlist_song_row.inc.php:42
+#: ../../templates/show_random_albums.inc.php:71
+#: ../../templates/show_recently_played.inc.php:131
+#: ../../templates/show_search_row.inc.php:39
+#: ../../templates/show_song.inc.php:111
+#: ../../templates/show_song_preview_row.inc.php:44
+#: ../../templates/show_song_row.inc.php:52
msgid "Add to temporary playlist"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../modules/plugins/CatalogFavorites.plugin.php:107
+#: ../../modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php:120
msgid "recommended by"
msgstr ""
-#: ../../modules/plugins/GoogleMaps.plugin.php:114
-#, fuzzy
-msgid "Hits:"
-msgstr "مخبأ عدد الزيارات :"
+#: ../../modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php:95
+msgid "Friends Timeline"
+msgstr ""
-#: ../../modules/plugins/GoogleMaps.plugin.php:115
-#, fuzzy
+#: ../../modules/plugins/GoogleMaps/GoogleMaps.plugin.php:118
+msgid "Hits:"
+msgstr ""
+
+#: ../../modules/plugins/GoogleMaps/GoogleMaps.plugin.php:119
msgid "Last activity:"
-msgstr "تØقق من الماضي"
+msgstr ""
#: ../../playlist.php:54
-#, fuzzy
msgid "Playlist Created"
-msgstr "الاسم التشغيل"
+msgstr ""
#: ../../playlist.php:54
#, php-format
@@ -4069,9 +3924,8 @@ msgid "%1$s (%2$s) has been created"
msgstr ""
#: ../../playlist.php:80
-#, fuzzy
msgid "Playlist Imported"
-msgstr "نوع التشغيل"
+msgstr ""
#: ../../playlist.php:83
#, php-format
@@ -4079,20 +3933,14 @@ msgid "Successfully imported playlist with %d song."
msgid_plural "Successfully imported playlist with %d songs."
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
#: ../../playlist.php:86
-#, fuzzy
msgid "Playlist Not Imported"
-msgstr "نوع التشغيل"
+msgstr ""
#: ../../playlist.php:135
-#, fuzzy
msgid "Empty Playlists Deleted"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
#: ../../plex/web/index.php:32
msgid ""
@@ -4147,55 +3995,53 @@ msgstr ""
msgid "Please fill in your city"
msgstr ""
-#: ../../preferences.php:140
+#: ../../preferences.php:139
msgid "Error Update Failed"
msgstr ""
-#: ../../preferences.php:144
+#: ../../preferences.php:145 ../../preferences.php:163
msgid "Your Account has been updated"
msgstr ""
-#: ../../preferences.php:148
+#: ../../preferences.php:149
msgid "User updated successfully"
msgstr ""
-#: ../../pvmsg.php:65
-#, fuzzy
+#: ../../preferences.php:167
+msgid "Your Account has not been updated"
+msgstr ""
+
+#: ../../pvmsg.php:67
msgid "Message Sent"
-msgstr "مستخدم"
+msgstr ""
-#: ../../pvmsg.php:86
-#, fuzzy
+#: ../../pvmsg.php:90
msgid "Messages State Changed"
-msgstr "مستخدم"
+msgstr ""
-#: ../../pvmsg.php:86
+#: ../../pvmsg.php:90
msgid "Messages state have been changed."
msgstr ""
-#: ../../pvmsg.php:93
-#, fuzzy
+#: ../../pvmsg.php:99
msgid "Message Deletion"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../pvmsg.php:94
+#: ../../pvmsg.php:100
msgid "Are you sure you want to permanently delete the selected messages?"
msgstr ""
-#: ../../pvmsg.php:116
-#, fuzzy
+#: ../../pvmsg.php:124
msgid "Messages Deletion"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../pvmsg.php:116
-#, fuzzy
+#: ../../pvmsg.php:124
msgid "Messages have been deleted."
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../radio.php:60
-#, fuzzy
msgid "Radio Station Added"
-msgstr "Ù…Øطات إذاعية"
+msgstr ""
#: ../../register.php:72
msgid "Error Captcha Required"
@@ -4214,14 +4060,12 @@ msgid "You did not enter a username"
msgstr ""
#: ../../register.php:113
-#, fuzzy
msgid "You must enter a password"
-msgstr "كلمة السر"
+msgstr ""
#: ../../register.php:117
-#, fuzzy
msgid "Your passwords do not match"
-msgstr "كلمة السر لا تعمل"
+msgstr ""
#: ../../rest/index.php:47 ../../server/xml.server.php:43
msgid "Access Control not Enabled"
@@ -4232,43 +4076,33 @@ msgid "View on MusicBrainz"
msgstr ""
#: ../../search.php:54
-#, fuzzy
msgid "Search Saved"
-msgstr "نوع البØØ«"
+msgstr ""
#: ../../search.php:54
#, php-format
msgid "Your Search has been saved as a Smart Playlist with name %s"
msgstr ""
-#: ../../server/index.ajax.php:42
+#: ../../server/index.ajax.php:44
#, php-format
msgid ""
-"No catalog configured yet. To start streaming your media, you now need to %s "
-"add a catalog %s"
+"No catalog configured yet. To start streaming your media, you now need to %s"
+" add a catalog %s"
msgstr ""
-#: ../../server/player.ajax.php:41
-#: ../../templates/show_html5_player.inc.php:430
-#, fuzzy
+#: ../../server/player.ajax.php:43
+#: ../../templates/show_html5_player.inc.php:489
msgid "My Broadcast"
-msgstr "الÙنان والعنوان"
+msgstr ""
-#: ../../server/playlist.ajax.php:137
-#, fuzzy
+#: ../../server/playlist.ajax.php:139
msgid "Added to playlist"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../server/search.ajax.php:191
+#: ../../server/search.ajax.php:193
#: ../../templates/show_missing_artists.inc.php:23
-#, fuzzy
msgid "Missing Artists"
-msgstr "البوم"
-
-#: ../../server/sse.server.php:129
-msgid ""
-"This subdirectory is not part of an existing catalog. Update cannot be "
-"processed."
msgstr ""
#: ../../server/xml.server.php:54
@@ -4280,9 +4114,8 @@ msgid "Unauthorized access attempt to API - ACL Error"
msgstr ""
#: ../../share.php:75
-#, fuzzy
msgid "Share created."
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../share.php:76
msgid "You can now start sharing the following url:"
@@ -4295,29 +4128,24 @@ msgid ""
msgstr ""
#: ../../share.php:84
-#, fuzzy
msgid "Object Shared"
-msgstr "نوع البØØ«"
+msgstr ""
#: ../../share.php:94
-#, fuzzy
msgid "Share Delete"
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../share.php:107
-#, fuzzy
msgid "Share Deleted"
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../share.php:107
-#, fuzzy
msgid "The Share has been deleted"
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../share.php:120
-#, fuzzy
msgid "Shared Objects cleaned"
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../share.php:120
msgid "Expired shared objects have been cleaned."
@@ -4327,58 +4155,57 @@ msgstr ""
msgid "Invalid Object Selected"
msgstr ""
-#: ../../song.php:34 ../../song.php:52 ../../song.php:54
-#, fuzzy
+#: ../../song.php:36 ../../song.php:56 ../../song.php:58
msgid "Song Deletion"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../song.php:35
+#: ../../song.php:37
msgid "Are you sure you want to permanently delete this song?"
msgstr ""
-#: ../../song.php:52
-#, fuzzy
+#: ../../song.php:56
msgid "Song has been deleted."
-msgstr "ØØ°Ù"
+msgstr ""
-#: ../../song.php:54
+#: ../../song.php:58
msgid "Cannot delete this song."
msgstr ""
#: ../../templates/browse_filters.inc.php:30
-#: ../../templates/list_header.inc.php:124
+#: ../../templates/list_header.inc.php:146
msgid "Filters"
msgstr "الÙلاتر"
-#: ../../templates/browse_filters.inc.php:34
+#: ../../templates/browse_filters.inc.php:35
msgid "Starts With"
msgstr "يبدأ"
-#: ../../templates/browse_filters.inc.php:40
+#: ../../templates/browse_filters.inc.php:47
msgid "Minimum Count"
msgstr "الØد الأدنى للتعداد"
-#: ../../templates/browse_filters.inc.php:45
+#: ../../templates/browse_filters.inc.php:56
msgid "Rated"
msgstr "صنÙ"
-#: ../../templates/browse_filters.inc.php:50
+#: ../../templates/browse_filters.inc.php:66
msgid "Unplayed"
msgstr "غير لعب"
-#: ../../templates/browse_filters.inc.php:54
+#: ../../templates/browse_filters.inc.php:74
msgid "All Playlists"
msgstr "جميع التشغيل"
-#: ../../templates/browse_filters.inc.php:60
-#: ../../templates/show_playlist_songs.inc.php:31
-#: ../../templates/show_playlist_songs.inc.php:70
-#: ../../templates/show_song_previews.inc.php:29
-#: ../../templates/show_songs.inc.php:31 ../../templates/show_songs.inc.php:80
+#: ../../templates/browse_filters.inc.php:87
+#: ../../templates/show_playlist_songs.inc.php:33
+#: ../../templates/show_playlist_songs.inc.php:84
+#: ../../templates/show_song_previews.inc.php:31
+#: ../../templates/show_songs.inc.php:33
+#: ../../templates/show_songs.inc.php:105
msgid "Song Title"
msgstr "عنوان الأغنية"
-#: ../../templates/browse_filters.inc.php:96
+#: ../../templates/browse_filters.inc.php:136
msgid "Toggle Artwork"
msgstr ""
@@ -4389,8 +4216,8 @@ msgstr ""
#: ../../templates/cookie_disclaimer.inc.php:4
msgid ""
"Cookies are small text files that are placed on your computer by websites "
-"that you visit. They are widely used in order to make websites work, or work "
-"more efficiently, as well as to provide information to the owners of the "
+"that you visit. They are widely used in order to make websites work, or work"
+" more efficiently, as well as to provide information to the owners of the "
"site."
msgstr ""
@@ -4411,49 +4238,50 @@ msgid "Hide the cookie disclaimer message."
msgstr ""
#: ../../templates/cookie_disclaimer.inc.php:32
-#, fuzzy
msgid "Ampache session."
-msgstr "Ampache التثبيت."
+msgstr ""
#: ../../templates/cookie_disclaimer.inc.php:37
-msgid "Automatically authenticate users."
+msgid "Ampache session username (if authenticated, information only)."
msgstr ""
#: ../../templates/cookie_disclaimer.inc.php:42
-msgid "Keep latest web player volume."
+msgid "Automatically authenticate users."
msgstr ""
#: ../../templates/cookie_disclaimer.inc.php:47
-msgid "Show/Hide column [column_index] when browsing [object_type] objects."
+msgid "Keep latest web player volume."
msgstr ""
#: ../../templates/cookie_disclaimer.inc.php:52
-msgid "Use alphabet when browsing [object_type] objects."
+msgid "Show/Hide column [column_index] when browsing [object_type] objects."
msgstr ""
#: ../../templates/cookie_disclaimer.inc.php:57
-msgid "Use pages when browsing [object_type] objects."
+msgid "Use alphabet when browsing [object_type] objects."
msgstr ""
#: ../../templates/cookie_disclaimer.inc.php:62
-msgid "Collapse/Expand Sidebar [menu_section]."
+msgid "Use pages when browsing [object_type] objects."
msgstr ""
#: ../../templates/cookie_disclaimer.inc.php:67
+msgid "Collapse/Expand Sidebar [menu_section]."
+msgstr ""
+
+#: ../../templates/cookie_disclaimer.inc.php:72
msgid "Collapse/Expand Sidebar."
msgstr ""
#: ../../templates/error_page.inc.php:32
-#, fuzzy
msgid "Ampache error page"
-msgstr "تØديث Ampache"
+msgstr ""
#: ../../templates/error_page.inc.php:44
#: ../../templates/show_mail_users.inc.php:43
-#: ../../templates/show_test.inc.php:38 ../../update.php:71
-#, fuzzy
+#: ../../templates/show_test.inc.php:38 ../../update.php:72
msgid "Ampache"
-msgstr "Ampache التصØÙŠØ"
+msgstr ""
#: ../../templates/error_page.inc.php:51
msgid ""
@@ -4465,200 +4293,182 @@ msgstr ""
msgid "Error messages"
msgstr ""
-#: ../../templates/footer.inc.php:39
+#: ../../templates/footer.inc.php:40
msgid "Donate"
msgstr ""
-#: ../../templates/footer.inc.php:50
-#: ../../templates/show_lostpassword_form.inc.php:73
+#: ../../templates/footer.inc.php:56
+#: ../../templates/show_lostpassword_form.inc.php:72
msgid "Queries:"
msgstr "الأسئلة :"
-#: ../../templates/footer.inc.php:50
-#: ../../templates/show_lostpassword_form.inc.php:74
+#: ../../templates/footer.inc.php:58
+#: ../../templates/show_lostpassword_form.inc.php:73
msgid "Cache Hits:"
msgstr "مخبأ عدد الزيارات :"
-#: ../../templates/footer.inc.php:55
+#: ../../templates/footer.inc.php:65
msgid "Load time:"
msgstr ""
-#: ../../templates/header.inc.php:88
+#: ../../templates/header.inc.php:106
msgid "Save"
msgstr ""
-#: ../../templates/header.inc.php:89
-#: ../../templates/show_confirmation.inc.php:34
-#: ../../templates/show_get_art.inc.php:64
+#: ../../templates/header.inc.php:107
+#: ../../templates/show_confirmation.inc.php:36
+#: ../../templates/show_get_art.inc.php:69
msgid "Cancel"
msgstr "الغاء"
#. HINT: Translator, "%s" is replaced by "cookie settings"
-#: ../../templates/header.inc.php:287
+#: ../../templates/header.inc.php:309
#, php-format
msgid ""
-"We have placed cookies on your computer to help make this website better. "
-"You can change your %s at any time.\n"
+"We have placed cookies on your computer to help make this website better. You can change your %s at any time.\n"
"Otherwise, we will assume you are OK to continue.\n"
"\n"
"Click on this message to not display it again."
msgstr ""
-#: ../../templates/header.inc.php:288
+#: ../../templates/header.inc.php:310
msgid "cookie settings"
msgstr ""
-#: ../../templates/header.inc.php:318
-#, fuzzy
+#: ../../templates/header.inc.php:349
msgid "New messages"
-msgstr "مستخدم"
+msgstr ""
-#: ../../templates/header.inc.php:320
+#: ../../templates/header.inc.php:356
msgid "Log out"
msgstr ""
-#: ../../templates/header.inc.php:324
-#: ../../templates/show_login_form.inc.php:76
+#: ../../templates/header.inc.php:364
+#: ../../templates/show_login_form.inc.php:75
msgid "Login"
msgstr ""
-#: ../../templates/header.inc.php:326
-#: ../../templates/show_login_form.inc.php:81
+#: ../../templates/header.inc.php:369
+#: ../../templates/show_login_form.inc.php:82
msgid "Register"
msgstr ""
-#: ../../templates/header.inc.php:367 ../../templates/sidebar_home.inc.php:112
-#: ../../templates/sidebar.light.inc.php:31
-#, fuzzy
+#: ../../templates/header.inc.php:427 ../../templates/sidebar_home.inc.php:182
+#: ../../templates/sidebar.light.inc.php:34
msgid "Favorites"
-msgstr "مستخدم للعقارات"
+msgstr ""
-#: ../../templates/header.inc.php:428
-#, fuzzy
+#: ../../templates/header.inc.php:491
msgid "Error Config File Out of Date"
-msgstr "خطأ : لم يتم العثور على مل٠أو غير صالØ"
+msgstr ""
-#: ../../templates/header.inc.php:429
-#, fuzzy
+#: ../../templates/header.inc.php:494
msgid "Generate New Config"
-msgstr "توليد ملÙ"
+msgstr ""
-#: ../../templates/header.inc.php:430 ../../templates/show_debug.inc.php:30
-#, fuzzy
+#: ../../templates/header.inc.php:497 ../../templates/show_debug.inc.php:30
msgid "Write New Config"
-msgstr "إنشاء Øساب"
+msgstr ""
-#: ../../templates/install_header.inc.php:50
+#: ../../templates/install_header.inc.php:52
#: ../../templates/show_install_lang.inc.php:27
msgid "Ampache Installation"
msgstr "Ampache التثبيت"
-#: ../../templates/list_header.inc.php:109
-#, fuzzy
+#: ../../templates/list_header.inc.php:119
msgid "Prev"
-msgstr "السابق"
+msgstr ""
-#: ../../templates/list_header.inc.php:111
+#: ../../templates/list_header.inc.php:122
msgid "Page"
msgstr ""
-#: ../../templates/list_header.inc.php:113
+#: ../../templates/list_header.inc.php:131
msgid "of"
msgstr ""
-#: ../../templates/list_header.inc.php:115
+#: ../../templates/list_header.inc.php:134
#: ../../templates/show_localplay_control.inc.php:28
msgid "Next"
msgstr "التالي"
-#: ../../templates/list_header.inc.php:126
+#: ../../templates/list_header.inc.php:148
msgid "Pages"
msgstr ""
-#: ../../templates/list_header.inc.php:127
+#: ../../templates/list_header.inc.php:149
msgid "Infinite Scroll"
msgstr ""
-#: ../../templates/list_header.inc.php:129
+#: ../../templates/list_header.inc.php:156
msgid "Alphabet"
msgstr ""
-#: ../../templates/list_header.inc.php:135
+#: ../../templates/list_header.inc.php:169
msgid "Limit"
msgstr ""
-#: ../../templates/list_header.inc.php:143
-#, fuzzy
+#: ../../templates/list_header.inc.php:185
msgid "Item Count"
-msgstr "الØد الأدنى للتعداد"
+msgstr ""
-#: ../../templates/rightbar.inc.php:29
-#, fuzzy
+#: ../../templates/rightbar.inc.php:30
msgid "Add to Playlist"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../templates/rightbar.inc.php:32
-#: ../../templates/show_html5_player.inc.php:448
+#: ../../templates/rightbar.inc.php:34
#: ../../templates/show_playlists_dialog.inc.php:27
-#, fuzzy
msgid "Add to New Playlist"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../templates/rightbar.inc.php:51
-#: ../../templates/show_album_row.inc.php:87
-#: ../../templates/show_artist_row.inc.php:84
-#: ../../templates/show_playlist.inc.php:70
-#: ../../templates/show_playlist.inc.php:71
-#: ../../templates/show_playlist_row.inc.php:63
-#: ../../templates/show_search.inc.php:34
-#: ../../templates/show_search.inc.php:35
-#: ../../templates/show_search_options.inc.php:32
-#: ../../templates/show_search_options.inc.php:33
-#: ../../templates/show_search_row.inc.php:50
+#: ../../templates/rightbar.inc.php:61
+#: ../../templates/show_album_row.inc.php:119
+#: ../../templates/show_playlist.inc.php:100
+#: ../../templates/show_playlist.inc.php:102
+#: ../../templates/show_playlist_row.inc.php:84
+#: ../../templates/show_search.inc.php:37
+#: ../../templates/show_search.inc.php:39
+#: ../../templates/show_search_options.inc.php:36
+#: ../../templates/show_search_options.inc.php:38
+#: ../../templates/show_search_row.inc.php:56
msgid "Batch Download"
msgstr "دÙعة تنزيل"
-#: ../../templates/rightbar.inc.php:56
-#: ../../templates/show_democratic.inc.php:45
-#: ../../templates/show_democratic.inc.php:46
+#: ../../templates/rightbar.inc.php:68
+#: ../../templates/show_democratic.inc.php:56
+#: ../../templates/show_democratic.inc.php:58
#: ../../templates/show_localplay_status.inc.php:51
-#, fuzzy
msgid "Clear Playlist"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../templates/rightbar.inc.php:59
+#: ../../templates/rightbar.inc.php:71
msgid "Add Dynamic Items"
msgstr ""
-#: ../../templates/rightbar.inc.php:62
-#, fuzzy
+#: ../../templates/rightbar.inc.php:74
msgid "Random Song"
-msgstr "عشوائية"
+msgstr ""
-#: ../../templates/rightbar.inc.php:65
-#, fuzzy
+#: ../../templates/rightbar.inc.php:77
msgid "Random Artist"
-msgstr "المل٠نمط"
+msgstr ""
-#: ../../templates/rightbar.inc.php:68
-#, fuzzy
+#: ../../templates/rightbar.inc.php:80
msgid "Random Album"
-msgstr "البوم"
+msgstr ""
-#: ../../templates/rightbar.inc.php:71
-#, fuzzy
+#: ../../templates/rightbar.inc.php:83
msgid "Random Playlist"
-msgstr "قاعدة التشغيل"
+msgstr ""
-#: ../../templates/rightbar.inc.php:125
+#: ../../templates/rightbar.inc.php:146
msgid "No items"
msgstr ""
#: ../../templates/show_access_list.inc.php:23
#: ../../templates/sidebar_admin.inc.php:37
-#, fuzzy
msgid "Access Control"
-msgstr "مستوى الوصول"
+msgstr ""
#: ../../templates/show_access_list.inc.php:27
msgid "Add Current Host"
@@ -4673,151 +4483,147 @@ msgid "Add Local Network Definition"
msgstr "إضاÙØ© تعري٠الشبكة المØلية"
#: ../../templates/show_access_list.inc.php:35
-#, fuzzy
msgid "Advanced Add"
-msgstr "المتقدمة"
+msgstr ""
#: ../../templates/show_access_list.inc.php:40
msgid "Access Control Entries"
msgstr ""
-#: ../../templates/show_access_list.inc.php:47
-#, fuzzy
+#: ../../templates/show_access_list.inc.php:49
msgid "Start Address"
-msgstr "يبدأ"
+msgstr ""
-#: ../../templates/show_access_list.inc.php:48
+#: ../../templates/show_access_list.inc.php:51
msgid "End Address"
msgstr ""
-#: ../../templates/show_access_list.inc.php:49
+#: ../../templates/show_access_list.inc.php:53
#: ../../templates/show_add_access.inc.php:33
#: ../../templates/show_create_democratic.inc.php:39
#: ../../templates/show_edit_access.inc.php:66
#: ../../templates/show_manage_democratic.inc.php:29
#: ../../templates/show_preference_admin.inc.php:33
-#: ../../templates/show_preference_admin.inc.php:52
+#: ../../templates/show_preference_admin.inc.php:64
msgid "Level"
msgstr "المستوى"
-#: ../../templates/show_access_list.inc.php:51
+#: ../../templates/show_access_list.inc.php:57
#: ../../templates/show_add_playlist.inc.php:31
#: ../../templates/show_catalog_types.inc.php:29
-#: ../../templates/show_catalog_types.inc.php:63
+#: ../../templates/show_catalog_types.inc.php:78
#: ../../templates/show_edit_playlist_row.inc.php:31
#: ../../templates/show_edit_search_row.inc.php:31
-#: ../../templates/show_playlists.inc.php:30
-#: ../../templates/show_playlists.inc.php:65
-#: ../../templates/show_searches.inc.php:40
-#: ../../templates/show_searches.inc.php:68
+#: ../../templates/show_playlists.inc.php:32
+#: ../../templates/show_playlists.inc.php:85
+#: ../../templates/show_searches.inc.php:47
+#: ../../templates/show_searches.inc.php:83
msgid "Type"
msgstr "نوع"
-#: ../../templates/show_access_list.inc.php:52
-#: ../../templates/show_artists.inc.php:53
-#: ../../templates/show_artists.inc.php:111
+#: ../../templates/show_access_list.inc.php:59
+#: ../../templates/show_artists.inc.php:74
+#: ../../templates/show_artists.inc.php:161
#: ../../templates/show_catalog_types.inc.php:32
-#: ../../templates/show_catalog_types.inc.php:66
-#: ../../templates/show_democratic_playlist.inc.php:55
-#: ../../templates/show_democratic_playlist.inc.php:102
-#: ../../templates/show_labels.inc.php:42
-#: ../../templates/show_labels.inc.php:70
-#: ../../templates/show_live_streams.inc.php:33
-#: ../../templates/show_live_streams.inc.php:58
+#: ../../templates/show_catalog_types.inc.php:81
+#: ../../templates/show_democratic_playlist.inc.php:61
+#: ../../templates/show_democratic_playlist.inc.php:136
+#: ../../templates/show_labels.inc.php:53
+#: ../../templates/show_labels.inc.php:93
+#: ../../templates/show_live_streams.inc.php:35
+#: ../../templates/show_live_streams.inc.php:67
#: ../../templates/show_localplay_controllers.inc.php:32
-#: ../../templates/show_localplay_controllers.inc.php:66
-#: ../../templates/show_localplay_instances.inc.php:29
-#: ../../templates/show_localplay_playlist.inc.php:33
-#: ../../templates/show_localplay_playlist.inc.php:63
+#: ../../templates/show_localplay_controllers.inc.php:81
+#: ../../templates/show_localplay_instances.inc.php:32
+#: ../../templates/show_localplay_playlist.inc.php:35
+#: ../../templates/show_localplay_playlist.inc.php:78
#: ../../templates/show_manage_democratic.inc.php:32
#: ../../templates/show_manage_license.inc.php:37
-#: ../../templates/show_manage_license.inc.php:58
+#: ../../templates/show_manage_license.inc.php:63
#: ../../templates/show_manage_shoutbox.inc.php:33
-#: ../../templates/show_manage_shoutbox.inc.php:62
-#: ../../templates/show_playlist_songs.inc.php:49
-#: ../../templates/show_playlist_songs.inc.php:84
+#: ../../templates/show_manage_shoutbox.inc.php:67
+#: ../../templates/show_playlist_songs.inc.php:59
+#: ../../templates/show_playlist_songs.inc.php:108
#: ../../templates/show_plugins.inc.php:33
-#: ../../templates/show_plugins.inc.php:73
-#: ../../templates/show_pvmsgs.inc.php:52
-#: ../../templates/show_pvmsgs.inc.php:79
-#: ../../templates/show_recommended_artists.inc.php:42
-#: ../../templates/show_recommended_artists.inc.php:91
-#: ../../templates/show_song.inc.php:58 ../../templates/show_songs.inc.php:54
-#: ../../templates/show_tvshows.inc.php:48
-#: ../../templates/show_tvshows.inc.php:90
-#: ../../templates/show_users.inc.php:55 ../../templates/show_users.inc.php:86
-#: ../../templates/show_video.inc.php:75
-#: ../../templates/show_videos.inc.php:55
-#: ../../templates/show_videos.inc.php:107
+#: ../../templates/show_plugins.inc.php:84
+#: ../../templates/show_pvmsgs.inc.php:54
+#: ../../templates/show_pvmsgs.inc.php:90
+#: ../../templates/show_recommended_artists.inc.php:50
+#: ../../templates/show_recommended_artists.inc.php:126
+#: ../../templates/show_song.inc.php:87 ../../templates/show_songs.inc.php:67
+#: ../../templates/show_tvshows.inc.php:66
+#: ../../templates/show_tvshows.inc.php:134
+#: ../../templates/show_users.inc.php:72
+#: ../../templates/show_users.inc.php:117
+#: ../../templates/show_video.inc.php:100
+#: ../../templates/show_videos.inc.php:73
+#: ../../templates/show_videos.inc.php:149
msgid "Action"
msgstr "العمل"
-#: ../../templates/show_account.inc.php:32
+#: ../../templates/show_account.inc.php:33
#: ../../templates/show_add_user.inc.php:37
#: ../../templates/show_edit_user.inc.php:40
-#: ../../templates/show_user.inc.php:55
-#: ../../templates/show_user_registration.inc.php:88
+#: ../../templates/show_user_registration.inc.php:96
msgid "Full Name"
msgstr "الاسم الكامل"
-#: ../../templates/show_account.inc.php:39
+#: ../../templates/show_account.inc.php:43
#: ../../templates/show_add_user.inc.php:45
-#: ../../templates/show_edit_user.inc.php:48
-#: ../../templates/show_user_registration.inc.php:95
+#: ../../templates/show_edit_user.inc.php:51
+#: ../../templates/show_user_registration.inc.php:107
msgid "E-mail"
msgstr "البريد الإلكتروني"
-#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_add_label.inc.php:65
+#: ../../templates/show_account.inc.php:51
+#: ../../templates/show_add_label.inc.php:71
#: ../../templates/show_add_user.inc.php:54
-#: ../../templates/show_edit_label_row.inc.php:53
-#: ../../templates/show_edit_user.inc.php:57
-#: ../../templates/show_user_registration.inc.php:101
+#: ../../templates/show_edit_label_row.inc.php:59
+#: ../../templates/show_edit_user.inc.php:60
+#: ../../templates/show_user_registration.inc.php:117
msgid "Website"
msgstr ""
-#: ../../templates/show_account.inc.php:54
-#: ../../templates/show_channels.inc.php:41
-#: ../../templates/show_edit_user.inc.php:66
-#: ../../templates/show_user_registration.inc.php:108
+#: ../../templates/show_account.inc.php:63
+#: ../../templates/show_channels.inc.php:43
+#: ../../templates/show_edit_user.inc.php:69
+#: ../../templates/show_user_registration.inc.php:132
msgid "State"
msgstr ""
-#: ../../templates/show_account.inc.php:62
-#: ../../templates/show_edit_user.inc.php:75
-#: ../../templates/show_user_registration.inc.php:115
+#: ../../templates/show_account.inc.php:75
+#: ../../templates/show_edit_user.inc.php:78
+#: ../../templates/show_user_registration.inc.php:147
msgid "City"
msgstr ""
-#: ../../templates/show_account.inc.php:69
-#, fuzzy
+#: ../../templates/show_account.inc.php:85
msgid "New Password"
-msgstr "كلمة السر"
+msgstr ""
-#: ../../templates/show_account.inc.php:76
+#: ../../templates/show_account.inc.php:92
#: ../../templates/show_add_user.inc.php:72
-#: ../../templates/show_edit_user.inc.php:93
+#: ../../templates/show_edit_user.inc.php:96
#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/show_user_registration.inc.php:164
msgid "Confirm Password"
msgstr "تأكيد كلمة السر"
-#: ../../templates/show_account.inc.php:83
+#: ../../templates/show_account.inc.php:99
#: ../../templates/show_add_user.inc.php:95
-#: ../../templates/show_edit_user.inc.php:116
+#: ../../templates/show_edit_user.inc.php:119
msgid "Avatar"
msgstr ""
-#: ../../templates/show_account.inc.php:121
-#: ../../templates/show_edit_user.inc.php:155
+#: ../../templates/show_account.inc.php:141
+#: ../../templates/show_edit_user.inc.php:158
#: ../../templates/show_manage_catalogs.inc.php:45
msgid "Clear Stats"
msgstr "Ø¥Øصائيات واضØØ©"
-#: ../../templates/show_account.inc.php:131
-#, fuzzy
+#: ../../templates/show_account.inc.php:151
msgid "Update Account"
-msgstr "إنشاء Øساب"
+msgstr ""
#: ../../templates/show_add_access.inc.php:22
msgid "Add Access Control List"
@@ -4825,53 +4631,50 @@ msgstr ""
#: ../../templates/show_add_access.inc.php:48
#: ../../templates/show_edit_access.inc.php:31
-#, fuzzy
msgid "ACL Type"
-msgstr "نوع"
+msgstr ""
-#: ../../templates/show_add_access.inc.php:54
-#: ../../templates/show_add_access.inc.php:55
-#: ../../templates/show_add_access.inc.php:60
-#: ../../templates/show_add_access.inc.php:61
+#: ../../templates/show_add_access.inc.php:56
+#: ../../templates/show_add_access.inc.php:58
+#: ../../templates/show_add_access.inc.php:68
+#: ../../templates/show_add_access.inc.php:70
#, php-format
msgid "%s + %s"
msgstr ""
-#: ../../templates/show_add_access.inc.php:76
+#: ../../templates/show_add_access.inc.php:94
#: ../../templates/show_edit_access.inc.php:43
msgid "IPv4 or IPv6 Addresses"
msgstr "عناوين IPv4 أو IPv6"
-#: ../../templates/show_add_access.inc.php:82
+#: ../../templates/show_add_access.inc.php:100
#: ../../templates/show_edit_access.inc.php:48
msgid "Start"
msgstr "يبدأ"
-#: ../../templates/show_add_access.inc.php:92
+#: ../../templates/show_add_access.inc.php:110
#: ../../templates/show_edit_access.inc.php:53
msgid "End"
msgstr "نهاية"
-#: ../../templates/show_add_access.inc.php:105
+#: ../../templates/show_add_access.inc.php:123
msgid "Create ACL"
msgstr "خلق دورى أبطال العرب"
#: ../../templates/show_add_catalog.inc.php:26
#: ../../templates/sidebar_admin.inc.php:26
-#, fuzzy
msgid "Add a Catalog"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
#: ../../templates/show_add_catalog.inc.php:27
msgid ""
-"In the form below enter either a local path (i.e. /data/music) or the URL to "
-"a remote Ampache installation (i.e http://theotherampache.com)"
+"In the form below enter either a local path (i.e. /data/music) or the URL to"
+" a remote Ampache installation (i.e http://theotherampache.com)"
msgstr ""
#: ../../templates/show_add_catalog.inc.php:34
-#, fuzzy
msgid "Catalog Name"
-msgstr "نوع التسويقي"
+msgstr ""
#: ../../templates/show_add_catalog.inc.php:37
#: ../../templates/show_edit_catalog.inc.php:31
@@ -4919,9 +4722,8 @@ msgid "Catalog Type"
msgstr "نوع التسويقي"
#: ../../templates/show_add_catalog.inc.php:52
-#, fuzzy
msgid "Filename Pattern"
-msgstr "المل٠نمط"
+msgstr ""
#: ../../templates/show_add_catalog.inc.php:56
#: ../../templates/show_edit_catalog.inc.php:53
@@ -4934,12 +4736,12 @@ msgid "(no leading or ending '/')"
msgstr "(لا يؤدي إنهاء أو '/')"
#: ../../templates/show_add_catalog.inc.php:60
-#: ../../templates/show_catalog_row.inc.php:44
+#: ../../templates/show_catalog_row.inc.php:54
msgid "Gather Art"
msgstr ""
#: ../../templates/show_add_catalog.inc.php:64
-msgid "Build Playlists from playlist Files (m3u, asx, pls, xspf)"
+msgid "Build Playlists from playlist Files"
msgstr ""
#: ../../templates/show_add_catalog.inc.php:68
@@ -4955,57 +4757,52 @@ msgid "Movie"
msgstr ""
#: ../../templates/show_add_catalog.inc.php:81
-#, fuzzy
msgid "Personal Video"
-msgstr "تصÙØ"
+msgstr ""
#: ../../templates/show_add_catalog.inc.php:95
-#, fuzzy
msgid "Add Catalog"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
#: ../../templates/show_add_channel.inc.php:23
-#, fuzzy
msgid "Create Channel"
-msgstr "خلق تاريخ"
+msgstr ""
#: ../../templates/show_add_channel.inc.php:29
-#: ../../templates/show_channels.inc.php:33
+#: ../../templates/show_channels.inc.php:35
#: ../../templates/show_edit_channel_row.inc.php:27
-#, fuzzy
msgid "Stream Source"
-msgstr "تيار الوصول"
+msgstr ""
#: ../../templates/show_add_channel.inc.php:42
#: ../../templates/show_catalog_types.inc.php:30
-#: ../../templates/show_catalog_types.inc.php:64
+#: ../../templates/show_catalog_types.inc.php:79
#: ../../templates/show_edit_broadcast_row.inc.php:31
#: ../../templates/show_edit_channel_row.inc.php:48
#: ../../templates/show_localplay_controllers.inc.php:30
-#: ../../templates/show_localplay_controllers.inc.php:64
+#: ../../templates/show_localplay_controllers.inc.php:79
#: ../../templates/show_manage_license.inc.php:36
-#: ../../templates/show_manage_license.inc.php:57
+#: ../../templates/show_manage_license.inc.php:62
#: ../../templates/show_plugins.inc.php:30
-#: ../../templates/show_plugins.inc.php:70
+#: ../../templates/show_plugins.inc.php:81
msgid "Description"
msgstr "وصÙ"
#: ../../templates/show_add_channel.inc.php:56
-#: ../../templates/show_channels.inc.php:31
+#: ../../templates/show_channels.inc.php:33
#: ../../templates/show_edit_channel_row.inc.php:56
-#, fuzzy
msgid "Interface"
-msgstr "واجهة ويب"
+msgstr ""
#: ../../templates/show_add_channel.inc.php:70
-#: ../../templates/show_channel_row.inc.php:44
+#: ../../templates/show_channel_row.inc.php:45
#: ../../templates/show_edit_broadcast_row.inc.php:36
#: ../../templates/show_edit_channel_row.inc.php:65
msgid "Authentication Required"
msgstr ""
#: ../../templates/show_add_channel.inc.php:82
-#: ../../templates/show_channels.inc.php:35
+#: ../../templates/show_channels.inc.php:37
#: ../../templates/show_edit_channel_row.inc.php:73
msgid "Loop"
msgstr ""
@@ -5016,45 +4813,40 @@ msgid "Max Listeners"
msgstr ""
#: ../../templates/show_add_channel.inc.php:95
-#: ../../templates/show_channels.inc.php:36
+#: ../../templates/show_channels.inc.php:38
#: ../../templates/show_edit_channel_row.inc.php:80
-#, fuzzy
msgid "Stream Type"
-msgstr "نوع البØØ«"
+msgstr ""
#: ../../templates/show_add_channel.inc.php:111
#: ../../templates/show_add_playlist.inc.php:41
-#: ../../templates/show_add_share.inc.php:71
-#: ../../templates/show_add_shout.inc.php:53
-#, fuzzy
+#: ../../templates/show_add_share.inc.php:75
+#: ../../templates/show_add_shout.inc.php:65
msgid "Create"
-msgstr "خلق دورى أبطال العرب"
+msgstr ""
#: ../../templates/show_add_label.inc.php:23
-#, fuzzy
msgid "Add Label"
-msgstr "إضاÙØ© الكل"
-
-#: ../../templates/show_add_label.inc.php:37
-#: ../../templates/show_edit_label_row.inc.php:34
-#, fuzzy
-msgid "Personal"
-msgstr "تصÙØ"
-
-#: ../../templates/show_add_label.inc.php:38
-#: ../../templates/show_edit_label_row.inc.php:35
-#, fuzzy
-msgid "Association"
-msgstr "العمل"
+msgstr ""
#: ../../templates/show_add_label.inc.php:39
#: ../../templates/show_edit_label_row.inc.php:36
+msgid "Personal"
+msgstr ""
+
+#: ../../templates/show_add_label.inc.php:42
+#: ../../templates/show_edit_label_row.inc.php:39
+msgid "Association"
+msgstr ""
+
+#: ../../templates/show_add_label.inc.php:45
+#: ../../templates/show_edit_label_row.inc.php:42
msgid "Company"
msgstr ""
-#: ../../templates/show_add_label.inc.php:44
-#: ../../templates/show_edit_artist_row.inc.php:41
-#: ../../templates/show_edit_label_row.inc.php:41
+#: ../../templates/show_add_label.inc.php:50
+#: ../../templates/show_edit_artist_row.inc.php:44
+#: ../../templates/show_edit_label_row.inc.php:47
#: ../../templates/show_edit_tvshow_row.inc.php:31
#: ../../templates/show_partial_edit_movie_row.inc.php:28
#: ../../templates/show_partial_edit_personal_video_row.inc.php:28
@@ -5064,24 +4856,21 @@ msgstr ""
msgid "Summary"
msgstr ""
-#: ../../templates/show_add_label.inc.php:51
-#: ../../templates/show_edit_label_row.inc.php:45
-#, fuzzy
+#: ../../templates/show_add_label.inc.php:57
+#: ../../templates/show_edit_label_row.inc.php:51
msgid "Address"
-msgstr "عناوين IPv4 أو IPv6"
+msgstr ""
-#: ../../templates/show_add_label.inc.php:58
-#: ../../templates/show_edit_label_row.inc.php:49
-#: ../../templates/show_lostpassword_form.inc.php:63
-#, fuzzy
+#: ../../templates/show_add_label.inc.php:64
+#: ../../templates/show_edit_label_row.inc.php:55
+#: ../../templates/show_lostpassword_form.inc.php:62
msgid "Email"
-msgstr "البريد الإلكتروني"
+msgstr ""
#: ../../templates/show_add_live_stream.inc.php:23
-#: ../../templates/show_live_stream.inc.php:28
-#, fuzzy
+#: ../../templates/show_live_stream.inc.php:32
msgid "Add Radio Station"
-msgstr "Ù…Øطات إذاعية"
+msgstr ""
#: ../../templates/show_add_live_stream.inc.php:34
#: ../../templates/show_edit_live_stream_row.inc.php:35
@@ -5090,64 +4879,60 @@ msgstr "الصÙØØ© الرئيسية"
#: ../../templates/show_add_live_stream.inc.php:41
#: ../../templates/show_edit_live_stream_row.inc.php:31
-#: ../../templates/show_live_streams.inc.php:31
-#: ../../templates/show_live_streams.inc.php:56
+#: ../../templates/show_live_streams.inc.php:33
+#: ../../templates/show_live_streams.inc.php:65
msgid "Stream URL"
msgstr "تيار عنوان"
#: ../../templates/show_add_live_stream.inc.php:48
#: ../../templates/show_edit_live_stream_row.inc.php:39
-#: ../../templates/show_live_streams.inc.php:32
-#: ../../templates/show_live_streams.inc.php:57
-#: ../../templates/show_video.inc.php:116
-#: ../../templates/show_videos.inc.php:40
-#: ../../templates/show_videos.inc.php:92
+#: ../../templates/show_live_streams.inc.php:34
+#: ../../templates/show_live_streams.inc.php:66
+#: ../../templates/show_video.inc.php:186
+#: ../../templates/show_videos.inc.php:45
+#: ../../templates/show_videos.inc.php:121
msgid "Codec"
msgstr ""
#: ../../templates/show_add_playlist.inc.php:23
-#, fuzzy
msgid "Create a new playlist"
-msgstr "خلق التشغيل الجديدة"
+msgstr ""
#: ../../templates/show_add_pvmsg.inc.php:24
-#, fuzzy
msgid "Compose Message"
-msgstr "مستخدم"
+msgstr ""
#: ../../templates/show_add_pvmsg.inc.php:28
-#: ../../templates/show_pvmsgs.inc.php:50
-#: ../../templates/show_pvmsgs.inc.php:77
+#: ../../templates/show_pvmsgs.inc.php:52
+#: ../../templates/show_pvmsgs.inc.php:88
msgid "Recipient"
msgstr ""
#: ../../templates/show_add_pvmsg.inc.php:35
#: ../../templates/show_mail_users.inc.php:48
-#: ../../templates/show_pvmsgs.inc.php:48
-#: ../../templates/show_pvmsgs.inc.php:75
+#: ../../templates/show_pvmsgs.inc.php:50
+#: ../../templates/show_pvmsgs.inc.php:86
msgid "Subject"
msgstr ""
#: ../../templates/show_add_pvmsg.inc.php:42
#: ../../templates/show_mail_users.inc.php:54
-#, fuzzy
msgid "Message"
-msgstr "مستخدم"
+msgstr ""
#: ../../templates/show_add_pvmsg.inc.php:51
msgid "Send"
msgstr ""
#: ../../templates/show_adds_catalog.inc.php:23
-#, fuzzy
msgid "Starting New Media Search"
-msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+msgstr ""
#. HINT: Catalog Name
#: ../../templates/show_adds_catalog.inc.php:25
-#, fuzzy, php-format
+#, php-format
msgid "Starting New Media Search on %s catalog"
-msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+msgstr ""
#: ../../templates/show_adds_catalog.inc.php:27
#: ../../templates/show_run_add_catalog.inc.php:25
@@ -5159,20 +4944,17 @@ msgstr ""
#: ../../templates/show_gather_art.inc.php:26
#: ../../templates/show_run_add_catalog.inc.php:26
#: ../../templates/show_verify_catalog.inc.php:28
-#, fuzzy
msgid "Reading"
-msgstr "يقرأ"
+msgstr ""
#: ../../templates/show_add_share.inc.php:23
-#, fuzzy
msgid "Create Share"
-msgstr "خلق تاريخ"
+msgstr ""
#: ../../templates/show_add_share.inc.php:29
#: ../../templates/show_edit_share_row.inc.php:27
-#, fuzzy
msgid "Shared Object"
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../templates/show_add_share.inc.php:42
#: ../../templates/show_edit_share_row.inc.php:31
@@ -5189,35 +4971,30 @@ msgstr ""
#: ../../templates/show_add_share.inc.php:55
#: ../../templates/show_edit_share_row.inc.php:40
#: ../../templates/show_shared_objects.inc.php:33
-#, fuzzy
msgid "Allow Stream"
-msgstr "يتدÙÙ‚"
+msgstr ""
-#: ../../templates/show_add_share.inc.php:62
-#: ../../templates/show_edit_share_row.inc.php:45
+#: ../../templates/show_add_share.inc.php:63
+#: ../../templates/show_edit_share_row.inc.php:48
#: ../../templates/show_shared_objects.inc.php:34
-#, fuzzy
msgid "Allow Download"
-msgstr "تنزيل"
+msgstr ""
-#: ../../templates/show_add_shout.inc.php:28
-#, fuzzy
+#: ../../templates/show_add_shout.inc.php:30
msgid "Post to Shoutbox"
-msgstr "ÙÙŠ مرØلة ما بعد الصيØØ©"
+msgstr ""
-#: ../../templates/show_add_shout.inc.php:37
+#: ../../templates/show_add_shout.inc.php:40
#: ../../templates/show_edit_shout.inc.php:31
-#, fuzzy
msgid "Comment:"
-msgstr "ID3 التعليق"
+msgstr ""
-#: ../../templates/show_add_shout.inc.php:44
-#: ../../templates/show_edit_shout.inc.php:37
-#, fuzzy
+#: ../../templates/show_add_shout.inc.php:49
+#: ../../templates/show_edit_shout.inc.php:39
msgid "Stick this comment"
-msgstr "ID3 التعليق"
+msgstr ""
-#: ../../templates/show_add_shout.inc.php:62
+#: ../../templates/show_add_shout.inc.php:78
#: ../../templates/show_shoutbox.inc.php:23
msgid "Shoutbox"
msgstr ""
@@ -5227,20 +5004,19 @@ msgstr ""
msgid "Target folder"
msgstr ""
-#: ../../templates/show_add_upload.inc.php:207
-#, fuzzy
+#: ../../templates/show_add_upload.inc.php:217
msgid "Files"
-msgstr "اسم الملÙ"
+msgstr ""
-#: ../../templates/show_add_upload.inc.php:214
+#: ../../templates/show_add_upload.inc.php:224
msgid "Allowed file type"
msgstr ""
-#: ../../templates/show_add_upload.inc.php:219
+#: ../../templates/show_add_upload.inc.php:229
msgid "Drop File Here"
msgstr ""
-#: ../../templates/show_add_upload.inc.php:220
+#: ../../templates/show_add_upload.inc.php:230
msgid "Browse"
msgstr "تصÙØ"
@@ -5249,380 +5025,361 @@ msgid "Adding a New User"
msgstr ""
#: ../../templates/show_add_user.inc.php:80
-#: ../../templates/show_edit_user.inc.php:101
+#: ../../templates/show_edit_user.inc.php:104
msgid "User Access Level"
msgstr "مستوى الوصول للمستخدم"
#: ../../templates/show_add_user.inc.php:105
#: ../../templates/sidebar_admin.inc.php:33
-#, fuzzy
msgid "Add User"
-msgstr "مستخدم"
+msgstr ""
#: ../../templates/show_album_group_disks.inc.php:45
#: ../../templates/show_album.inc.php:50
-#: ../../templates/show_artist.inc.php:44
-#: ../../templates/show_label.inc.php:34 ../../templates/show_song.inc.php:116
+#: ../../templates/show_artist.inc.php:45
+#: ../../templates/show_label.inc.php:35 ../../templates/show_song.inc.php:201
msgid "Search on Google ..."
msgstr ""
#: ../../templates/show_album_group_disks.inc.php:46
#: ../../templates/show_album.inc.php:51
-#: ../../templates/show_artist.inc.php:45
-#: ../../templates/show_label.inc.php:35
+#: ../../templates/show_artist.inc.php:48
+#: ../../templates/show_label.inc.php:36
msgid "Search on Wikipedia ..."
msgstr ""
#: ../../templates/show_album_group_disks.inc.php:47
#: ../../templates/show_album.inc.php:52
-#: ../../templates/show_artist.inc.php:46
-#: ../../templates/show_label.inc.php:36 ../../templates/show_song.inc.php:117
+#: ../../templates/show_artist.inc.php:51
+#: ../../templates/show_label.inc.php:37 ../../templates/show_song.inc.php:202
msgid "Search on Last.fm ..."
msgstr ""
#: ../../templates/show_album_group_disks.inc.php:57
-#: ../../templates/show_album.inc.php:92
-#: ../../templates/show_albums.inc.php:51
-#: ../../templates/show_albums.inc.php:109
-#: ../../templates/show_artist.inc.php:89
-#: ../../templates/show_broadcasts.inc.php:33
-#: ../../templates/show_catalogs.inc.php:32
-#: ../../templates/show_catalogs.inc.php:60
-#: ../../templates/show_channels.inc.php:42
-#: ../../templates/show_label.inc.php:52
+#: ../../templates/show_album.inc.php:109
+#: ../../templates/show_albums.inc.php:72
+#: ../../templates/show_albums.inc.php:159
+#: ../../templates/show_artist.inc.php:113
+#: ../../templates/show_broadcasts.inc.php:35
+#: ../../templates/show_catalogs.inc.php:34
+#: ../../templates/show_catalogs.inc.php:69
+#: ../../templates/show_channels.inc.php:44
+#: ../../templates/show_label.inc.php:53
#: ../../templates/show_missing_album.inc.php:51
#: ../../templates/show_missing_albums.inc.php:31
-#: ../../templates/show_playlists.inc.php:41
-#: ../../templates/show_playlists.inc.php:76
+#: ../../templates/show_playlists.inc.php:53
+#: ../../templates/show_playlists.inc.php:106
#: ../../templates/show_pvmsg.inc.php:29
-#: ../../templates/show_searches.inc.php:44
-#: ../../templates/show_searches.inc.php:72
+#: ../../templates/show_searches.inc.php:51
+#: ../../templates/show_searches.inc.php:87
#: ../../templates/show_shared_objects.inc.php:37
-#: ../../templates/show_tvshow.inc.php:56
-#: ../../templates/show_tvshow_season.inc.php:51
-#: ../../templates/show_tvshow_seasons.inc.php:45
-#: ../../templates/show_tvshow_seasons.inc.php:84
+#: ../../templates/show_tvshow.inc.php:70
+#: ../../templates/show_tvshow_season.inc.php:62
+#: ../../templates/show_tvshow_seasons.inc.php:63
+#: ../../templates/show_tvshow_seasons.inc.php:128
#: ../../templates/show_wanted_albums.inc.php:30
msgid "Actions"
msgstr "الإجراءات"
-#: ../../templates/show_album_group_disks.inc.php:77
-#: ../../templates/show_album_group_disks.inc.php:78
-#: ../../templates/show_album_group_disks.inc.php:120
-#: ../../templates/show_album.inc.php:113
-#: ../../templates/show_album.inc.php:114
-#: ../../templates/show_album_row.inc.php:52
-#: ../../templates/show_artist_row.inc.php:52
-#: ../../templates/show_playlist_row.inc.php:42
-#, fuzzy
+#: ../../templates/show_album_group_disks.inc.php:89
+#: ../../templates/show_album_group_disks.inc.php:91
+#: ../../templates/show_album_group_disks.inc.php:144
+#: ../../templates/show_album.inc.php:142
+#: ../../templates/show_album.inc.php:144
+#: ../../templates/show_album_row.inc.php:56
+#: ../../templates/show_artist_row.inc.php:56
+#: ../../templates/show_playlist_row.inc.php:45
msgid "Random to temporary playlist"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../templates/show_album_group_disks.inc.php:83
-#: ../../templates/show_album_group_disks.inc.php:84
-#: ../../templates/show_album_group_disks.inc.php:132
-#: ../../templates/show_album.inc.php:171
-#: ../../templates/show_album.inc.php:172
-#: ../../templates/show_artist.inc.php:141
-#: ../../templates/show_artist.inc.php:142
-#: ../../templates/show_install_config.inc.php:191
-#: ../../templates/show_install_config.inc.php:206
-#: ../../templates/show_install_config.inc.php:221
-#: ../../templates/show_install_config.inc.php:237
-#: ../../templates/show_playlist_song_row.inc.php:60
+#: ../../templates/show_album_group_disks.inc.php:101
+#: ../../templates/show_album_group_disks.inc.php:105
+#: ../../templates/show_album_group_disks.inc.php:172
+#: ../../templates/show_album.inc.php:270
+#: ../../templates/show_album.inc.php:274
+#: ../../templates/show_artist.inc.php:214
+#: ../../templates/show_artist.inc.php:218
+#: ../../templates/show_install_config.inc.php:222
+#: ../../templates/show_install_config.inc.php:247
+#: ../../templates/show_install_config.inc.php:272
+#: ../../templates/show_install_config.inc.php:298
+#: ../../templates/show_playlist_song_row.inc.php:74
#: ../../templates/show_share.inc.php:33 ../../templates/show_share.inc.php:34
-#: ../../templates/show_song.inc.php:83
-#: ../../templates/show_song_row.inc.php:78
-#: ../../templates/show_video.inc.php:93
-#: ../../templates/show_video_row.inc.php:90
+#: ../../templates/show_song.inc.php:146
+#: ../../templates/show_song_row.inc.php:112
+#: ../../templates/show_video.inc.php:147
+#: ../../templates/show_video_row.inc.php:109
msgid "Download"
msgstr "تنزيل"
-#: ../../templates/show_album_group_disks.inc.php:137
-#: ../../templates/show_album.inc.php:143
-#: ../../templates/show_album.inc.php:144
-#: ../../templates/show_playlist.inc.php:54
-#: ../../templates/show_playlist.inc.php:55
+#: ../../templates/show_album_group_disks.inc.php:184
+#: ../../templates/show_album.inc.php:220
+#: ../../templates/show_album.inc.php:222
+#: ../../templates/show_playlist.inc.php:70
+#: ../../templates/show_playlist.inc.php:72
msgid "Save Tracks Order"
msgstr ""
-#: ../../templates/show_album_group_disks.inc.php:139
-#: ../../templates/show_album.inc.php:148
+#: ../../templates/show_album_group_disks.inc.php:189
+#: ../../templates/show_album.inc.php:229
msgid "Do you really want to update from tags?"
msgstr ""
-#: ../../templates/show_album_group_disks.inc.php:140
-#: ../../templates/show_album.inc.php:148
+#: ../../templates/show_album_group_disks.inc.php:191
+#: ../../templates/show_album.inc.php:230
+#: ../../templates/show_album.inc.php:231
msgid "Update from tags"
msgstr ""
-#: ../../templates/show_album_group_disks.inc.php:142
-#: ../../templates/show_album.inc.php:161
-#: ../../templates/show_album.inc.php:164
-#: ../../templates/show_album_row.inc.php:91
-#, fuzzy
+#: ../../templates/show_album_group_disks.inc.php:194
+#: ../../templates/show_album.inc.php:254
+#: ../../templates/show_album.inc.php:258
+#: ../../templates/show_album_row.inc.php:124
msgid "Album edit"
-msgstr "البوم الÙÙ†"
-
-#: ../../templates/show_album.inc.php:75
-#: ../../templates/show_artist.inc.php:72
-msgid "times"
msgstr ""
#: ../../templates/show_album.inc.php:87
-#: ../../templates/show_artist.inc.php:84
-#: ../../templates/show_song.inc.php:158
-#, fuzzy
+#: ../../templates/show_artist.inc.php:91
+msgid "times"
+msgstr ""
+
+#: ../../templates/show_album.inc.php:101
+#: ../../templates/show_artist.inc.php:105
+#: ../../templates/show_song.inc.php:243
msgid "Uploaded by"
-msgstr "ØØ°Ù"
+msgstr ""
-#: ../../templates/show_album.inc.php:119
-#: ../../templates/show_artist.inc.php:131
-#, fuzzy
+#: ../../templates/show_album.inc.php:149
+#: ../../templates/show_album.inc.php:153
+#: ../../templates/show_album_row.inc.php:64
+#: ../../templates/show_artist_row.inc.php:59
+#: ../../templates/show_html5_player.inc.php:512
+#: ../../templates/show_playlist_row.inc.php:48
+#: ../../templates/show_playlist_song_row.inc.php:46
+#: ../../templates/show_recently_played.inc.php:134
+#: ../../templates/show_search_row.inc.php:41
+#: ../../templates/show_song_preview_row.inc.php:48
+#: ../../templates/show_song_row.inc.php:56
+msgid "Add to existing playlist"
+msgstr ""
+
+#: ../../templates/show_album.inc.php:161
+#: ../../templates/show_artist.inc.php:187
msgid "Podcast"
-msgstr "الÙنان والعنوان"
+msgstr ""
-#: ../../templates/show_album.inc.php:136
-#: ../../templates/show_album.inc.php:137
-#: ../../templates/show_artist.inc.php:149
-#: ../../templates/show_artist.inc.php:150
-#: ../../templates/show_song.inc.php:87 ../../templates/show_user.inc.php:82
-#: ../../templates/show_video.inc.php:97
+#: ../../templates/show_album.inc.php:204
+#: ../../templates/show_album.inc.php:208
+#: ../../templates/show_artist.inc.php:231
+#: ../../templates/show_artist.inc.php:235
+#: ../../templates/show_song.inc.php:156 ../../templates/show_user.inc.php:110
+#: ../../templates/show_video.inc.php:157
msgid "Graphs"
msgstr ""
-#: ../../templates/show_album.inc.php:165
-#, fuzzy
+#: ../../templates/show_album.inc.php:259
msgid "Edit Album"
-msgstr "الألبوم"
+msgstr ""
#: ../../templates/show_album_row.inc.php:32
#: ../../templates/show_artist_row.inc.php:32
-#: ../../templates/show_playlist_row.inc.php:32
-#: ../../templates/show_recently_played.inc.php:106
-#: ../../templates/show_song.inc.php:66
-#: ../../templates/show_song_row.inc.php:32
-#: ../../templates/show_video_row.inc.php:37
-#, fuzzy
+#: ../../templates/show_playlist_row.inc.php:30
+#: ../../templates/show_recently_played.inc.php:117
+#: ../../templates/show_song.inc.php:102
+#: ../../templates/show_song_row.inc.php:39
+#: ../../templates/show_video_row.inc.php:35
msgid "Play next"
-msgstr "التشغيل"
+msgstr ""
-#: ../../templates/show_album_row.inc.php:54
-#: ../../templates/show_artist_row.inc.php:54
-#: ../../templates/show_playlist_row.inc.php:44
-#: ../../templates/show_playlist_song_row.inc.php:40
-#: ../../templates/show_recently_played.inc.php:116
-#: ../../templates/show_search_row.inc.php:39
-#: ../../templates/show_song_preview_row.inc.php:41
-#: ../../templates/show_song_row.inc.php:43
-#, fuzzy
-msgid "Add to existing playlist"
-msgstr "استيراد قائمة التشغيل"
-
-#: ../../templates/show_albums.inc.php:32
-#: ../../templates/show_albums.inc.php:90
-#: ../../templates/show_artists.inc.php:34
-#: ../../templates/show_artists.inc.php:92
-#: ../../templates/show_arts.inc.php:41 ../../templates/show_labels.inc.php:37
-#: ../../templates/show_labels.inc.php:65
-#: ../../templates/show_tvshow_seasons.inc.php:32
-#: ../../templates/show_tvshow_seasons.inc.php:71
-#: ../../templates/show_tvshows.inc.php:34
-#: ../../templates/show_tvshows.inc.php:76
-#: ../../templates/show_videos.inc.php:31
-#: ../../templates/show_videos.inc.php:83
-#, fuzzy
+#: ../../templates/show_albums.inc.php:36
+#: ../../templates/show_albums.inc.php:125
+#: ../../templates/show_artists.inc.php:38
+#: ../../templates/show_artists.inc.php:127
+#: ../../templates/show_arts.inc.php:46 ../../templates/show_labels.inc.php:46
+#: ../../templates/show_labels.inc.php:86
+#: ../../templates/show_tvshow_seasons.inc.php:36
+#: ../../templates/show_tvshow_seasons.inc.php:103
+#: ../../templates/show_tvshows.inc.php:38
+#: ../../templates/show_tvshows.inc.php:108
+#: ../../templates/show_videos.inc.php:34
+#: ../../templates/show_videos.inc.php:110
msgid "Art"
-msgstr "الÙنان"
+msgstr ""
-#: ../../templates/show_albums.inc.php:42
-#: ../../templates/show_albums.inc.php:100
-#: ../../templates/show_artists.inc.php:44
-#: ../../templates/show_artists.inc.php:102
-#: ../../templates/show_edit_album_row.inc.php:93
-#: ../../templates/show_edit_artist_row.inc.php:53
-#: ../../templates/show_edit_song_row.inc.php:77
+#: ../../templates/show_albums.inc.php:51
+#: ../../templates/show_albums.inc.php:140
+#: ../../templates/show_artists.inc.php:53
+#: ../../templates/show_artists.inc.php:142
+#: ../../templates/show_edit_album_row.inc.php:107
+#: ../../templates/show_edit_artist_row.inc.php:56
+#: ../../templates/show_edit_song_row.inc.php:90
#: ../../templates/show_edit_tvshow_row.inc.php:39
#: ../../templates/show_edit_video_row.inc.php:44
-#: ../../templates/show_now_playing_row.inc.php:52
-#: ../../templates/show_playlist_songs.inc.php:35
-#: ../../templates/show_playlist_songs.inc.php:74
+#: ../../templates/show_now_playing_row.inc.php:54
+#: ../../templates/show_playlist_songs.inc.php:37
+#: ../../templates/show_playlist_songs.inc.php:88
#: ../../templates/show_recommended_artists.inc.php:35
-#: ../../templates/show_recommended_artists.inc.php:84
-#: ../../templates/show_songs.inc.php:35 ../../templates/show_songs.inc.php:84
+#: ../../templates/show_recommended_artists.inc.php:113
+#: ../../templates/show_songs.inc.php:37
+#: ../../templates/show_songs.inc.php:109
#: ../../templates/show_stats.inc.php:37
-#: ../../templates/show_tvshows.inc.php:39
-#: ../../templates/show_tvshows.inc.php:81
-#: ../../templates/show_videos.inc.php:46
-#: ../../templates/show_videos.inc.php:98
+#: ../../templates/show_tvshows.inc.php:45
+#: ../../templates/show_tvshows.inc.php:115
+#: ../../templates/show_videos.inc.php:54
+#: ../../templates/show_videos.inc.php:130
msgid "Tags"
msgstr "العلامات"
-#: ../../templates/show_albums.inc.php:48
-#: ../../templates/show_albums.inc.php:106
-#: ../../templates/show_artists.inc.php:50
-#: ../../templates/show_artists.inc.php:108
-#: ../../templates/show_now_playing_row.inc.php:100
-#: ../../templates/show_now_playing_video_row.inc.php:66
-#: ../../templates/show_playlists.inc.php:38
-#: ../../templates/show_playlists.inc.php:73
-#: ../../templates/show_playlist_songs.inc.php:47
-#: ../../templates/show_playlist_songs.inc.php:81
-#: ../../templates/show_recommended_artists.inc.php:40
-#: ../../templates/show_recommended_artists.inc.php:89
-#: ../../templates/show_song.inc.php:41 ../../templates/show_songs.inc.php:52
-#: ../../templates/show_tvshow_seasons.inc.php:42
-#: ../../templates/show_tvshow_seasons.inc.php:81
-#: ../../templates/show_tvshows.inc.php:45
-#: ../../templates/show_tvshows.inc.php:87
-#: ../../templates/show_video.inc.php:67
-#: ../../templates/show_videos.inc.php:52
-#: ../../templates/show_videos.inc.php:104
+#: ../../templates/show_albums.inc.php:65
+#: ../../templates/show_albums.inc.php:152
+#: ../../templates/show_artists.inc.php:67
+#: ../../templates/show_artists.inc.php:154
+#: ../../templates/show_now_playing_row.inc.php:126
+#: ../../templates/show_now_playing_video_row.inc.php:75
+#: ../../templates/show_playlists.inc.php:46
+#: ../../templates/show_playlists.inc.php:99
+#: ../../templates/show_playlist_songs.inc.php:55
+#: ../../templates/show_playlist_songs.inc.php:101
+#: ../../templates/show_recommended_artists.inc.php:46
+#: ../../templates/show_recommended_artists.inc.php:122
+#: ../../templates/show_song.inc.php:54 ../../templates/show_songs.inc.php:63
+#: ../../templates/show_tvshow_seasons.inc.php:56
+#: ../../templates/show_tvshow_seasons.inc.php:121
+#: ../../templates/show_tvshows.inc.php:59
+#: ../../templates/show_tvshows.inc.php:127
+#: ../../templates/show_video.inc.php:85
+#: ../../templates/show_videos.inc.php:66
+#: ../../templates/show_videos.inc.php:142
msgid "Fav."
msgstr ""
-#: ../../templates/show_albums.inc.php:82
-#, fuzzy
+#: ../../templates/show_albums.inc.php:114
msgid "No album found"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_artist.inc.php:49
-#: ../../templates/show_artist.inc.php:226
-#: ../../templates/show_artist.inc.php:234
-#: ../../templates/show_artist.inc.php:242
-#: ../../templates/show_artist.inc.php:250
-#: ../../templates/show_index.inc.php:42 ../../templates/show_index.inc.php:50
-#: ../../templates/show_label.inc.php:106
+#: ../../templates/show_artist.inc.php:55
+#: ../../templates/show_artist.inc.php:345
+#: ../../templates/show_artist.inc.php:357
+#: ../../templates/show_artist.inc.php:369
+#: ../../templates/show_artist.inc.php:381
+#: ../../templates/show_index.inc.php:46 ../../templates/show_index.inc.php:58
+#: ../../templates/show_label.inc.php:134
#: ../../templates/show_missing_artist.inc.php:33
-#: ../../templates/show_now_playing_row.inc.php:71
-#: ../../templates/show_now_playing_row.inc.php:77
+#: ../../templates/show_now_playing_row.inc.php:83
+#: ../../templates/show_now_playing_row.inc.php:91
msgid "Loading..."
msgstr ""
-#: ../../templates/show_artist.inc.php:94
-#: ../../templates/show_artist.inc.php:96
-#, fuzzy
-msgid "Show all"
-msgstr "وتظهر قائمة التشغيل"
-
-#: ../../templates/show_artist.inc.php:100
-#: ../../templates/show_artist.inc.php:102
-#, fuzzy
-msgid "Show albums"
-msgstr "وتظهر قائمة التشغيل"
-
-#: ../../templates/show_artist.inc.php:107
-#: ../../templates/show_artist.inc.php:108
-#: ../../templates/show_playlist.inc.php:77
-#: ../../templates/show_playlist.inc.php:78
-#: ../../templates/show_tvshow.inc.php:60
-#: ../../templates/show_tvshow.inc.php:61
-#: ../../templates/show_tvshow_season.inc.php:55
-#: ../../templates/show_tvshow_season.inc.php:56
-#, fuzzy
-msgid "Play all"
-msgstr "تشغيل"
-
-#: ../../templates/show_artist.inc.php:112
-#: ../../templates/show_artist.inc.php:113
-#: ../../templates/show_playlist.inc.php:83
-#: ../../templates/show_playlist.inc.php:84
-#: ../../templates/show_tvshow.inc.php:66
-#: ../../templates/show_tvshow.inc.php:67
-#: ../../templates/show_tvshow_season.inc.php:61
-#: ../../templates/show_tvshow_season.inc.php:62
-#, fuzzy
-msgid "Play all last"
-msgstr "التشغيل"
-
-#. HINT: Artist Fullname
-#: ../../templates/show_artist.inc.php:120
#: ../../templates/show_artist.inc.php:121
-#: ../../templates/show_playlist.inc.php:88
-#: ../../templates/show_playlist.inc.php:89
-#, fuzzy
-msgid "Add all to temporary playlist"
-msgstr "استيراد قائمة التشغيل"
+#: ../../templates/show_artist.inc.php:126
+msgid "Show all"
+msgstr ""
+
+#: ../../templates/show_artist.inc.php:135
+#: ../../templates/show_artist.inc.php:140
+msgid "Show albums"
+msgstr ""
+
+#: ../../templates/show_artist.inc.php:148
+#: ../../templates/show_artist.inc.php:150
+#: ../../templates/show_playlist.inc.php:111
+#: ../../templates/show_playlist.inc.php:113
+#: ../../templates/show_tvshow.inc.php:75
+#: ../../templates/show_tvshow.inc.php:77
+#: ../../templates/show_tvshow_season.inc.php:67
+#: ../../templates/show_tvshow_season.inc.php:69
+msgid "Play all"
+msgstr ""
+
+#: ../../templates/show_artist.inc.php:156
+#: ../../templates/show_artist.inc.php:158
+#: ../../templates/show_playlist.inc.php:121
+#: ../../templates/show_playlist.inc.php:123
+#: ../../templates/show_tvshow.inc.php:85
+#: ../../templates/show_tvshow.inc.php:87
+#: ../../templates/show_tvshow_season.inc.php:77
+#: ../../templates/show_tvshow_season.inc.php:79
+msgid "Play all last"
+msgstr ""
#. HINT: Artist Fullname
-#: ../../templates/show_artist.inc.php:125
-#: ../../templates/show_artist.inc.php:126
-#: ../../templates/show_playlist.inc.php:92
-#: ../../templates/show_playlist.inc.php:93
-#, fuzzy
+#: ../../templates/show_artist.inc.php:170
+#: ../../templates/show_artist.inc.php:172
+#: ../../templates/show_playlist.inc.php:129
+#: ../../templates/show_playlist.inc.php:130
+msgid "Add all to temporary playlist"
+msgstr ""
+
+#. HINT: Artist Fullname
+#: ../../templates/show_artist.inc.php:177
+#: ../../templates/show_artist.inc.php:179
+#: ../../templates/show_playlist.inc.php:133
+#: ../../templates/show_playlist.inc.php:134
msgid "Random all to temporary playlist"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../templates/show_artist.inc.php:164
-#: ../../templates/show_artist.inc.php:167
-#: ../../templates/show_artist_row.inc.php:88
-#, fuzzy
+#: ../../templates/show_artist.inc.php:261
+#: ../../templates/show_artist.inc.php:265
+#: ../../templates/show_artist_row.inc.php:109
msgid "Artist edit"
-msgstr "الÙنان والعنوان"
+msgstr ""
-#: ../../templates/show_artist.inc.php:168
-#, fuzzy
+#: ../../templates/show_artist.inc.php:266
msgid "Edit Artist"
-msgstr "الÙنان"
+msgstr ""
-#: ../../templates/show_artist.inc.php:187
-#: ../../templates/show_artist.inc.php:226
+#: ../../templates/show_artist.inc.php:294
+#: ../../templates/show_artist.inc.php:344
#: ../../templates/show_missing_albums.inc.php:23
-#, fuzzy
msgid "Missing Albums"
-msgstr "البوم"
+msgstr ""
-#: ../../templates/show_artist.inc.php:190
-#: ../../templates/show_artist.inc.php:234
-#: ../../templates/show_now_playing_row.inc.php:70
-#: ../../templates/show_now_playing_similar.inc.php:27
+#: ../../templates/show_artist.inc.php:300
+#: ../../templates/show_artist.inc.php:356
+#: ../../templates/show_now_playing_row.inc.php:81
+#: ../../templates/show_now_playing_similar.inc.php:28
#: ../../templates/show_recommended_artists.inc.php:25
-#, fuzzy
msgid "Similar Artists"
-msgstr "الÙنانون"
+msgstr ""
-#: ../../templates/show_artist.inc.php:193
-#: ../../templates/show_artist.inc.php:242
-#, fuzzy
+#: ../../templates/show_artist.inc.php:306
+#: ../../templates/show_artist.inc.php:368
msgid "Events"
-msgstr "شوهد للمرة الاخيرة"
+msgstr ""
-#: ../../templates/show_artists.inc.php:40
-#: ../../templates/show_artists.inc.php:98
-#: ../../templates/show_democratic_playlist.inc.php:60
-#: ../../templates/show_democratic_playlist.inc.php:107
-#: ../../templates/show_playlist_songs.inc.php:36
-#: ../../templates/show_playlist_songs.inc.php:75
+#: ../../templates/show_artists.inc.php:46
+#: ../../templates/show_artists.inc.php:135
+#: ../../templates/show_democratic_playlist.inc.php:71
+#: ../../templates/show_democratic_playlist.inc.php:146
+#: ../../templates/show_playlist_songs.inc.php:38
+#: ../../templates/show_playlist_songs.inc.php:89
#: ../../templates/show_recommended_artists.inc.php:34
-#: ../../templates/show_recommended_artists.inc.php:83
-#: ../../templates/show_songs.inc.php:36 ../../templates/show_songs.inc.php:85
-#: ../../templates/show_videos.inc.php:42
-#: ../../templates/show_videos.inc.php:94
+#: ../../templates/show_recommended_artists.inc.php:112
+#: ../../templates/show_songs.inc.php:38
+#: ../../templates/show_songs.inc.php:110
+#: ../../templates/show_videos.inc.php:47
+#: ../../templates/show_videos.inc.php:123
msgid "Time"
msgstr "وقت"
-#: ../../templates/show_artists.inc.php:84
-#, fuzzy
+#: ../../templates/show_artists.inc.php:116
msgid "No artist found"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_arts.inc.php:28
-#, fuzzy
msgid "Select New Art"
-msgstr "البوم الÙÙ†"
+msgstr ""
-#: ../../templates/show_arts.inc.php:47
-#, fuzzy
+#: ../../templates/show_arts.inc.php:58
msgid "Invalid"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
-#: ../../templates/show_arts.inc.php:49
+#: ../../templates/show_arts.inc.php:68
#: ../../templates/show_disabled_songs.inc.php:28
-#: ../../templates/show_disabled_songs.inc.php:54
+#: ../../templates/show_disabled_songs.inc.php:67
#: ../../templates/show_pvmsg_row.inc.php:24
-#, fuzzy
msgid "Select"
-msgstr "البوم الÙÙ†"
+msgstr ""
#: ../../templates/show_big_art.inc.php:31
msgid "Album Art"
@@ -5635,212 +5392,193 @@ msgstr "انقر لاغلاق الناÙذة"
#: ../../templates/show_broadcast_row.inc.php:33
#: ../../templates/show_channel_row.inc.php:36
#: ../../templates/show_channel_row.inc.php:37
-#: ../../templates/show_search_row.inc.php:44
+#: ../../templates/show_search_row.inc.php:46
msgid "Yes"
msgstr ""
#: ../../templates/show_broadcast_row.inc.php:33
#: ../../templates/show_channel_row.inc.php:36
#: ../../templates/show_channel_row.inc.php:37
-#: ../../templates/show_search_row.inc.php:44
-#, fuzzy
+#: ../../templates/show_search_row.inc.php:46
msgid "No"
-msgstr "بلا"
+msgstr ""
-#: ../../templates/show_broadcasts_dialog.inc.php:39
-#, fuzzy
+#: ../../templates/show_broadcasts_dialog.inc.php:44
msgid "New broadcast"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_broadcasts.inc.php:30
+#: ../../templates/show_broadcasts.inc.php:32
#: ../../templates/show_edit_broadcast_row.inc.php:39
#: ../../templates/show_edit_channel_row.inc.php:88
-#: ../../templates/show_song.inc.php:114
+#: ../../templates/show_song.inc.php:199
msgid "Genre"
msgstr ""
-#: ../../templates/show_broadcasts.inc.php:31
-#, fuzzy
+#: ../../templates/show_broadcasts.inc.php:33
msgid "Started"
-msgstr "يبدأ"
+msgstr ""
-#: ../../templates/show_broadcasts.inc.php:32
-#: ../../templates/show_channels.inc.php:39
+#: ../../templates/show_broadcasts.inc.php:34
+#: ../../templates/show_channels.inc.php:41
msgid "Listeners"
msgstr ""
-#: ../../templates/show_broadcasts.inc.php:48
-#, fuzzy
+#: ../../templates/show_broadcasts.inc.php:56
msgid "No broadcast found"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_catalog_row.inc.php:35
+#: ../../templates/show_catalog_row.inc.php:38
msgid "Make it ready ..."
msgstr ""
-#: ../../templates/show_catalog_row.inc.php:41
-#, fuzzy
-msgid "Verify"
-msgstr "تØقق من الماضي"
-
-#: ../../templates/show_catalog_row.inc.php:42
-#: ../../templates/show_shares.inc.php:27
-#, fuzzy
-msgid "Clean"
-msgstr "آخر النظيÙØ©"
-
-#: ../../templates/show_catalog_row.inc.php:43
-#: ../../templates/show_create_democratic.inc.php:60
-#: ../../templates/show_edit_access.inc.php:78
-#: ../../templates/show_edit_shout.inc.php:41
-#: ../../templates/show_manage_catalogs.inc.php:59
-#: ../../templates/show_preference_admin.inc.php:57
-#, fuzzy
-msgid "Update"
-msgstr "تØديث المستخدم"
-
#: ../../templates/show_catalog_row.inc.php:48
+msgid "Verify"
+msgstr ""
+
+#: ../../templates/show_catalog_row.inc.php:50
+#: ../../templates/show_shares.inc.php:27
+msgid "Clean"
+msgstr ""
+
+#: ../../templates/show_catalog_row.inc.php:52
+#: ../../templates/show_create_democratic.inc.php:70
+#: ../../templates/show_edit_access.inc.php:78
+#: ../../templates/show_edit_shout.inc.php:43
+#: ../../templates/show_manage_catalogs.inc.php:59
+#: ../../templates/show_preference_admin.inc.php:69
+msgid "Update"
+msgstr ""
+
+#: ../../templates/show_catalog_row.inc.php:60
msgid "Go"
msgstr ""
-#: ../../templates/show_catalogs.inc.php:28
-#: ../../templates/show_catalogs.inc.php:56
+#: ../../templates/show_catalogs.inc.php:30
+#: ../../templates/show_catalogs.inc.php:65
msgid "Info"
msgstr ""
-#: ../../templates/show_catalogs.inc.php:29
-#: ../../templates/show_catalogs.inc.php:57
+#: ../../templates/show_catalogs.inc.php:31
+#: ../../templates/show_catalogs.inc.php:66
#: ../../templates/show_stats.inc.php:72
msgid "Last Verify"
msgstr "تØقق من الماضي"
-#: ../../templates/show_catalogs.inc.php:30
-#: ../../templates/show_catalogs.inc.php:58
+#: ../../templates/show_catalogs.inc.php:32
+#: ../../templates/show_catalogs.inc.php:67
#: ../../templates/show_stats.inc.php:73
msgid "Last Add"
msgstr "أض٠الماضي"
-#: ../../templates/show_catalogs.inc.php:31
-#: ../../templates/show_catalogs.inc.php:59
+#: ../../templates/show_catalogs.inc.php:33
+#: ../../templates/show_catalogs.inc.php:68
#: ../../templates/show_stats.inc.php:74
msgid "Last Clean"
msgstr "آخر النظيÙØ©"
-#: ../../templates/show_catalogs.inc.php:48
-#, fuzzy
+#: ../../templates/show_catalogs.inc.php:55
msgid "No catalog found"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_catalog_types.inc.php:31
-#: ../../templates/show_catalog_types.inc.php:65
+#: ../../templates/show_catalog_types.inc.php:80
#: ../../templates/show_localplay_controllers.inc.php:31
-#: ../../templates/show_localplay_controllers.inc.php:65
+#: ../../templates/show_localplay_controllers.inc.php:80
#: ../../templates/show_plugins.inc.php:31
-#: ../../templates/show_plugins.inc.php:71
+#: ../../templates/show_plugins.inc.php:82
msgid "Version"
msgstr "النسخة"
-#: ../../templates/show_catalog_types.inc.php:46
-#: ../../templates/show_localplay_controllers.inc.php:46
+#: ../../templates/show_catalog_types.inc.php:48
+#: ../../templates/show_localplay_controllers.inc.php:48
#: ../../templates/show_plugins.inc.php:43
msgid "Activate"
msgstr "تÙعيل"
-#: ../../templates/show_catalog_types.inc.php:57
-#: ../../templates/show_disabled_songs.inc.php:48
-#: ../../templates/show_localplay_controllers.inc.php:57
-#: ../../templates/show_localplay_playlist.inc.php:55
-#: ../../templates/show_manage_shoutbox.inc.php:51
-#: ../../templates/show_plugins.inc.php:63
+#: ../../templates/show_catalog_types.inc.php:70
+#: ../../templates/show_disabled_songs.inc.php:59
+#: ../../templates/show_localplay_controllers.inc.php:70
+#: ../../templates/show_localplay_playlist.inc.php:68
+#: ../../templates/show_manage_shoutbox.inc.php:54
+#: ../../templates/show_plugins.inc.php:72
msgid "No Records Found"
msgstr "لا توجد سجلات"
-#: ../../templates/show_channels.inc.php:29
+#: ../../templates/show_channels.inc.php:31
msgid "#"
msgstr ""
-#: ../../templates/show_channels.inc.php:38
-#: ../../templates/show_graphs.inc.php:55
-#, fuzzy
-msgid "Start Date"
-msgstr "يبدأ"
-
#: ../../templates/show_channels.inc.php:40
-#, fuzzy
-msgid "Stream Url"
-msgstr "تيار عنوان"
+#: ../../templates/show_graphs.inc.php:60
+msgid "Start Date"
+msgstr ""
-#: ../../templates/show_channels.inc.php:57
-#, fuzzy
+#: ../../templates/show_channels.inc.php:42
+msgid "Stream Url"
+msgstr ""
+
+#: ../../templates/show_channels.inc.php:65
msgid "No channel found"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_clean_catalog.inc.php:23
-#, fuzzy
msgid "Clean Catalog"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
#. HINT: Catalog Name
#: ../../templates/show_clean_catalog.inc.php:25
-#, fuzzy, php-format
+#, php-format
msgid "Cleaning the %s Catalog"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
#: ../../templates/show_clean_catalog.inc.php:27
msgid "Checking"
msgstr ""
#: ../../templates/show_concerts.inc.php:23
-#, fuzzy
msgid "Coming Events"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_concerts.inc.php:27
-#: ../../templates/show_concerts.inc.php:52
-#: ../../templates/show_ip_history.inc.php:45
-#: ../../templates/show_ip_history.inc.php:59
-#: ../../templates/show_pvmsgs.inc.php:51
-#: ../../templates/show_pvmsgs.inc.php:78
-#, fuzzy
+#: ../../templates/show_concerts.inc.php:61
+#: ../../templates/show_ip_history.inc.php:53
+#: ../../templates/show_ip_history.inc.php:72
+#: ../../templates/show_pvmsgs.inc.php:53
+#: ../../templates/show_pvmsgs.inc.php:89
msgid "Date"
-msgstr "العثور على مكررات"
+msgstr ""
#: ../../templates/show_concerts.inc.php:29
-#: ../../templates/show_concerts.inc.php:54
+#: ../../templates/show_concerts.inc.php:63
#: ../../templates/show_partial_edit_personal_video_row.inc.php:24
#: ../../templates/show_partial_personal_video.inc.php:23
#: ../../templates/show_partial_personal_videos.inc.php:23
-#, fuzzy
msgid "Location"
-msgstr "العمل"
+msgstr ""
-#: ../../templates/show_concerts.inc.php:42
-#, fuzzy
+#: ../../templates/show_concerts.inc.php:49
msgid "No coming events found"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_concerts.inc.php:48
-#, fuzzy
+#: ../../templates/show_concerts.inc.php:57
msgid "Past Events"
-msgstr "شوهد للمرة الاخيرة"
+msgstr ""
-#: ../../templates/show_concerts.inc.php:67
-#, fuzzy
+#: ../../templates/show_concerts.inc.php:83
msgid "No past events found"
-msgstr "وتظهر قائمة التشغيل"
+msgstr ""
#: ../../templates/show_confirmation.inc.php:29
-#: ../../templates/show_install_check.inc.php:65
+#: ../../templates/show_install_check.inc.php:67
#: ../../templates/show_update_items.inc.php:28
msgid "Continue"
msgstr "تواصل"
#: ../../templates/show_create_democratic.inc.php:23
-#: ../../templates/show_democratic.inc.php:35
-#: ../../templates/show_democratic.inc.php:37
-#, fuzzy
+#: ../../templates/show_democratic.inc.php:41
+#: ../../templates/show_democratic.inc.php:44
msgid "Configure Democratic Playlist"
-msgstr "إدارة التشغيل الديمقراطية"
+msgstr ""
#: ../../templates/show_create_democratic.inc.php:31
#: ../../templates/show_manage_democratic.inc.php:27
@@ -5848,82 +5586,70 @@ msgid "Base Playlist"
msgstr "قاعدة التشغيل"
#: ../../templates/show_create_democratic.inc.php:35
-#, fuzzy
msgid "Cooldown Time"
-msgstr "تهدئة"
+msgstr ""
-#: ../../templates/show_create_democratic.inc.php:49
-#, fuzzy
+#: ../../templates/show_create_democratic.inc.php:57
msgid "Make Default"
-msgstr "اÙتراضي"
+msgstr ""
-#: ../../templates/show_create_democratic.inc.php:54
-#, fuzzy
+#: ../../templates/show_create_democratic.inc.php:64
msgid "Force Democratic Play"
-msgstr "إدارة التشغيل الديمقراطية"
+msgstr ""
#: ../../templates/show_debug.inc.php:23
msgid "Debug Tools"
msgstr ""
#: ../../templates/show_debug.inc.php:27
-#, fuzzy
msgid "Generate Configuration"
-msgstr "بدء التهيئة"
+msgstr ""
#: ../../templates/show_debug.inc.php:33
-#, fuzzy
msgid "Set Database Charset"
-msgstr "قاعدة بيانات Ampache اسم المستخدم"
+msgstr ""
#: ../../templates/show_debug.inc.php:36
-#, fuzzy
msgid "Clear Songs Cache"
-msgstr "# أغاني"
+msgstr ""
#: ../../templates/show_debug.inc.php:39
-#, fuzzy
msgid "Clear Artists Cache"
-msgstr "الÙنانون"
+msgstr ""
#: ../../templates/show_debug.inc.php:42
-#, fuzzy
msgid "Clear Albums Cache"
-msgstr "نوع البØØ«"
+msgstr ""
-#: ../../templates/show_debug.inc.php:47 ../../update.php:77
+#: ../../templates/show_debug.inc.php:47 ../../update.php:78
msgid "Ampache Update"
msgstr "تØديث Ampache"
#: ../../templates/show_debug.inc.php:48
-#, fuzzy
msgid "Installed Ampache version"
-msgstr "النسخة"
+msgstr ""
#: ../../templates/show_debug.inc.php:49
-#, fuzzy
msgid "Latest Ampache version"
-msgstr "Ampache التثبيت"
+msgstr ""
#: ../../templates/show_debug.inc.php:50
msgid "Force check"
msgstr ""
#: ../../templates/show_debug.inc.php:59
-#, fuzzy
msgid "PHP Settings"
-msgstr "PHP الإصدار"
+msgstr ""
#: ../../templates/show_debug.inc.php:67
-#, fuzzy
msgid "Setting"
-msgstr "إعدادات %s"
+msgstr ""
#: ../../templates/show_debug.inc.php:68
#: ../../templates/show_debug.inc.php:121
#: ../../templates/show_dynamic.inc.php:28
-#: ../../templates/show_preference_box.inc.php:43
-#: ../../templates/show_preference_box.inc.php:77
+#: ../../templates/show_preference_box.inc.php:45
+#: ../../templates/show_preference_box.inc.php:106
#: ../../templates/show_user_preferences.inc.php:38
msgid "Value"
msgstr "القيمة"
@@ -5957,9 +5683,8 @@ msgid "Zlib Support"
msgstr ""
#: ../../templates/show_debug.inc.php:97
-#, fuzzy
msgid "GD Support"
-msgstr "Gettext الدعم"
+msgstr ""
#: ../../templates/show_debug.inc.php:101
msgid "Iconv Support"
@@ -5970,86 +5695,82 @@ msgid "Gettext Support"
msgstr "Gettext الدعم"
#: ../../templates/show_debug.inc.php:112
-#, fuzzy
msgid "Current Configuration"
-msgstr "بدء التهيئة"
+msgstr ""
#: ../../templates/show_debug.inc.php:120
#: ../../templates/show_preference_admin.inc.php:32
-#: ../../templates/show_preference_admin.inc.php:51
-#: ../../templates/show_preference_box.inc.php:42
-#: ../../templates/show_preference_box.inc.php:76
+#: ../../templates/show_preference_admin.inc.php:63
+#: ../../templates/show_preference_box.inc.php:44
+#: ../../templates/show_preference_box.inc.php:105
#: ../../templates/show_user_preferences.inc.php:37
msgid "Preference"
msgstr "الأÙضلية"
#: ../../templates/show_democratic.inc.php:23
-#, fuzzy, php-format
+#, php-format
msgid "%s Playlist"
-msgstr "التشغيل"
+msgstr ""
-#: ../../templates/show_democratic.inc.php:30
+#: ../../templates/show_democratic.inc.php:31
#: ../../templates/show_manage_democratic.inc.php:28
msgid "Cooldown"
msgstr "تهدئة"
-#: ../../templates/show_democratic.inc.php:42
-#, fuzzy
+#: ../../templates/show_democratic.inc.php:52
msgid "Play Democratic Playlist"
-msgstr "إدارة التشغيل الديمقراطية"
+msgstr ""
-#: ../../templates/show_democratic.inc.php:70
+#: ../../templates/show_democratic.inc.php:92
msgid "Reload this page automatically"
msgstr ""
-#: ../../templates/show_democratic_playlist.inc.php:44
-#, fuzzy
+#: ../../templates/show_democratic_playlist.inc.php:48
msgid "Playing from base Playlist"
-msgstr "قاعدة التشغيل"
+msgstr ""
-#: ../../templates/show_democratic_playlist.inc.php:56
-#: ../../templates/show_democratic_playlist.inc.php:103
+#: ../../templates/show_democratic_playlist.inc.php:63
+#: ../../templates/show_democratic_playlist.inc.php:138
msgid "Votes"
msgstr ""
-#: ../../templates/show_democratic_playlist.inc.php:80
+#: ../../templates/show_democratic_playlist.inc.php:98
msgid "Remove Vote"
msgstr ""
-#: ../../templates/show_democratic_playlist.inc.php:82
-#, fuzzy
+#: ../../templates/show_democratic_playlist.inc.php:103
msgid "Add Vote"
-msgstr "إضاÙØ© درجة"
+msgstr ""
-#: ../../templates/show_denied.inc.php:50
-#: ../../templates/sidebar_localplay.inc.php:72
+#: ../../templates/show_denied.inc.php:52
+#: ../../templates/sidebar_localplay.inc.php:118
msgid "Access Denied"
msgstr "تم رÙض الوصول"
-#: ../../templates/show_denied.inc.php:51
-#: ../../templates/show_denied.inc.php:57
+#: ../../templates/show_denied.inc.php:53
+#: ../../templates/show_denied.inc.php:62
msgid "This event has been logged."
msgstr ""
-#: ../../templates/show_denied.inc.php:55
+#: ../../templates/show_denied.inc.php:58
msgid ""
-"You have been redirected to this page because you do not have access to this "
-"function."
+"You have been redirected to this page because you do not have access to this"
+" function."
msgstr ""
-#: ../../templates/show_denied.inc.php:56
+#: ../../templates/show_denied.inc.php:60
msgid ""
"If you believe this is an error please contact an Ampache administrator."
msgstr ""
-#: ../../templates/show_denied.inc.php:59
+#: ../../templates/show_denied.inc.php:67
msgid ""
"You have been redirected to this page because you attempted to access a "
"function that is disabled in the demo."
msgstr ""
#: ../../templates/show_disabled_songs.inc.php:33
-#: ../../templates/show_disabled_songs.inc.php:59
+#: ../../templates/show_disabled_songs.inc.php:72
msgid "Addition Time"
msgstr ""
@@ -6072,33 +5793,31 @@ msgid "Artist, Album and Title"
msgstr "Ùنانة ØŒ وعنوان الألبوم"
#: ../../templates/show_duplicates.inc.php:23
-#, fuzzy
msgid "Duplicate Songs"
-msgstr "العثور على مكررات"
+msgstr ""
#: ../../templates/show_duplicates.inc.php:28
-#: ../../templates/show_duplicates.inc.php:67
+#: ../../templates/show_duplicates.inc.php:79
#: ../../templates/show_lyrics.inc.php:39
#: ../../templates/show_now_playing_row.inc.php:39
#: ../../templates/show_partial_clip.inc.php:24
#: ../../templates/show_recently_played.inc.php:30
-#: ../../templates/show_recently_played.inc.php:149
-#: ../../templates/show_tagcloud.inc.php:24
-#: ../../templates/sidebar_home.inc.php:94
-#, fuzzy
+#: ../../templates/show_recently_played.inc.php:181
+#: ../../templates/show_tagcloud.inc.php:26
+#: ../../templates/sidebar_home.inc.php:156
msgid "Song"
-msgstr "الأغاني"
+msgstr ""
#: ../../templates/show_duplicates.inc.php:31
-#: ../../templates/show_duplicates.inc.php:70
-#: ../../templates/show_random.inc.php:54
-#: ../../templates/show_song.inc.php:118
-#: ../../templates/show_video.inc.php:111
+#: ../../templates/show_duplicates.inc.php:82
+#: ../../templates/show_random.inc.php:72
+#: ../../templates/show_song.inc.php:203
+#: ../../templates/show_video.inc.php:181
msgid "Length"
msgstr ""
#: ../../templates/show_duplicates.inc.php:33
-#: ../../templates/show_duplicates.inc.php:72
+#: ../../templates/show_duplicates.inc.php:84
msgid "Size"
msgstr ""
@@ -6118,28 +5837,27 @@ msgstr ""
msgid "Method"
msgstr ""
-#: ../../templates/show_dynamic.inc.php:51
+#: ../../templates/show_dynamic.inc.php:54
msgid "Like"
msgstr ""
-#: ../../templates/show_dynamic.inc.php:59
+#: ../../templates/show_dynamic.inc.php:62
msgid "OR"
msgstr ""
-#: ../../templates/show_dynamic.inc.php:60
+#: ../../templates/show_dynamic.inc.php:63
msgid "AND"
msgstr ""
-#: ../../templates/show_dynamic.inc.php:66
-#, fuzzy
-msgid "Add Rule"
-msgstr "إضاÙØ© الكل"
-
#: ../../templates/show_dynamic.inc.php:69
-msgid "Save Rules As"
+msgid "Add Rule"
msgstr ""
#: ../../templates/show_dynamic.inc.php:72
+msgid "Save Rules As"
+msgstr ""
+
+#: ../../templates/show_dynamic.inc.php:75
msgid "Load Saved Rules"
msgstr ""
@@ -6147,48 +5865,46 @@ msgstr ""
msgid "Edit Access Control List"
msgstr ""
-#: ../../templates/show_edit_album_row.inc.php:46
-#: ../../templates/show_song.inc.php:110
-#, fuzzy
+#: ../../templates/show_edit_album_row.inc.php:47
+#: ../../templates/show_song.inc.php:195
msgid "Album Artist"
-msgstr "البوم الÙÙ†"
+msgstr ""
-#: ../../templates/show_edit_album_row.inc.php:69
+#: ../../templates/show_edit_album_row.inc.php:74
#: ../../templates/show_edit_artist_row.inc.php:31
-#: ../../templates/show_edit_song_row.inc.php:55
+#: ../../templates/show_edit_song_row.inc.php:63
msgid "MusicBrainz ID"
msgstr ""
-#: ../../templates/show_edit_album_row.inc.php:79
+#: ../../templates/show_edit_album_row.inc.php:89
msgid "MusicBrainz Release Group ID"
msgstr ""
-#: ../../templates/show_edit_album_row.inc.php:89
-#, fuzzy
+#: ../../templates/show_edit_album_row.inc.php:103
msgid "Release Type"
-msgstr "الاسم التشغيل"
+msgstr ""
-#: ../../templates/show_edit_album_row.inc.php:100
+#: ../../templates/show_edit_album_row.inc.php:114
msgid "Overwrite tags of sub songs"
msgstr ""
-#: ../../templates/show_edit_album_row.inc.php:104
+#: ../../templates/show_edit_album_row.inc.php:118
msgid "Add tags to sub songs"
msgstr ""
-#: ../../templates/show_edit_artist_row.inc.php:45
+#: ../../templates/show_edit_artist_row.inc.php:48
msgid "Place Formed"
msgstr ""
-#: ../../templates/show_edit_artist_row.inc.php:49
+#: ../../templates/show_edit_artist_row.inc.php:52
msgid "Year Formed"
msgstr ""
-#: ../../templates/show_edit_artist_row.inc.php:64
+#: ../../templates/show_edit_artist_row.inc.php:70
msgid "Overwrite tags of sub albums and sub songs"
msgstr ""
-#: ../../templates/show_edit_artist_row.inc.php:68
+#: ../../templates/show_edit_artist_row.inc.php:74
msgid "Add tags to sub albums and sub songs"
msgstr ""
@@ -6206,37 +5922,34 @@ msgid "Save Catalog Settings"
msgstr "كتالوج ØÙظ الإعدادات"
#: ../../templates/show_edit_license.inc.php:23
-#, fuzzy
msgid "Configure License"
-msgstr "التهيئة مسبقا"
+msgstr ""
-#: ../../templates/show_edit_license.inc.php:34
-#, fuzzy
+#: ../../templates/show_edit_license.inc.php:39
msgid "Description:"
-msgstr "وصÙ"
+msgstr ""
-#: ../../templates/show_edit_license.inc.php:38
+#: ../../templates/show_edit_license.inc.php:45
msgid "External Link"
msgstr ""
-#: ../../templates/show_edit_license.inc.php:43
-#, fuzzy
+#: ../../templates/show_edit_license.inc.php:52
msgid "Confirm"
-msgstr "تأكيد كلمة السر"
+msgstr ""
#: ../../templates/show_edit_playlist_row.inc.php:36
#: ../../templates/show_edit_search_row.inc.php:36
+#: ../../templates/show_edit_user.inc.php:45
msgid "Public"
msgstr ""
-#: ../../templates/show_edit_search_row.inc.php:46
+#: ../../templates/show_edit_search_row.inc.php:48
msgid "Item Limit (0 = unlimited)"
msgstr ""
#: ../../templates/show_edit_shout.inc.php:23
-#, fuzzy
msgid "Edit existing Shoutbox Post"
-msgstr "تØرير القائمة المستخدم"
+msgstr ""
#. HINT: Client link, Object link
#: ../../templates/show_edit_shout.inc.php:28
@@ -6244,10 +5957,10 @@ msgstr "تØرير القائمة المستخدم"
msgid "Created by: %s for %s"
msgstr ""
-#: ../../templates/show_edit_song_row.inc.php:51
-#: ../../templates/show_localplay_playlist.inc.php:31
-#: ../../templates/show_localplay_playlist.inc.php:61
-#: ../../templates/show_song_previews.inc.php:35
+#: ../../templates/show_edit_song_row.inc.php:59
+#: ../../templates/show_localplay_playlist.inc.php:33
+#: ../../templates/show_localplay_playlist.inc.php:76
+#: ../../templates/show_song_previews.inc.php:39
msgid "Track"
msgstr ""
@@ -6256,14 +5969,12 @@ msgid "Re-tag"
msgstr ""
#: ../../templates/show_edit_tag_row.inc.php:38
-#, fuzzy
msgid "Persistent"
-msgstr "النسخة"
+msgstr ""
#: ../../templates/show_edit_tag_row.inc.php:42
-#, fuzzy
msgid "Keep Existing"
-msgstr "Ùوق القائمة"
+msgstr ""
#: ../../templates/show_edit_tvshow_row.inc.php:44
msgid "Overwrite tags of sub episodes"
@@ -6281,114 +5992,103 @@ msgstr "تØرير القائمة المستخدم"
msgid "User Properties"
msgstr "مستخدم للعقارات"
-#: ../../templates/show_edit_user.inc.php:125
+#: ../../templates/show_edit_user.inc.php:128
msgid "Other Options"
msgstr "خيارات أخرى"
-#: ../../templates/show_edit_user.inc.php:137
+#: ../../templates/show_edit_user.inc.php:140
msgid "Config Preset"
msgstr "التهيئة مسبقا"
-#: ../../templates/show_edit_user.inc.php:143
+#: ../../templates/show_edit_user.inc.php:146
msgid "Flash"
msgstr "Flash"
-#: ../../templates/show_edit_user.inc.php:149
+#: ../../templates/show_edit_user.inc.php:152
msgid "Prevent Preset Override"
msgstr "منع تجاوز مسبقا"
-#: ../../templates/show_edit_user.inc.php:151
+#: ../../templates/show_edit_user.inc.php:154
msgid "This Affects all non-Admin accounts"
msgstr "وهذا يؤثر على جميع المنظمات غير الادارية للØسابات"
-#: ../../templates/show_edit_user.inc.php:163
+#: ../../templates/show_edit_user.inc.php:166
msgid "Update User"
msgstr "تØديث المستخدم"
#: ../../templates/show_edit_video_row.inc.php:35
-#: ../../templates/show_video.inc.php:115
-#: ../../templates/show_videos.inc.php:39
-#: ../../templates/show_videos.inc.php:91
-#, fuzzy
+#: ../../templates/show_video.inc.php:185
+#: ../../templates/show_videos.inc.php:44
+#: ../../templates/show_videos.inc.php:120
msgid "Release Date"
-msgstr "خلق تاريخ"
+msgstr ""
#: ../../templates/show_export.inc.php:28
#: ../../templates/sidebar_admin.inc.php:49
-#, fuzzy
msgid "Export Catalog"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
-#: ../../templates/show_export.inc.php:51
+#: ../../templates/show_export.inc.php:55
msgid "Format"
msgstr ""
-#: ../../templates/show_export.inc.php:61
-#, fuzzy
+#: ../../templates/show_export.inc.php:65
msgid "Export"
-msgstr "الواردات"
+msgstr ""
#: ../../templates/show_gather_art.inc.php:23
-#, fuzzy
msgid "Art Search"
-msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+msgstr ""
#: ../../templates/show_gather_art.inc.php:24
-#, fuzzy
msgid "Starting Art Search"
-msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+msgstr ""
#: ../../templates/show_gather_art.inc.php:25
-#, fuzzy
msgid "Searched"
-msgstr "نوع البØØ«"
+msgstr ""
#: ../../templates/show_get_art.inc.php:23
-#, fuzzy
msgid "Customize Search"
-msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+msgstr ""
-#: ../../templates/show_get_art.inc.php:44
+#: ../../templates/show_get_art.inc.php:49
msgid "Direct URL to Image"
msgstr ""
-#: ../../templates/show_get_art.inc.php:52
-#, fuzzy
+#: ../../templates/show_get_art.inc.php:57
msgid "Local Image"
-msgstr "لعب المØلية"
+msgstr ""
-#: ../../templates/show_get_art.inc.php:65
+#: ../../templates/show_get_art.inc.php:70
msgid "Get Art"
msgstr ""
#: ../../templates/show_graphs.inc.php:23
-#, fuzzy
msgid "Statistical Graphs"
-msgstr "اØصاءات"
+msgstr ""
-#: ../../templates/show_graphs.inc.php:34
-#, fuzzy
+#: ../../templates/show_graphs.inc.php:35
msgid "Show large"
-msgstr "وتبين للÙنون"
+msgstr ""
-#: ../../templates/show_graphs.inc.php:58
-#, fuzzy
+#: ../../templates/show_graphs.inc.php:63
msgid "End Date"
-msgstr "العثور على مكررات"
+msgstr ""
-#: ../../templates/show_graphs.inc.php:61
+#: ../../templates/show_graphs.inc.php:66
msgid "Zoom"
msgstr ""
-#: ../../templates/show_graphs.inc.php:67
+#: ../../templates/show_graphs.inc.php:72
msgid "Month"
msgstr ""
-#: ../../templates/show_graphs.inc.php:68
+#: ../../templates/show_graphs.inc.php:73
msgid "Day"
msgstr ""
-#: ../../templates/show_graphs.inc.php:69
+#: ../../templates/show_graphs.inc.php:74
msgid "Hour"
msgstr ""
@@ -6396,39 +6096,39 @@ msgstr ""
#: ../../templates/show_newest.inc.php:23
#: ../../templates/show_popular.inc.php:23
#: ../../templates/show_recent.inc.php:23
-#: ../../templates/sidebar_home.inc.php:102
+#: ../../templates/sidebar_home.inc.php:164
msgid "Information"
msgstr "معلومات"
-#: ../../templates/show_html5_player_headers.inc.php:196
+#: ../../templates/show_html5_player_headers.inc.php:214
msgid "Your browser doesn't support this feature."
msgstr ""
-#: ../../templates/show_html5_player_headers.inc.php:476
+#: ../../templates/show_html5_player_headers.inc.php:509
msgid "Media is currently playing. Are you sure you want to close"
msgstr ""
-#: ../../templates/show_html5_player.inc.php:150
+#: ../../templates/show_html5_player.inc.php:170
msgid "Double click to post a new shout"
msgstr ""
-#: ../../templates/show_html5_player.inc.php:452
+#: ../../templates/show_html5_player.inc.php:521
msgid "Slideshow"
msgstr ""
-#: ../../templates/show_html5_player.inc.php:456
+#: ../../templates/show_html5_player.inc.php:527
msgid "Equalizer"
msgstr ""
-#: ../../templates/show_html5_player.inc.php:459
+#: ../../templates/show_html5_player.inc.php:531
msgid "Visualizer"
msgstr ""
-#: ../../templates/show_html5_player.inc.php:462
+#: ../../templates/show_html5_player.inc.php:535
msgid "Visualizer Full-Screen"
msgstr ""
-#: ../../templates/show_html5_player.inc.php:465
+#: ../../templates/show_html5_player.inc.php:539
msgid "ReplayGain"
msgstr ""
@@ -6440,12 +6140,12 @@ msgstr "استيراد المل٠من قائمة التشغيل"
msgid "Import Playlist"
msgstr "استيراد قائمة التشغيل"
-#: ../../templates/show_index.inc.php:42
+#: ../../templates/show_index.inc.php:45
#: ../../templates/show_random_albums.inc.php:26
msgid "Albums of the Moment"
msgstr ""
-#: ../../templates/show_index.inc.php:50
+#: ../../templates/show_index.inc.php:57
#: ../../templates/show_random_videos.inc.php:26
msgid "Videos of the Moment"
msgstr ""
@@ -6453,39 +6153,32 @@ msgstr ""
#: ../../templates/show_install_account.inc.php:26
#: ../../templates/show_install_config.inc.php:41
#: ../../templates/show_install.inc.php:26
-#, fuzzy
msgid "Install progress"
-msgstr "النسخة"
+msgstr ""
#: ../../templates/show_install_account.inc.php:38
#: ../../templates/show_install_config.inc.php:52
#: ../../templates/show_install.inc.php:37
-#, fuzzy
msgid "Step 1 - Create the Ampache database"
-msgstr "الخطوة 1 -- خلق وإدراج قاعدة بيانات Ampache"
+msgstr ""
#: ../../templates/show_install_account.inc.php:39
#: ../../templates/show_install_config.inc.php:53
#: ../../templates/show_install.inc.php:42
-#, fuzzy
msgid "Step 2 - Create configuration files (ampache.cfg.php ...)"
-msgstr "الخطوة 2 -- إنشاء مل٠ampache.cfg.php"
+msgstr ""
#: ../../templates/show_install_account.inc.php:41
#: ../../templates/show_install_config.inc.php:58
#: ../../templates/show_install.inc.php:43
-#, fuzzy
msgid "Step 3 - Set up the initial account"
-msgstr "خطوة 3 -- الإعداد الأولي للØساب"
+msgstr ""
#: ../../templates/show_install_account.inc.php:43
-#, fuzzy
msgid ""
"This step creates your initial Ampache admin account. Once your admin "
"account has been created you will be redirected to the login page."
msgstr ""
-"تخلق هذه الخطوة الاصلية Ampache Øساب مشرÙ. الØساب الإداري الخاص بك مرة واØدة "
-"وقد خلقكم ستوجه إلى صÙØØ© تسجيل الدخول"
#: ../../templates/show_install_account.inc.php:47
msgid "Create Admin Account"
@@ -6495,123 +6188,103 @@ msgstr "إنشاء Øساب مشرÙ"
msgid "Create Account"
msgstr "إنشاء Øساب"
-#: ../../templates/show_install_check.inc.php:26
+#: ../../templates/show_install_check.inc.php:28
msgid "Requirements"
msgstr "المتطلبات"
-#: ../../templates/show_install_check.inc.php:30
-#, fuzzy
+#: ../../templates/show_install_check.inc.php:32
msgid ""
"This page handles the installation of the Ampache database and the creation "
"of the ampache.cfg.php file. Before you continue please make sure that you "
"have the following prerequisites:"
msgstr ""
-"وتتولى هذه الصÙØØ© من Ampache تركيب ØŒ وإنشاء قاعدة بيانات للampache.cfg.php "
-"الملÙ. قبل المتابعة يرجى التأكد من أن لديك ما يلي الشروط المسبقة"
-#: ../../templates/show_install_check.inc.php:33
-#, fuzzy
+#: ../../templates/show_install_check.inc.php:35
msgid ""
"A MySQL server with a username and password that can create/modify databases"
msgstr ""
-"وقال خادم MySQL مع اسم المستخدم وكلمة السر التي يمكن أن تخلق / تغيير قواعد "
-"البيانات"
-#: ../../templates/show_install_check.inc.php:34
-#, fuzzy, php-format
+#: ../../templates/show_install_check.inc.php:36
+#, php-format
msgid "Your webserver has read access to the files %s and %s"
msgstr ""
-"لقد قرأ الويب الخاص بك للوصول إلى config/ampache.cfg.php.dist/ المل٠ومل٠"
-"sql/ampache.sql/"
-#: ../../templates/show_install_check.inc.php:37
-#, fuzzy, php-format
+#: ../../templates/show_install_check.inc.php:39
+#, php-format
msgid ""
"Once you have ensured that the above requirements are met please fill out "
"the information below. You will only be asked for the required config "
-"values. If you would like to make changes to your Ampache install at a later "
-"date simply edit %s"
+"values. If you would like to make changes to your Ampache install at a later"
+" date simply edit %s"
msgstr ""
-"وبمجرد الانتهاء من التأكد من أن لديك الشروط المذكورة أعلاه يرجى ملء "
-"المعلومات أدناه. عليك Ùقط طلب التهيئة المطلوبة القيم. إذا كنت ترغب ÙÙŠ إجراء "
-"تغييرات ÙÙŠ تركيب ampache الخاصة بك ÙÙŠ وقت لاØÙ‚ لمجرد تØرير /config/ampache."
-"cfg.php"
-#: ../../templates/show_install_check.inc.php:42
+#: ../../templates/show_install_check.inc.php:44
#: ../../templates/show_test.inc.php:52
msgid "CHECK"
msgstr "تÙØص"
-#: ../../templates/show_install_check.inc.php:43
+#: ../../templates/show_install_check.inc.php:45
#: ../../templates/show_test.inc.php:53
msgid "STATUS"
msgstr "Øالة"
-#: ../../templates/show_install_check.inc.php:44
+#: ../../templates/show_install_check.inc.php:46
#: ../../templates/show_test.inc.php:54
msgid "DESCRIPTION"
msgstr "اÙنص"
-#: ../../templates/show_install_check.inc.php:48
-#: ../../templates/show_install_check.inc.php:53
+#: ../../templates/show_install_check.inc.php:50
+#: ../../templates/show_install_check.inc.php:55
#, php-format
msgid "%s is readable"
msgstr ""
-#: ../../templates/show_install_check.inc.php:50
+#: ../../templates/show_install_check.inc.php:52
msgid "This tests whether the configuration template can be read."
msgstr ""
-#: ../../templates/show_install_check.inc.php:55
+#: ../../templates/show_install_check.inc.php:57
msgid ""
"This tests whether the file needed to initialise the database structure is "
"available."
msgstr ""
-#: ../../templates/show_install_check.inc.php:58
-#, fuzzy
-msgid "ampache.cfg.php is writable"
-msgstr "يجد Ampache.cfg.php"
-
#: ../../templates/show_install_check.inc.php:60
-#, fuzzy
-msgid ""
-"This tests whether PHP can write to config/. This is not strictly necessary, "
-"but will help streamline the installation process."
+msgid "ampache.cfg.php is writable"
+msgstr ""
+
+#: ../../templates/show_install_check.inc.php:62
+msgid ""
+"This tests whether PHP can write to config/. This is not strictly necessary,"
+" but will help streamline the installation process."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
#: ../../templates/show_install_config.inc.php:55
-#, fuzzy, php-format
+#, php-format
msgid ""
"This step takes the basic config values and generates the config file. If "
-"your config/ directory is writable, you can select \"write\" to have Ampache "
-"write the config file directly to the correct location. If you select "
+"your config/ directory is writable, you can select \"write\" to have Ampache"
+" write the config file directly to the correct location. If you select "
"\"download\" it will prompt you to download the config file, and you can "
"then manually place the config file in %s"
msgstr ""
-"وتتخذ هذه الخطوات الأساسية والقيم والتهيئة يولد ملÙ. سو٠مطالبتك لتØميل ملÙ. "
-"يرجى وضع تØميل مل٠ÙÙŠ /config"
#: ../../templates/show_install_config.inc.php:63
msgid "Generate Config File"
msgstr "توليد ملÙ"
#: ../../templates/show_install_config.inc.php:64
-#: ../../templates/show_test_table.inc.php:195
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:225
msgid "Database connection"
-msgstr "الديسيبل الربط"
+msgstr ""
#: ../../templates/show_install_config.inc.php:68
msgid "Web Path"
msgstr "الشبكة الدرب"
#: ../../templates/show_install_config.inc.php:74
-#, fuzzy
msgid "Database Name"
-msgstr "اسم قاعدة البيانات المطلوبة"
+msgstr ""
#: ../../templates/show_install_config.inc.php:80
#: ../../templates/show_install.inc.php:56
@@ -6631,9 +6304,8 @@ msgid "MySQL Password"
msgstr "MySQL كلمة المرور"
#: ../../templates/show_install_config.inc.php:108
-#, fuzzy
msgid "Installation type"
-msgstr "Ampache التثبيت"
+msgstr ""
#: ../../templates/show_install_config.inc.php:109
msgid ""
@@ -6641,36 +6313,35 @@ msgid ""
"automatically."
msgstr ""
-#: ../../templates/show_install_config.inc.php:113
+#: ../../templates/show_install_config.inc.php:115
msgid "Ampache is configured for personal use with most greatest features."
msgstr ""
-#: ../../templates/show_install_config.inc.php:116
+#: ../../templates/show_install_config.inc.php:120
msgid "Minimalist"
msgstr ""
-#: ../../templates/show_install_config.inc.php:116
+#: ../../templates/show_install_config.inc.php:120
msgid ""
"only essential features are enabled to stream simply your music from a web "
"interface."
msgstr ""
-#: ../../templates/show_install_config.inc.php:119
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:125
msgid "Community"
-msgstr "ID3 التعليق"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:119
+#: ../../templates/show_install_config.inc.php:125
msgid ""
"use recommended settings when using Ampache as a frontend for a music "
"community."
msgstr ""
-#: ../../templates/show_install_config.inc.php:124
+#: ../../templates/show_install_config.inc.php:130
msgid "Transcoding"
msgstr ""
-#: ../../templates/show_install_config.inc.php:126
+#: ../../templates/show_install_config.inc.php:132
msgid ""
"Transcoding allows you to convert one type of file to another. Ampache "
"supports on the fly transcoding of all file types based on user, player, IP "
@@ -6680,142 +6351,123 @@ msgid ""
"ensure that they are executable by the web server."
msgstr ""
-#: ../../templates/show_install_config.inc.php:128
+#: ../../templates/show_install_config.inc.php:134
msgid ""
"This section apply default transcoding configuration according to the "
"application you want to use. You may need to customize settings once this "
"setup ended"
msgstr ""
-#: ../../templates/show_install_config.inc.php:128
-#: ../../templates/show_install_config.inc.php:154
+#: ../../templates/show_install_config.inc.php:134
+#: ../../templates/show_install_config.inc.php:168
msgid "See wiki page"
msgstr ""
-#: ../../templates/show_install_config.inc.php:132
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:138
msgid "Template Configuration"
-msgstr "بدء التهيئة"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:146
+#: ../../templates/show_install_config.inc.php:158
msgid ""
"No default transcoding application found. You may need to install a popular "
"application (ffmpeg, avconv ...) or customize transcoding settings manually "
"after installation."
msgstr ""
-#: ../../templates/show_install_config.inc.php:152
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:166
msgid "Players"
-msgstr "تشغيل"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:153
+#: ../../templates/show_install_config.inc.php:167
msgid ""
"Ampache is more than only a web interface. Several backends are implemented "
"to ensure you can stream your media from anywhere."
msgstr ""
-#: ../../templates/show_install_config.inc.php:154
+#: ../../templates/show_install_config.inc.php:168
msgid ""
"Select backends to enable. Depending the backend, you may need to perform "
"additional configuration."
msgstr ""
-#: ../../templates/show_install_config.inc.php:181
+#: ../../templates/show_install_config.inc.php:208
msgid "File Insight"
msgstr ""
-#: ../../templates/show_install_config.inc.php:188
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:218
msgid "channel/.htaccess action"
-msgstr "Ampache.cfg.php مشكل؟"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:193
-#: ../../templates/show_install_config.inc.php:208
-#: ../../templates/show_install_config.inc.php:223
-#: ../../templates/show_install_config.inc.php:239
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:228
+#: ../../templates/show_install_config.inc.php:253
+#: ../../templates/show_install_config.inc.php:278
+#: ../../templates/show_install_config.inc.php:302
msgid "Write"
-msgstr "قراءة وكتابة"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:196
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:232
msgid "channel/.htaccess exists?"
-msgstr "Ampache.cfg.php مشكل؟"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:198
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:236
msgid "channel/.htaccess configured?"
-msgstr "Ampache.cfg.php مشكل؟"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:203
+#: ../../templates/show_install_config.inc.php:243
msgid "rest/.htaccess action"
msgstr ""
-#: ../../templates/show_install_config.inc.php:211
+#: ../../templates/show_install_config.inc.php:257
msgid "rest/.htaccess exists?"
msgstr ""
-#: ../../templates/show_install_config.inc.php:213
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:261
msgid "rest/.htaccess configured?"
-msgstr "Ampache.cfg.php مشكل؟"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:218
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:268
msgid "play/.htaccess action"
-msgstr "Ampache.cfg.php مشكل؟"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:226
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:282
msgid "play/.htaccess exists?"
-msgstr "Ampache.cfg.php مشكل؟"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:228
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:286
msgid "play/.htaccess configured?"
-msgstr "Ampache.cfg.php مشكل؟"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:234
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:295
msgid "config/ampache.cfg.php action"
-msgstr "Ampache.cfg.php مشكل؟"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:242
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:305
msgid "config/ampache.cfg.php exists?"
-msgstr "يجد Ampache.cfg.php"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:244
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:307
msgid "config/ampache.cfg.php configured?"
-msgstr "Ampache.cfg.php مشكل؟"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:251
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:314
msgid "Recheck Config"
-msgstr "شيك التهيئة"
+msgstr ""
-#: ../../templates/show_install_config.inc.php:259
+#: ../../templates/show_install_config.inc.php:322
#: ../../templates/show_install.inc.php:130
msgid "Skip"
msgstr ""
-#: ../../templates/show_install_config.inc.php:262
-#, fuzzy
+#: ../../templates/show_install_config.inc.php:325
msgid "Create config"
-msgstr "إنشاء Øساب"
+msgstr ""
#: ../../templates/show_install.inc.php:39
-#, fuzzy
msgid ""
"This step creates and inserts the Ampache database, so please provide a "
-"MySQL account with database creation rights. This step may take some time on "
-"slower computers."
+"MySQL account with database creation rights. This step may take some time on"
+" slower computers."
msgstr ""
-"وتخلق هذه الخطوة إدراجات Ampache Ùإن قاعدة البيانات ØŒ ولذلك يرجى تقديم mysql "
-"Øساب الØقوق وإنشاء قاعدة بيانات. هذه الخطوة قد تستغرق بعض الوقت اعتمادا على "
-"سرعة الكمبيوتر"
#: ../../templates/show_install.inc.php:47
msgid "Insert Ampache Database"
@@ -6838,23 +6490,20 @@ msgid "MySQL Administrative Password"
msgstr "MySQL الإدارية كلمة المرور"
#: ../../templates/show_install.inc.php:80
-#, fuzzy
msgid "Create Database"
-msgstr "خلق تاريخ"
+msgstr ""
#: ../../templates/show_install.inc.php:90
msgid "Overwrite if database already exists"
msgstr ""
#: ../../templates/show_install.inc.php:99
-#, fuzzy
msgid "Create Tables"
-msgstr "خلق تاريخ"
+msgstr ""
#: ../../templates/show_install.inc.php:108
-#, fuzzy
msgid "Create Database User"
-msgstr "قاعدة بيانات Ampache اسم المستخدم"
+msgstr ""
#: ../../templates/show_install.inc.php:118
msgid "Ampache Database Username"
@@ -6869,9 +6518,8 @@ msgid "Insert Database"
msgstr "تضا٠قاعدة البيانات"
#: ../../templates/show_install_lang.inc.php:30
-#, fuzzy
msgid "Choose Installation Language"
-msgstr "اختيار وتركيب اللغة."
+msgstr ""
#: ../../templates/show_install_lang.inc.php:50
msgid "Start configuration"
@@ -6883,74 +6531,61 @@ msgstr "بدء التهيئة"
msgid "%s IP History"
msgstr ""
-#: ../../templates/show_ip_history.inc.php:29
-#, fuzzy
+#: ../../templates/show_ip_history.inc.php:31
msgid "Show Unique"
-msgstr "وتبين للÙنون"
+msgstr ""
-#: ../../templates/show_ip_history.inc.php:32
-#, fuzzy
+#: ../../templates/show_ip_history.inc.php:38
msgid "Show All"
-msgstr "وتظهر قائمة التشغيل"
+msgstr ""
-#: ../../templates/show_ip_history.inc.php:46
-#: ../../templates/show_ip_history.inc.php:60
-#, fuzzy
+#: ../../templates/show_ip_history.inc.php:54
+#: ../../templates/show_ip_history.inc.php:73
msgid "IP Address"
-msgstr "عناوين IPv4 أو IPv6"
+msgstr ""
-#: ../../templates/show_label.inc.php:64 ../../templates/show_label.inc.php:65
+#: ../../templates/show_label.inc.php:78 ../../templates/show_label.inc.php:81
msgid "Send e-mail"
msgstr ""
-#: ../../templates/show_label.inc.php:70 ../../templates/show_label.inc.php:73
-#: ../../templates/show_label_row.inc.php:45
-#, fuzzy
+#: ../../templates/show_label.inc.php:89 ../../templates/show_label.inc.php:93
msgid "Label edit"
-msgstr "ØØ°Ù"
+msgstr ""
-#: ../../templates/show_label.inc.php:74
-#, fuzzy
+#: ../../templates/show_label.inc.php:94
msgid "Edit Label"
-msgstr "إضاÙØ© درجة"
+msgstr ""
-#: ../../templates/show_labels.inc.php:28
-#, fuzzy
+#: ../../templates/show_labels.inc.php:31
msgid "Create a new label"
-msgstr "خلق التشغيل الجديدة"
+msgstr ""
-#: ../../templates/show_labels.inc.php:58
-#, fuzzy
+#: ../../templates/show_labels.inc.php:76
msgid "No label found"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_live_stream.inc.php:24
-#, fuzzy
+#: ../../templates/show_live_stream.inc.php:25
msgid "Manage Radio Stations"
-msgstr "Ù…Øطات إذاعية"
+msgstr ""
-#: ../../templates/show_live_stream_row.inc.php:27
-#, fuzzy
+#: ../../templates/show_live_stream_row.inc.php:28
msgid "Play live stream"
-msgstr "الاسم التشغيل"
+msgstr ""
-#: ../../templates/show_live_stream_row.inc.php:36
-#, fuzzy
+#: ../../templates/show_live_stream_row.inc.php:40
msgid "Live Stream edit"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_live_streams.inc.php:48
-#, fuzzy
+#: ../../templates/show_live_streams.inc.php:55
msgid "No live stream found"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_localplay_add_instance.inc.php:23
-#, fuzzy
msgid "Add Localplay Instance"
-msgstr "إضاÙØ© درجة"
+msgstr ""
-#: ../../templates/show_localplay_add_instance.inc.php:34
-#: ../../templates/sidebar_localplay.inc.php:41
+#: ../../templates/show_localplay_add_instance.inc.php:38
+#: ../../templates/sidebar_localplay.inc.php:50
msgid "Add Instance"
msgstr "إضاÙØ© درجة"
@@ -6967,29 +6602,24 @@ msgid "Pause"
msgstr "وقÙØ©"
#: ../../templates/show_localplay_edit_instance.inc.php:23
-#, fuzzy
msgid "Edit Localplay Instance"
-msgstr "المØلية تلعب المعاقين"
+msgstr ""
-#: ../../templates/show_localplay_edit_instance.inc.php:34
-#, fuzzy
+#: ../../templates/show_localplay_edit_instance.inc.php:39
msgid "Update Instance"
-msgstr "إضاÙØ© درجة"
+msgstr ""
#: ../../templates/show_localplay_instances.inc.php:23
-#, fuzzy
msgid "Show Localplay Instances"
-msgstr "وتظهر الØالات"
+msgstr ""
-#: ../../templates/show_localplay_instances.inc.php:39
-#, fuzzy
+#: ../../templates/show_localplay_instances.inc.php:50
msgid "Edit Instance"
-msgstr "إضاÙØ© درجة"
+msgstr ""
#: ../../templates/show_localplay_status.inc.php:30
-#, fuzzy
msgid "Localplay Control"
-msgstr "المراقب المالي المØلي اللعب غير Ù…Øدد"
+msgstr ""
#: ../../templates/show_localplay_status.inc.php:35
msgid "Mute"
@@ -7011,32 +6641,29 @@ msgstr ""
msgid "Repeat"
msgstr ""
-#: ../../templates/show_login_form.inc.php:69
+#: ../../templates/show_login_form.inc.php:68
msgid "Remember Me"
msgstr ""
-#: ../../templates/show_login_form.inc.php:75
-#, fuzzy
+#: ../../templates/show_login_form.inc.php:74
msgid "Lost password"
-msgstr "كلمة السر"
+msgstr ""
-#: ../../templates/show_login_form.inc.php:91
+#: ../../templates/show_login_form.inc.php:94
msgid "Message of the Day"
msgstr ""
-#: ../../templates/show_lostpassword_form.inc.php:67
+#: ../../templates/show_lostpassword_form.inc.php:66
msgid "Submit"
msgstr ""
#: ../../templates/show_lyrics.inc.php:61
-#, fuzzy
msgid "No lyrics found."
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_lyrics.inc.php:63
-#, fuzzy
+#: ../../templates/show_lyrics.inc.php:65
msgid "Show more"
-msgstr "وتبين للÙنون"
+msgstr ""
#: ../../templates/show_mail_users.inc.php:24
msgid "Send E-mail to Users"
@@ -7047,9 +6674,8 @@ msgid "Mail to"
msgstr ""
#: ../../templates/show_mail_users.inc.php:34
-#, fuzzy
msgid "Inactive Users"
-msgstr "تØديث المستخدم"
+msgstr ""
#: ../../templates/show_mail_users.inc.php:39
msgid "From"
@@ -7065,38 +6691,32 @@ msgstr ""
#: ../../templates/show_manage_catalogs.inc.php:23
#: ../../templates/sidebar_admin.inc.php:27
-#, fuzzy
msgid "Show Catalogs"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
#: ../../templates/show_manage_catalogs.inc.php:27
msgid "Gather All Art"
msgstr ""
#: ../../templates/show_manage_catalogs.inc.php:30
-#, fuzzy
msgid "Show disabled songs"
-msgstr "وتظهر الØالات"
+msgstr ""
#: ../../templates/show_manage_catalogs.inc.php:33
-#, fuzzy
msgid "Add to All"
-msgstr "إضاÙØ© الكل"
+msgstr ""
#: ../../templates/show_manage_catalogs.inc.php:36
-#, fuzzy
msgid "Verify All"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
#: ../../templates/show_manage_catalogs.inc.php:39
-#, fuzzy
msgid "Clean All"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
#: ../../templates/show_manage_catalogs.inc.php:42
-#, fuzzy
msgid "Update All"
-msgstr "تØديث المستخدم"
+msgstr ""
#. HINT: /data/myNewMusic
#: ../../templates/show_manage_catalogs.inc.php:51
@@ -7114,74 +6734,64 @@ msgstr ""
msgid "Manage Democratic Playlists"
msgstr "إدارة التشغيل الديمقراطية"
-#: ../../templates/show_manage_democratic.inc.php:55
-#, fuzzy
+#: ../../templates/show_manage_democratic.inc.php:68
msgid "No democratic found"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_manage_democratic.inc.php:61
+#: ../../templates/show_manage_democratic.inc.php:76
msgid "Create New Playlist"
msgstr "خلق التشغيل الجديدة"
#: ../../templates/show_manage_license.inc.php:28
-#, fuzzy
msgid "Create new license"
-msgstr "خلق التشغيل الجديدة"
+msgstr ""
-#: ../../templates/show_manage_license.inc.php:50
-#, fuzzy
+#: ../../templates/show_manage_license.inc.php:53
msgid "No Licenses Found"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_manage_shoutbox.inc.php:28
-#: ../../templates/show_manage_shoutbox.inc.php:57
+#: ../../templates/show_manage_shoutbox.inc.php:62
#: ../../templates/show_shared_objects.inc.php:26
-#, fuzzy
msgid "Object"
-msgstr "نوع البØØ«"
+msgstr ""
#: ../../templates/show_manage_shoutbox.inc.php:30
-#: ../../templates/show_manage_shoutbox.inc.php:59
+#: ../../templates/show_manage_shoutbox.inc.php:64
msgid "Sticky"
msgstr ""
#: ../../templates/show_manage_shoutbox.inc.php:32
-#: ../../templates/show_manage_shoutbox.inc.php:61
-#, fuzzy
+#: ../../templates/show_manage_shoutbox.inc.php:66
msgid "Date Added"
-msgstr "أض٠الماضي"
+msgstr ""
#: ../../templates/show_missing_album.inc.php:54
-#, fuzzy
msgid "Wanted actions"
-msgstr "Ù…Øطات إذاعية"
+msgstr ""
-#: ../../templates/show_missing_albums.inc.php:48
-#, fuzzy
+#: ../../templates/show_missing_albums.inc.php:55
msgid "No missing albums found"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_missing_artists.inc.php:46
-#, fuzzy
+#: ../../templates/show_missing_artists.inc.php:55
msgid "No missing artists found"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_now_playing_row.inc.php:76
-#: ../../templates/show_now_playing_similar.inc.php:52
-#, fuzzy
+#: ../../templates/show_now_playing_row.inc.php:89
+#: ../../templates/show_now_playing_similar.inc.php:59
msgid "Similar Songs"
-msgstr "# أغاني"
+msgstr ""
-#: ../../templates/show_object_rating.inc.php:43
-#, fuzzy
+#: ../../templates/show_object_rating.inc.php:47
msgid "Current rating: "
-msgstr "اللعب ÙÙŠ الوقت الØاضر"
+msgstr ""
-#: ../../templates/show_object_rating.inc.php:45
+#: ../../templates/show_object_rating.inc.php:49
msgid "not rated yet"
msgstr ""
-#: ../../templates/show_object_rating.inc.php:46
+#: ../../templates/show_object_rating.inc.php:51
#, php-format
msgid "%s of 5"
msgstr ""
@@ -7192,77 +6802,70 @@ msgid "Original Name"
msgstr ""
#: ../../templates/show_partial_edit_tvshow_episode_row.inc.php:24
-#, fuzzy
msgid "TV Show Season"
-msgstr "عنوان الأغنية"
+msgstr ""
#: ../../templates/show_partial_edit_tvshow_episode_row.inc.php:38
msgid "Episode Number"
msgstr ""
-#: ../../templates/show_playlist.inc.php:59
-#: ../../templates/show_playlist.inc.php:60
+#: ../../templates/show_playlist.inc.php:79
+#: ../../templates/show_playlist.inc.php:81
msgid "Sort Tracks by Artist, Album, Song"
msgstr ""
-#: ../../templates/show_playlist.inc.php:63
-#: ../../templates/show_playlist.inc.php:64
-#, fuzzy
+#: ../../templates/show_playlist.inc.php:87
+#: ../../templates/show_playlist.inc.php:89
msgid "Remove duplicates"
-msgstr "العثور على مكررات"
+msgstr ""
-#: ../../templates/show_playlist.inc.php:99
-#, fuzzy
+#: ../../templates/show_playlist.inc.php:144
msgid "Create channel"
-msgstr "خلق تاريخ"
+msgstr ""
-#: ../../templates/show_playlist.inc.php:105
-#: ../../templates/show_playlist_row.inc.php:75
+#: ../../templates/show_playlist.inc.php:155
+#: ../../templates/show_playlist_row.inc.php:100
msgid "Do you really want to delete the playlist?"
msgstr ""
-#: ../../templates/show_playlist_row.inc.php:72
-#, fuzzy
+#: ../../templates/show_playlist_row.inc.php:96
msgid "Playlist edit"
-msgstr "نوع التشغيل"
+msgstr ""
-#: ../../templates/show_playlists.inc.php:31
-#: ../../templates/show_playlists.inc.php:66
+#: ../../templates/show_playlists.inc.php:33
+#: ../../templates/show_playlists.inc.php:86
msgid "# Songs"
msgstr "# أغاني"
-#: ../../templates/show_playlists.inc.php:32
-#: ../../templates/show_playlists.inc.php:67
-#: ../../templates/show_searches.inc.php:43
-#: ../../templates/show_searches.inc.php:71
+#: ../../templates/show_playlists.inc.php:34
+#: ../../templates/show_playlists.inc.php:87
+#: ../../templates/show_searches.inc.php:50
+#: ../../templates/show_searches.inc.php:86
msgid "Owner"
msgstr "مالك"
-#: ../../templates/show_playlists.inc.php:56
-#, fuzzy
+#: ../../templates/show_playlists.inc.php:74
msgid "No playlist found"
-msgstr "وتظهر قائمة التشغيل"
+msgstr ""
-#: ../../templates/show_playlist_song_row.inc.php:74
-#: ../../templates/show_song_row.inc.php:100
+#: ../../templates/show_playlist_song_row.inc.php:91
+#: ../../templates/show_song_row.inc.php:150
msgid "Reorder"
msgstr ""
#: ../../templates/show_playlist_title.inc.php:23
-#, fuzzy, php-format
+#, php-format
msgid "%s %s (Playlist)"
-msgstr "%s$1 %s$2 التشغيل"
+msgstr ""
#: ../../templates/show_plugins.inc.php:32
-#: ../../templates/show_plugins.inc.php:72
-#, fuzzy
+#: ../../templates/show_plugins.inc.php:83
msgid "Installed Version"
-msgstr "النسخة"
+msgstr ""
#: ../../templates/show_plugins.inc.php:46
-#, fuzzy
msgid "Deactivate"
-msgstr "تÙعيل"
+msgstr ""
#: ../../templates/show_plugins.inc.php:50
msgid "Upgrade"
@@ -7272,13 +6875,13 @@ msgstr ""
msgid "Preference Administration"
msgstr ""
-#: ../../templates/show_preference_box.inc.php:45
-#: ../../templates/show_preference_box.inc.php:79
+#: ../../templates/show_preference_box.inc.php:48
+#: ../../templates/show_preference_box.inc.php:109
msgid "Apply to All"
msgstr "تنطبق على جميع"
-#: ../../templates/show_preference_box.inc.php:46
-#: ../../templates/show_preference_box.inc.php:80
+#: ../../templates/show_preference_box.inc.php:50
+#: ../../templates/show_preference_box.inc.php:111
msgid "Access Level"
msgstr "مستوى الوصول"
@@ -7290,8 +6893,8 @@ msgstr "مستوى الوصول"
msgid "Editing %s preferences"
msgstr "تØرير تÙضيلات %s"
-#: ../../templates/show_preferences.inc.php:35
-#: ../../templates/show_user_preferences.inc.php:51
+#: ../../templates/show_preferences.inc.php:38
+#: ../../templates/show_user_preferences.inc.php:56
msgid "Update Preferences"
msgstr "تØديث تÙضيلات"
@@ -7320,15 +6923,14 @@ msgstr ""
msgid "Set as unread"
msgstr ""
-#: ../../templates/show_pvmsgs.inc.php:49
-#: ../../templates/show_pvmsgs.inc.php:76
+#: ../../templates/show_pvmsgs.inc.php:51
+#: ../../templates/show_pvmsgs.inc.php:87
msgid "Sender"
msgstr ""
-#: ../../templates/show_pvmsgs.inc.php:68
-#, fuzzy
+#: ../../templates/show_pvmsgs.inc.php:77
msgid "No message found"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_random_albums.inc.php:24
#: ../../templates/show_random_videos.inc.php:24
@@ -7336,177 +6938,161 @@ msgid "Refresh"
msgstr ""
#: ../../templates/show_random.inc.php:23
-#, fuzzy
msgid "Play Random Selection"
-msgstr "عشوائية"
+msgstr ""
-#: ../../templates/show_random.inc.php:35
-#, fuzzy
+#: ../../templates/show_random.inc.php:53
msgid "Item count"
-msgstr "الØد الأدنى للتعداد"
+msgstr ""
-#: ../../templates/show_random.inc.php:62
-#: ../../templates/show_random.inc.php:86
-#: ../../templates/show_search_form.inc.php:40
+#: ../../templates/show_random.inc.php:80
+#: ../../templates/show_random.inc.php:104
+#: ../../templates/show_search_form.inc.php:64
msgid "Unlimited"
msgstr ""
-#: ../../templates/show_random.inc.php:68
+#: ../../templates/show_random.inc.php:86
#, php-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-#: ../../templates/show_random.inc.php:70
+#: ../../templates/show_random.inc.php:88
#, php-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-#: ../../templates/show_random.inc.php:79
+#: ../../templates/show_random.inc.php:97
msgid "Size Limit"
msgstr ""
-#: ../../templates/show_random.inc.php:102
+#: ../../templates/show_random.inc.php:120
msgid "Enqueue"
msgstr ""
#: ../../templates/show_recently_played.inc.php:35
-#: ../../templates/show_recently_played.inc.php:154
-#, fuzzy
+#: ../../templates/show_recently_played.inc.php:186
msgid "Last Played"
-msgstr "تشغيل"
+msgstr ""
-#: ../../templates/show_recently_played.inc.php:37
-#: ../../templates/show_recently_played.inc.php:156
+#: ../../templates/show_recently_played.inc.php:38
+#: ../../templates/show_recently_played.inc.php:189
msgid "Agent"
msgstr ""
-#: ../../templates/show_recently_played.inc.php:70
-#, fuzzy, php-format
+#: ../../templates/show_recently_played.inc.php:73
+#, php-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
-msgstr[0] "سنة"
-msgstr[1] "سنة"
-
-#: ../../templates/show_recently_played.inc.php:73
-#, fuzzy, php-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "سنة"
-msgstr[1] "سنة"
+msgstr[0] ""
+msgstr[1] ""
#: ../../templates/show_recently_played.inc.php:76
-#, fuzzy, php-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "سنة"
-msgstr[1] "سنة"
+#, php-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: ../../templates/show_recently_played.inc.php:79
-#, fuzzy, php-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "سنة"
-msgstr[1] "سنة"
+#, php-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: ../../templates/show_recently_played.inc.php:82
-#, fuzzy, php-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "سنة"
-msgstr[1] "سنة"
+#, php-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
#: ../../templates/show_recently_played.inc.php:85
-#, fuzzy, php-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "سنة"
-msgstr[1] "سنة"
+#, php-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
#: ../../templates/show_recently_played.inc.php:88
-#, fuzzy, php-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "سنة"
-msgstr[1] "سنة"
+#, php-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
#: ../../templates/show_recently_played.inc.php:91
-#, fuzzy, php-format
+#, php-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../templates/show_recently_played.inc.php:94
+#, php-format
msgid "%d decade ago"
msgid_plural "%d decades ago"
-msgstr[0] "سنة"
-msgstr[1] "سنة"
+msgstr[0] ""
+msgstr[1] ""
-#: ../../templates/show_recently_played.inc.php:142
-#, fuzzy
+#: ../../templates/show_recently_played.inc.php:172
msgid "No recently item found"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_recommended_artists.inc.php:72
-#, fuzzy
+#: ../../templates/show_recommended_artists.inc.php:99
msgid "No similar artist found"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_registration_confirmation.inc.php:33
#: ../../templates/show_user_activate.inc.php:31
#: ../../templates/show_user_registration.inc.php:37
-#: ../../templates/show_user_registration.inc.php:51
-#, fuzzy
+#: ../../templates/show_user_registration.inc.php:48
msgid "Registration"
-msgstr "تاريخ التسجيل"
+msgstr ""
-#: ../../templates/show_registration_confirmation.inc.php:43
-#, fuzzy
+#: ../../templates/show_registration_confirmation.inc.php:40
msgid "Registration Complete"
-msgstr "تاريخ التسجيل"
+msgstr ""
-#: ../../templates/show_registration_confirmation.inc.php:49
+#: ../../templates/show_registration_confirmation.inc.php:46
msgid "Your account has been created."
msgstr ""
-#: ../../templates/show_registration_confirmation.inc.php:52
+#: ../../templates/show_registration_confirmation.inc.php:49
msgid "Please wait for an administrator to activate your account."
msgstr ""
-#: ../../templates/show_registration_confirmation.inc.php:54
+#: ../../templates/show_registration_confirmation.inc.php:51
msgid ""
"An activation key has been sent to the e-mail address you provided. Please "
"check your e-mail for further information."
msgstr ""
-#: ../../templates/show_registration_confirmation.inc.php:58
+#: ../../templates/show_registration_confirmation.inc.php:55
msgid "Return to Login Page"
msgstr ""
#: ../../templates/show_rules.inc.php:33
-#, fuzzy
msgid "Rules"
-msgstr "ÙˆØدات"
+msgstr ""
#: ../../templates/show_rules.inc.php:37
msgid "Match"
msgstr ""
-#: ../../templates/show_rules.inc.php:40
+#: ../../templates/show_rules.inc.php:42
msgid "all rules"
msgstr ""
-#: ../../templates/show_rules.inc.php:41
+#: ../../templates/show_rules.inc.php:45
msgid "any rule"
msgstr ""
-#: ../../templates/show_rules.inc.php:49
+#: ../../templates/show_rules.inc.php:53
msgid "Add Another Rule"
msgstr ""
@@ -7518,89 +7104,77 @@ msgstr "...بØØ«"
msgid "Anywhere"
msgstr ""
-#: ../../templates/show_search_bar.inc.php:40
-#, fuzzy
+#: ../../templates/show_search_bar.inc.php:43
msgid "Missing Artist"
-msgstr "البوم"
+msgstr ""
-#: ../../templates/show_search_bar.inc.php:44
-#, fuzzy
+#: ../../templates/show_search_bar.inc.php:48
msgid "Advanced Search"
-msgstr "المتقدمة"
+msgstr ""
-#: ../../templates/show_searches.inc.php:28
-#, fuzzy
+#: ../../templates/show_searches.inc.php:31
msgid "Add Smart Playlist"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../templates/show_searches.inc.php:42
-#: ../../templates/show_searches.inc.php:70
-#, fuzzy
+#: ../../templates/show_searches.inc.php:49
+#: ../../templates/show_searches.inc.php:85
msgid "Item Limit"
-msgstr "الØد الأدنى للتعداد"
+msgstr ""
-#: ../../templates/show_searches.inc.php:59
-#, fuzzy
+#: ../../templates/show_searches.inc.php:72
msgid "No smart playlist found"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
#: ../../templates/show_search_form.inc.php:23
-#, fuzzy
msgid "Search Ampache"
-msgstr "نوع البØØ«"
+msgstr ""
-#: ../../templates/show_search_form.inc.php:37
+#: ../../templates/show_search_form.inc.php:61
msgid "Maximum Results"
msgstr ""
-#: ../../templates/show_search_form.inc.php:55
-#, fuzzy
+#: ../../templates/show_search_form.inc.php:88
msgid "Save as Smart Playlist"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
-#: ../../templates/show_search.inc.php:39
-#: ../../templates/show_search.inc.php:40
+#: ../../templates/show_search.inc.php:45
+#: ../../templates/show_search.inc.php:46
msgid "Add All"
msgstr "إضاÙØ© الكل"
-#: ../../templates/show_search.inc.php:56
+#: ../../templates/show_search.inc.php:68
msgid "Save Changes"
msgstr "ØÙظ التغييرات"
#: ../../templates/show_search_options.inc.php:23
-#, fuzzy
msgid "Options"
-msgstr "الإجراءات"
+msgstr ""
#: ../../templates/show_search_options.inc.php:27
#: ../../templates/show_search_options.inc.php:28
msgid "Add Search Results"
msgstr ""
-#: ../../templates/show_search_row.inc.php:54
-#, fuzzy
+#: ../../templates/show_search_row.inc.php:63
msgid "Smart Playlist edit"
-msgstr "استيراد قائمة التشغيل"
+msgstr ""
#: ../../templates/show_search_title.inc.php:24
-#, fuzzy, php-format
+#, php-format
msgid "%s %s (Smart Playlist)"
-msgstr "%s$1 %s$2 التشغيل"
+msgstr ""
#: ../../templates/show_shared_objects.inc.php:27
-#, fuzzy
msgid "Object Type"
-msgstr "نوع البØØ«"
+msgstr ""
#: ../../templates/show_shared_objects.inc.php:29
-#, fuzzy
msgid "Creation Date"
-msgstr "خلق تاريخ"
+msgstr ""
#: ../../templates/show_shared_objects.inc.php:30
-#, fuzzy
msgid "Last Visit"
-msgstr "تØقق من الماضي"
+msgstr ""
#: ../../templates/show_shared_objects.inc.php:31
msgid "Counter"
@@ -7611,9 +7185,8 @@ msgid "Public Url"
msgstr ""
#: ../../templates/show_share.inc.php:31
-#, fuzzy
msgid "Shared by"
-msgstr "ØØ°Ù"
+msgstr ""
#: ../../templates/show_shares.inc.php:27
msgid "Clean expired shared objects"
@@ -7623,63 +7196,59 @@ msgstr ""
msgid "Details"
msgstr ""
-#: ../../templates/show_song.inc.php:50
+#: ../../templates/show_song.inc.php:73
msgid "Waveform"
msgstr ""
-#: ../../templates/show_song.inc.php:82 ../../templates/show_video.inc.php:92
+#: ../../templates/show_song.inc.php:142
+#: ../../templates/show_video.inc.php:143
msgid "Link"
msgstr ""
-#: ../../templates/show_song.inc.php:116 ../../templates/show_song.inc.php:117
+#: ../../templates/show_song.inc.php:201 ../../templates/show_song.inc.php:202
msgid "Links"
msgstr ""
-#: ../../templates/show_song.inc.php:121
-#, fuzzy
+#: ../../templates/show_song.inc.php:206
msgid "Song Language"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../templates/show_song.inc.php:122
-#, fuzzy
+#: ../../templates/show_song.inc.php:207
msgid "Catalog Number"
-msgstr "نوع التسويقي"
+msgstr ""
-#: ../../templates/show_song.inc.php:126
+#: ../../templates/show_song.inc.php:211
msgid "ReplayGain Track Gain"
msgstr ""
-#: ../../templates/show_song.inc.php:129
+#: ../../templates/show_song.inc.php:214
msgid "ReplayGain Album Gain"
msgstr ""
-#: ../../templates/show_song.inc.php:135
-#: ../../templates/show_video.inc.php:127
-#, fuzzy
+#: ../../templates/show_song.inc.php:220
+#: ../../templates/show_video.inc.php:197
msgid "Last Updated"
-msgstr "تØديث Ampache"
+msgstr ""
-#: ../../templates/show_song.inc.php:143
+#: ../../templates/show_song.inc.php:228
msgid "Lyrics"
msgstr ""
-#: ../../templates/show_song.inc.php:150
+#: ../../templates/show_song.inc.php:235
msgid "Licensing"
msgstr ""
-#: ../../templates/show_song_row.inc.php:68
+#: ../../templates/show_song_row.inc.php:97
msgid "Song Information"
msgstr "أغنية المعلومات"
-#: ../../templates/show_song_row.inc.php:81
-#, fuzzy
+#: ../../templates/show_song_row.inc.php:117
msgid "Song edit"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../templates/show_songs.inc.php:73
-#, fuzzy
+#: ../../templates/show_songs.inc.php:96
msgid "No song found"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_stats.inc.php:31
msgid "Connected Users"
@@ -7690,34 +7259,30 @@ msgid "Total Users"
msgstr ""
#: ../../templates/show_stats.inc.php:38 ../../templates/show_stats.inc.php:77
-#, fuzzy
msgid "Catalog Size"
-msgstr "نوع التسويقي"
+msgstr ""
#: ../../templates/show_stats.inc.php:39
-#, fuzzy
msgid "Catalog Time"
-msgstr "نوع التسويقي"
+msgstr ""
#: ../../templates/show_stats_popular.inc.php:26
msgid "Most Popular Albums"
msgstr ""
#: ../../templates/show_stats_popular.inc.php:32
-#, fuzzy
msgid "Most Popular Artists"
-msgstr "الÙنانون"
+msgstr ""
#: ../../templates/show_stats_popular.inc.php:39
msgid "Most Popular Videos"
msgstr ""
-#: ../../templates/show_tagcloud.inc.php:58
-#, fuzzy
-msgid "Tag edit"
-msgstr "عنوان الأغنية"
-
#: ../../templates/show_tagcloud.inc.php:63
+msgid "Tag edit"
+msgstr ""
+
+#: ../../templates/show_tagcloud.inc.php:70
msgid "Do you really want to delete the tag?"
msgstr ""
@@ -7728,460 +7293,407 @@ msgid "Ampache Debug"
msgstr "Ampache التصØÙŠØ"
#: ../../templates/show_test.inc.php:47
-#, fuzzy
msgid ""
"You may have reached this page because a configuration error has occured. "
"Debug information is below."
msgstr ""
-"كنت قد وصلت إلى هذه الصÙØØ© ØŒ لأن التكوين Øدث خطأ. التصØÙŠØ Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª أدناه"
#: ../../templates/show_test_table.inc.php:24
-#, fuzzy
msgid "PHP version"
-msgstr "PHP الإصدار"
+msgstr ""
#: ../../templates/show_test_table.inc.php:29
-#, fuzzy
msgid ""
"This tests whether you are running at least the minimum version of PHP "
"required by Ampache."
msgstr ""
-"هذه الاختبارات للتأكد من أنك تقوم بتشغيل نسخة من المعرو٠ان PHP للعمل مع "
-"Ampache."
#: ../../templates/show_test_table.inc.php:33
-#, fuzzy
-msgid "PHP hash extension"
-msgstr "PHP دعم الدورة"
+msgid "Dependencies"
+msgstr ""
#: ../../templates/show_test_table.inc.php:38
-#, fuzzy
+msgid "This tests whether Ampache dependencies are installed."
+msgstr ""
+
+#: ../../templates/show_test_table.inc.php:42
+msgid ""
+"Please download and install Composer from http://getcomposer.org and install"
+" it (e.g: mv composer.phar /usr/local/bin/composer) then run `composer "
+"install --prefer-source --no-interaction` on Ampache directory."
+msgstr ""
+
+#: ../../templates/show_test_table.inc.php:49
+msgid "PHP hash extension"
+msgstr ""
+
+#: ../../templates/show_test_table.inc.php:54
msgid ""
"This tests whether you have the hash extension enabled. This extension is "
"required by Ampache."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:42
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:58
msgid "SHA256"
-msgstr "SHA256 الدعم"
+msgstr ""
-#: ../../templates/show_test_table.inc.php:47
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:63
msgid ""
"This tests whether the hash extension supports SHA256. This algorithm is "
"required by Ampache."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:51
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:67
msgid "PHP PDO extension"
-msgstr "PHP PCRE الدعم"
+msgstr ""
-#: ../../templates/show_test_table.inc.php:56
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:72
msgid ""
"This tests whether you have the PDO extension enabled. This extension is "
"required by Ampache."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:60
+#: ../../templates/show_test_table.inc.php:76
msgid "MySQL"
msgstr ""
-#: ../../templates/show_test_table.inc.php:65
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:81
msgid ""
"This tests whether the MySQL driver for PDO is enabled. This driver is "
"required by Ampache."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:69
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:85
msgid "PHP session extension"
-msgstr "PHP دعم الدورة"
-
-#: ../../templates/show_test_table.inc.php:74
-#, fuzzy
-msgid ""
-"This tests whether you have the session extension enabled. This extension is "
-"required by Ampache."
msgstr ""
-"هذا الاختبار ÙØوص للتأكد من أن لديك دعم PHP الدورة مكنت. الدورات اللازمة "
-"لAmpache الى العمل."
-#: ../../templates/show_test_table.inc.php:78
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:90
+msgid ""
+"This tests whether you have the session extension enabled. This extension is"
+" required by Ampache."
+msgstr ""
+
+#: ../../templates/show_test_table.inc.php:94
msgid "PHP iconv extension"
-msgstr "PHP دعم الدورة"
+msgstr ""
-#: ../../templates/show_test_table.inc.php:83
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:99
msgid ""
"This tests whether you have the iconv extension enabled. This extension is "
"required by Ampache."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:87
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:103
msgid "PHP JSON extension"
-msgstr "PHP PCRE الدعم"
+msgstr ""
-#: ../../templates/show_test_table.inc.php:92
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:108
msgid ""
"This tests whether you have the JSON extension enabled. This extension is "
"required by Ampache."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:96
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:112
msgid "PHP curl extension"
-msgstr "PHP دعم الدورة"
-
-#: ../../templates/show_test_table.inc.php:101
-#, fuzzy
-msgid ""
-"This tests whether you have the curl extension enabled. This is not strictly "
-"necessary, but may result in a better experience."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:105
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:117
+msgid ""
+"This tests whether you have the curl extension enabled. This is not strictly"
+" necessary, but may result in a better experience."
+msgstr ""
+
+#: ../../templates/show_test_table.inc.php:121
msgid "PHP zlib extension"
-msgstr "PHP دعم الدورة"
-
-#: ../../templates/show_test_table.inc.php:110
-#, fuzzy
-msgid ""
-"This tests whether you have the zlib extension enabled. This is not strictly "
-"necessary, but may result in a better experience (zip download)."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:114
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:126
+msgid ""
+"This tests whether you have the zlib extension enabled. This is not strictly"
+" necessary, but may result in a better experience (zip download)."
+msgstr ""
+
+#: ../../templates/show_test_table.inc.php:130
msgid "PHP simplexml extension"
-msgstr "PHP دعم الدورة"
+msgstr ""
-#: ../../templates/show_test_table.inc.php:119
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:135
msgid ""
"This tests whether you have the simplexml extension enabled. This is not "
"strictly necessary, but may result in a better experience."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:123
+#: ../../templates/show_test_table.inc.php:139
msgid "PHP safe mode disabled"
msgstr ""
-#: ../../templates/show_test_table.inc.php:128
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:144
msgid ""
"This test makes sure that PHP is not running in safe mode. Some features of "
"Ampache will not work correctly in safe mode."
msgstr ""
-"هذا الاختبار PHP بالتأكد من أنه لا تشارك ÙÙŠ SafeMode وأننا قادرون على تغيير "
-"Øدود الذاكرة. بينما ليس من المطلوب ØŒ من دون قدرة بعض هذه السمات ampache قد "
-"لا تعمل بشكل صØÙŠØ"
-#: ../../templates/show_test_table.inc.php:132
+#: ../../templates/show_test_table.inc.php:148
msgid "PHP memory limit override"
msgstr ""
-#: ../../templates/show_test_table.inc.php:137
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:153
msgid ""
"This tests whether Ampache can override the memory limit. This is not "
"strictly necessary, but may result in a better experience."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:141
+#: ../../templates/show_test_table.inc.php:157
msgid "PHP execution time override"
msgstr ""
-#: ../../templates/show_test_table.inc.php:146
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:162
msgid ""
-"This tests whether Ampache can override the limit on maximum execution time. "
-"This is not strictly necessary, but may result in a better experience."
+"This tests whether Ampache can override the limit on maximum execution time."
+" This is not strictly necessary, but may result in a better experience."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:150
+#: ../../templates/show_test_table.inc.php:166
msgid "PHP max upload size"
msgstr ""
-#: ../../templates/show_test_table.inc.php:155
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:171
msgid ""
"This tests whether Ampache can upload medium files (>= 20M). This is not "
"strictly necessary, but may result in a better experience."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:159
+#: ../../templates/show_test_table.inc.php:175
msgid "PHP Integer Size"
msgstr ""
-#: ../../templates/show_test_table.inc.php:164
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:180
msgid ""
"This tests whether Ampache can manage large files (> 2GB). This is not "
"strictly necessary, but may result in a better experience. This generally "
"requires 64-bit operating system."
msgstr ""
-"هذا الÙØص اختبار لمعرÙØ© إذا كان لديك ماي تمديدات تØميلها Ù„PHP. ويلزم لهذه "
-"Ampache للعمل."
-#: ../../templates/show_test_table.inc.php:171
+#: ../../templates/show_test_table.inc.php:184
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: ../../templates/show_test_table.inc.php:189
+#, php-format
+msgid ""
+"This tests whether PHP %s is set as it may break the ID3 tag support. This "
+"is not stricly necessary, but enabling Ampache ID3 tag write support "
+"(disabled by default) along with mbstring.func_overload may result in "
+"irreversible corruption of your music files."
+msgstr ""
+
+#: ../../templates/show_test_table.inc.php:196
msgid "Configuration file readability"
msgstr ""
-#: ../../templates/show_test_table.inc.php:176
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:203
msgid ""
"This test attempts to read config/ampache.cfg.php. If this fails the file "
"either is not in the correct location or is not currently readable."
msgstr ""
-"هذه Ù…Øاولة لقراءة وإذا Ùشلت هذه /config/ampache.cfg.php إما ampache.cfg.php "
-"ليس ÙÙŠ المواقع الصØÙŠØØ© \n"
-"\t أو أنها ليست ÙÙŠ الوقت الراهن يمكن قراءتها من خلال خدمة الويب الخاص بك."
-#: ../../templates/show_test_table.inc.php:181
+#: ../../templates/show_test_table.inc.php:209
msgid "Configuration file validity"
msgstr ""
-#: ../../templates/show_test_table.inc.php:191
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:220
msgid ""
"This test makes sure that you have set all of the required configuration "
"variables and that we are able to completely parse your config file."
msgstr ""
-"هذا الاختبار التأكد من أن لديك كل مجموعة من المتغيرات والتهيئة المطلوبة أننا "
-"قادرون تماما على تØليل مل٠الخاص بك"
-#: ../../templates/show_test_table.inc.php:200
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:232
msgid ""
"This attempts to connect to your database using the values read from your "
"configuration file."
-msgstr "هذه Ù…Øاولة لربط لقاعدة البيانات باستخدام قيم من Øسابك ampache.cfg.php"
+msgstr ""
-#: ../../templates/show_test_table.inc.php:204
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:237
msgid "Database tables"
-msgstr "اسم قاعدة البيانات المطلوبة"
+msgstr ""
-#: ../../templates/show_test_table.inc.php:209
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:244
msgid ""
"This checks a few key tables to make sure that you have successfully "
"inserted the Ampache database and that the user has access to the database"
msgstr ""
-"هذا الÙØص بضع الجداول الرئيسية للتأكد من ان كنت قد نجØت ÙÙŠ إدراج قاعدة "
-"بيانات ampache وأن المستخدم الوصول إلى قاعدة البيانات"
-#: ../../templates/show_test_table.inc.php:214
-#, fuzzy
+#: ../../templates/show_test_table.inc.php:250
msgid "Web path"
-msgstr "الشبكة الدرب"
+msgstr ""
-#: ../../templates/show_test_table.inc.php:226
+#: ../../templates/show_test_table.inc.php:263
msgid ""
"This test makes sure that your web_path variable is set correctly and that "
"we are able to get to the index page. If you do not see a check mark here "
"then your web_path is not set correctly."
-msgstr ""
-"هذا الاختبار تأكد بأن ما تتمتعون به web_path متغير هو صØÙŠØ ØŒ وأننا قادرون "
-"على الوصول إلى صÙØØ© Ùهرس. إذا كنت لا ترى علامة اختيار الخاص بك هنا ثم "
-"web_path ليس صØÙŠØ."
+msgstr "هذا الاختبار تأكد بأن ما تتمتعون به web_path متغير هو صØÙŠØ ØŒ وأننا قادرون على الوصول إلى صÙØØ© Ùهرس. إذا كنت لا ترى علامة اختيار الخاص بك هنا ثم web_path ليس صØÙŠØ."
-#: ../../templates/show_tvshow.inc.php:72
-#: ../../templates/show_tvshow.inc.php:75
-#: ../../templates/show_tvshow_row.inc.php:55
-#, fuzzy
+#: ../../templates/show_tvshow.inc.php:95
+#: ../../templates/show_tvshow.inc.php:99
+#: ../../templates/show_tvshow_row.inc.php:72
msgid "TV Show edit"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../templates/show_tvshow.inc.php:76
+#: ../../templates/show_tvshow.inc.php:100
msgid "Edit TV Show"
msgstr ""
-#: ../../templates/show_tvshow_season.inc.php:67
-#: ../../templates/show_tvshow_season.inc.php:70
-#: ../../templates/show_tvshow_season_row.inc.php:54
-#, fuzzy
+#: ../../templates/show_tvshow_season.inc.php:87
+#: ../../templates/show_tvshow_season.inc.php:91
+#: ../../templates/show_tvshow_season_row.inc.php:73
msgid "Season edit"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../templates/show_tvshow_season.inc.php:71
+#: ../../templates/show_tvshow_season.inc.php:92
msgid "Edit Season"
msgstr ""
-#: ../../templates/show_tvshow_seasons.inc.php:63
-#, fuzzy
+#: ../../templates/show_tvshow_seasons.inc.php:92
msgid "No season found"
-msgstr "لا توجد سجلات"
+msgstr ""
-#: ../../templates/show_tvshows.inc.php:68
-#, fuzzy
+#: ../../templates/show_tvshows.inc.php:97
msgid "No tv show found"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_update_items.inc.php:23
-#, fuzzy
msgid "Starting Update from Tags"
-msgstr "إعدادات %s"
+msgstr ""
#: ../../templates/show_update_items.inc.php:27
msgid "Update from Tags Complete"
msgstr ""
#: ../../templates/show_uploads.inc.php:23
-#: ../../templates/sidebar_home.inc.php:121
+#: ../../templates/sidebar_home.inc.php:206
msgid "Uploads"
msgstr ""
-#: ../../templates/show_user_activate.inc.php:41
-#, fuzzy
+#: ../../templates/show_user_activate.inc.php:38
msgid "Registration Validation"
-msgstr "تاريخ التسجيل"
+msgstr ""
-#: ../../templates/show_user_activate.inc.php:51
-#, fuzzy
+#: ../../templates/show_user_activate.inc.php:48
msgid "User Activated"
-msgstr "تÙعيل"
+msgstr ""
#. HINT: Start A tag, End A tag
-#: ../../templates/show_user_activate.inc.php:55
+#: ../../templates/show_user_activate.inc.php:53
#, php-format
msgid "This User ID is activated and can be used %sLogin%s"
msgstr ""
-#: ../../templates/show_user_activate.inc.php:58
+#: ../../templates/show_user_activate.inc.php:59
msgid "Validation Failed"
msgstr ""
-#: ../../templates/show_user_activate.inc.php:59
+#: ../../templates/show_user_activate.inc.php:61
msgid "The validation key used isn't correct"
msgstr ""
#: ../../templates/show_userflag.inc.php:23
-#, fuzzy
msgid "User Favorites"
-msgstr "مستخدم للعقارات"
+msgstr ""
-#: ../../templates/show_user.inc.php:60
-#: ../../templates/show_user_row.inc.php:50
+#: ../../templates/show_user.inc.php:58
+msgid "Display Name"
+msgstr ""
+
+#: ../../templates/show_user.inc.php:66
+#: ../../templates/show_user_row.inc.php:73
msgid "Send private message"
msgstr ""
-#: ../../templates/show_user.inc.php:71
+#: ../../templates/show_user.inc.php:91
msgid "Member Since"
msgstr ""
-#: ../../templates/show_user.inc.php:74 ../../templates/show_users.inc.php:44
-#: ../../templates/show_users.inc.php:75
+#: ../../templates/show_user.inc.php:94 ../../templates/show_users.inc.php:51
+#: ../../templates/show_users.inc.php:96
msgid "Last Seen"
msgstr "شوهد للمرة الاخيرة"
-#: ../../templates/show_user.inc.php:78 ../../templates/show_users.inc.php:47
-#: ../../templates/show_users.inc.php:78
+#: ../../templates/show_user.inc.php:100 ../../templates/show_users.inc.php:55
+#: ../../templates/show_users.inc.php:100
msgid "Activity"
msgstr "النشاط"
-#: ../../templates/show_user.inc.php:87
-#, fuzzy
+#: ../../templates/show_user.inc.php:119
msgid "Status"
-msgstr "اØصاءات"
+msgstr ""
-#: ../../templates/show_user.inc.php:90
+#: ../../templates/show_user.inc.php:123
msgid "User is Online Now"
msgstr "مستخدم على الشبكة الآن"
-#: ../../templates/show_user.inc.php:92
+#: ../../templates/show_user.inc.php:128
msgid "User is Offline Now"
msgstr "والآن ، دون اتصال المستخدم"
-#: ../../templates/show_user.inc.php:107 ../../templates/show_users.inc.php:53
-#: ../../templates/show_users.inc.php:84
+#: ../../templates/show_user.inc.php:149 ../../templates/show_users.inc.php:68
+#: ../../templates/show_users.inc.php:113
msgid "Following"
msgstr ""
-#: ../../templates/show_user.inc.php:108
+#: ../../templates/show_user.inc.php:151
msgid "Followers"
msgstr ""
-#: ../../templates/show_user.inc.php:118
-#, fuzzy
-msgid "Active Playlist"
-msgstr "قاعدة التشغيل"
+#: ../../templates/show_user.inc.php:153
+msgid "Timeline"
+msgstr ""
-#: ../../templates/show_user_registration.inc.php:67
+#: ../../templates/show_user.inc.php:165
+msgid "Active Playlist"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:66
msgid "User Agreement"
msgstr ""
-#: ../../templates/show_user_registration.inc.php:74
+#: ../../templates/show_user_registration.inc.php:75
msgid "I Accept"
msgstr ""
-#: ../../templates/show_user_registration.inc.php:79
-#, fuzzy
+#: ../../templates/show_user_registration.inc.php:83
msgid "User Information"
-msgstr "معلومات"
+msgstr ""
-#: ../../templates/show_user_registration.inc.php:134
-#, fuzzy
+#: ../../templates/show_user_registration.inc.php:170
msgid "* Required fields"
-msgstr "المتطلبات"
+msgstr ""
-#: ../../templates/show_user_registration.inc.php:146
-#, fuzzy
+#: ../../templates/show_user_registration.inc.php:182
msgid "Register User"
-msgstr "تاريخ التسجيل"
+msgstr ""
-#: ../../templates/show_users.inc.php:43 ../../templates/show_users.inc.php:74
+#: ../../templates/show_users.inc.php:50 ../../templates/show_users.inc.php:95
msgid "Fullname"
msgstr "الاسم الكامل"
-#: ../../templates/show_users.inc.php:45 ../../templates/show_users.inc.php:76
+#: ../../templates/show_users.inc.php:52 ../../templates/show_users.inc.php:97
msgid "Registration Date"
msgstr "تاريخ التسجيل"
-#: ../../templates/show_users.inc.php:49 ../../templates/show_users.inc.php:80
+#: ../../templates/show_users.inc.php:59
+#: ../../templates/show_users.inc.php:104
msgid "Last Ip"
msgstr "آخر للملكية الÙكرية"
-#: ../../templates/show_users.inc.php:56 ../../templates/show_users.inc.php:87
+#: ../../templates/show_users.inc.php:73
+#: ../../templates/show_users.inc.php:118
msgid "On-line"
msgstr "على الخط"
#: ../../templates/show_verify_catalog.inc.php:23
-#, fuzzy
msgid "Verify Catalog"
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
#. HINT: Catalog Name
#: ../../templates/show_verify_catalog.inc.php:25
@@ -8193,70 +7705,69 @@ msgstr ""
msgid "Verified"
msgstr ""
-#: ../../templates/show_video.inc.php:38
-#, fuzzy
+#: ../../templates/show_video.inc.php:39
msgid "Subtitle"
-msgstr "العنوان"
+msgstr ""
-#: ../../templates/show_video.inc.php:117
-#: ../../templates/show_videos.inc.php:41
-#: ../../templates/show_videos.inc.php:93
+#: ../../templates/show_video.inc.php:187
+#: ../../templates/show_videos.inc.php:46
+#: ../../templates/show_videos.inc.php:122
msgid "Resolution"
msgstr ""
-#: ../../templates/show_video.inc.php:118
+#: ../../templates/show_video.inc.php:188
msgid "Display"
msgstr ""
-#: ../../templates/show_video.inc.php:119
+#: ../../templates/show_video.inc.php:189
msgid "Audio Bitrate"
msgstr ""
-#: ../../templates/show_video.inc.php:120
-#, fuzzy
+#: ../../templates/show_video.inc.php:190
msgid "Video Bitrate"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../templates/show_video.inc.php:121
-#, fuzzy
+#: ../../templates/show_video.inc.php:191
msgid "Frame Rate"
-msgstr "المل٠نمط"
+msgstr ""
-#: ../../templates/show_video_row.inc.php:80
-#, fuzzy
+#: ../../templates/show_video_row.inc.php:92
msgid "Video Information"
-msgstr "أغنية المعلومات"
+msgstr ""
-#: ../../templates/show_video_row.inc.php:93
-#, fuzzy
+#: ../../templates/show_video_row.inc.php:115
msgid "Video edit"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../templates/show_videos.inc.php:75
-#, fuzzy
+#: ../../templates/show_videos.inc.php:99
msgid "No video found"
-msgstr "لا توجد سجلات"
+msgstr ""
#: ../../templates/show_wanted.inc.php:23
-#: ../../templates/sidebar_home.inc.php:115
-#, fuzzy
+#: ../../templates/sidebar_home.inc.php:190
msgid "Wanted List"
-msgstr "Ù…Øطات إذاعية"
+msgstr ""
#: ../../templates/sidebar_admin.inc.php:24
#: ../../templates/sidebar_admin.inc.php:31
#: ../../templates/sidebar_admin.inc.php:37
#: ../../templates/sidebar_admin.inc.php:45
-#: ../../templates/sidebar_admin.inc.php:59
+#: ../../templates/sidebar_admin.inc.php:72
+#: ../../templates/sidebar_admin.inc.php:73
#: ../../templates/sidebar_home.inc.php:24
-#: ../../templates/sidebar_home.inc.php:56
-#: ../../templates/sidebar_home.inc.php:70
-#: ../../templates/sidebar_home.inc.php:92
-#: ../../templates/sidebar_home.inc.php:102
-#: ../../templates/sidebar_home.inc.php:130
-#: ../../templates/sidebar_localplay.inc.php:38
-#: ../../templates/sidebar_localplay.inc.php:48
-#: ../../templates/sidebar_localplay.inc.php:66
+#: ../../templates/sidebar_home.inc.php:80
+#: ../../templates/sidebar_home.inc.php:81
+#: ../../templates/sidebar_home.inc.php:112
+#: ../../templates/sidebar_home.inc.php:113
+#: ../../templates/sidebar_home.inc.php:154
+#: ../../templates/sidebar_home.inc.php:164
+#: ../../templates/sidebar_home.inc.php:224
+#: ../../templates/sidebar_localplay.inc.php:43
+#: ../../templates/sidebar_localplay.inc.php:44
+#: ../../templates/sidebar_localplay.inc.php:70
+#: ../../templates/sidebar_localplay.inc.php:71
+#: ../../templates/sidebar_localplay.inc.php:103
+#: ../../templates/sidebar_localplay.inc.php:104
#: ../../templates/sidebar_modules.inc.php:24
#: ../../templates/sidebar_modules.inc.php:31
#: ../../templates/sidebar_preferences.inc.php:30
@@ -8268,14 +7779,12 @@ msgid "User Tools"
msgstr ""
#: ../../templates/sidebar_admin.inc.php:34
-#, fuzzy
msgid "Browse Users"
-msgstr "تصÙØ"
+msgstr ""
#: ../../templates/sidebar_admin.inc.php:39
-#, fuzzy
msgid "Add ACL"
-msgstr "إضاÙØ© الكل"
+msgstr ""
#: ../../templates/sidebar_admin.inc.php:40
msgid "Show ACL(s)"
@@ -8283,113 +7792,108 @@ msgstr ""
#: ../../templates/sidebar_admin.inc.php:45
#: ../../templates/sidebar_modules.inc.php:31
-#, fuzzy
msgid "Other Tools"
-msgstr "خيارات أخرى"
+msgstr ""
#: ../../templates/sidebar_admin.inc.php:48
-#, fuzzy
msgid "Clear Now Playing"
-msgstr "خلق التشغيل الجديدة"
+msgstr ""
-#: ../../templates/sidebar_admin.inc.php:51
+#: ../../templates/sidebar_admin.inc.php:53
msgid "Manage Shoutbox"
msgstr ""
-#: ../../templates/sidebar_admin.inc.php:54
-#, fuzzy
+#: ../../templates/sidebar_admin.inc.php:60
msgid "Manage Licenses"
-msgstr "التهيئة مسبقا"
+msgstr ""
-#: ../../templates/sidebar_admin.inc.php:59
-#, fuzzy
+#: ../../templates/sidebar_admin.inc.php:68
+#: ../../templates/sidebar_admin.inc.php:69
msgid "Server Config"
-msgstr "شيك التهيئة"
+msgstr ""
#: ../../templates/sidebar_home.inc.php:32
msgid "Song Titles"
msgstr "الاغنية العنوان"
-#: ../../templates/sidebar_home.inc.php:56
-#, fuzzy
+#: ../../templates/sidebar_home.inc.php:77
msgid "Browse Video"
-msgstr "تصÙØ"
+msgstr ""
-#: ../../templates/sidebar_home.inc.php:58
+#: ../../templates/sidebar_home.inc.php:85
msgid "Music Clips"
msgstr ""
-#: ../../templates/sidebar_home.inc.php:73
+#: ../../templates/sidebar_home.inc.php:119
msgid "Currently Playing"
msgstr "اللعب ÙÙŠ الوقت الØاضر"
-#: ../../templates/sidebar_home.inc.php:87
+#: ../../templates/sidebar_home.inc.php:147
msgid "Import"
msgstr "الواردات"
-#: ../../templates/sidebar_home.inc.php:98
+#: ../../templates/sidebar_home.inc.php:160
msgid "Advanced"
msgstr "المتقدمة"
-#: ../../templates/sidebar_home.inc.php:104
+#: ../../templates/sidebar_home.inc.php:166
msgid "Recent"
msgstr ""
-#: ../../templates/sidebar_home.inc.php:105
+#: ../../templates/sidebar_home.inc.php:167
msgid "Newest"
msgstr "Ø£Øدث"
-#: ../../templates/sidebar_home.inc.php:106
+#: ../../templates/sidebar_home.inc.php:168
msgid "Popular"
msgstr "الشعبية"
-#: ../../templates/sidebar_home.inc.php:109
-#, fuzzy
+#: ../../templates/sidebar_home.inc.php:174
msgid "Top Rated"
-msgstr "صنÙ"
+msgstr ""
#: ../../templates/sidebar.inc.php:38
#: ../../templates/sidebar_modules.inc.php:24
msgid "Modules"
msgstr "ÙˆØدات"
-#: ../../templates/sidebar.inc.php:68
+#: ../../templates/sidebar.inc.php:72
msgid "Logout"
msgstr ""
-#: ../../templates/sidebar_localplay.inc.php:42
+#: ../../templates/sidebar_localplay.inc.php:53
msgid "Show instances"
msgstr "وتظهر الØالات"
-#: ../../templates/sidebar_localplay.inc.php:44
+#: ../../templates/sidebar_localplay.inc.php:59
msgid "Show Playlist"
msgstr "وتظهر قائمة التشغيل"
-#: ../../templates/sidebar_localplay.inc.php:48
+#: ../../templates/sidebar_localplay.inc.php:66
+#: ../../templates/sidebar_localplay.inc.php:67
msgid "Active Instance"
msgstr "درجة نشطة"
-#: ../../templates/sidebar_localplay.inc.php:66
+#: ../../templates/sidebar_localplay.inc.php:99
+#: ../../templates/sidebar_localplay.inc.php:100
msgid "Localplay Disabled"
msgstr "المØلية تلعب المعاقين"
-#: ../../templates/sidebar_localplay.inc.php:68
+#: ../../templates/sidebar_localplay.inc.php:108
msgid "Allow Localplay set to False"
msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù…Ø¬Ù…ÙˆØ¹Ø© لعب المØلية الزور"
-#: ../../templates/sidebar_localplay.inc.php:70
+#: ../../templates/sidebar_localplay.inc.php:113
msgid "Localplay Controller Not Defined"
msgstr "المراقب المالي المØلي اللعب غير Ù…Øدد"
#: ../../templates/sidebar_modules.inc.php:26
-#, fuzzy
msgid "Localplay Modules"
-msgstr "لعب المØلية"
+msgstr ""
#: ../../templates/sidebar_modules.inc.php:27
-#, fuzzy
msgid "Catalog Modules"
-msgstr "المدير التسويقي"
+msgstr ""
#: ../../templates/sidebar_modules.inc.php:28
msgid "Available Plugins"
@@ -8399,60 +7903,52 @@ msgstr ""
msgid "Mail Users"
msgstr ""
-#: ../../templates/sidebar_modules.inc.php:41
-#, fuzzy
+#: ../../templates/sidebar_modules.inc.php:44
msgid "Manage Playlist"
-msgstr "قاعدة التشغيل"
+msgstr ""
-#: ../../templates/sidebar_preferences.inc.php:39
-#, fuzzy
+#: ../../templates/sidebar_preferences.inc.php:46
msgid "Account"
-msgstr "إنشاء Øساب"
+msgstr ""
-#: ../../tvshow_seasons.php:36 ../../tvshow_seasons.php:54
-#: ../../tvshow_seasons.php:56
-#, fuzzy
+#: ../../tvshow_seasons.php:38 ../../tvshow_seasons.php:58
+#: ../../tvshow_seasons.php:60
msgid "TVShow Season Deletion"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../tvshow_seasons.php:37
+#: ../../tvshow_seasons.php:39
msgid "Are you sure you want to permanently delete this tvshow season?"
msgstr ""
-#: ../../tvshow_seasons.php:54
-#, fuzzy
+#: ../../tvshow_seasons.php:58
msgid "TVShow Season has been deleted."
-msgstr "ØØ°Ù"
+msgstr ""
-#: ../../tvshow_seasons.php:56
-#, fuzzy
+#: ../../tvshow_seasons.php:60
msgid "Cannot delete this tvshow season."
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
-#: ../../tvshows.php:36 ../../tvshows.php:54 ../../tvshows.php:56
-#, fuzzy
+#: ../../tvshows.php:38 ../../tvshows.php:58 ../../tvshows.php:60
msgid "TVShow Deletion"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../tvshows.php:37
+#: ../../tvshows.php:39
msgid "Are you sure you want to permanently delete this tvshow?"
msgstr ""
-#: ../../tvshows.php:54
-#, fuzzy
+#: ../../tvshows.php:58
msgid "TVShow has been deleted."
-msgstr "ØØ°Ù"
+msgstr ""
-#: ../../tvshows.php:56
-#, fuzzy
+#: ../../tvshows.php:60
msgid "Cannot delete this tvshow."
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
-#: ../../tvshows.php:73
+#: ../../tvshows.php:81
msgid "Show TV Shows starting with"
msgstr ""
-#: ../../update.php:80
+#: ../../update.php:81
#, php-format
msgid ""
"This page handles all database updates to Ampache starting with "
@@ -8460,433 +7956,392 @@ msgid ""
"database version %s."
msgstr ""
-#: ../../update.php:89
-#, fuzzy
+#: ../../update.php:92
msgid "Update Now!"
-msgstr "تØديث المستخدم"
+msgstr ""
#: ../../upnp/control-reply.php:46
msgid "root"
msgstr ""
-#: ../../video.php:33 ../../video.php:51 ../../video.php:53
-#, fuzzy
+#: ../../video.php:35 ../../video.php:55 ../../video.php:57
msgid "Video Deletion"
-msgstr "عنوان الأغنية"
+msgstr ""
-#: ../../video.php:34
+#: ../../video.php:36
msgid "Are you sure you want to permanently delete this video?"
msgstr ""
-#: ../../video.php:51
-#, fuzzy
+#: ../../video.php:55
msgid "Video has been deleted."
-msgstr "ØØ°Ù"
+msgstr ""
-#: ../../video.php:53
-#, fuzzy
+#: ../../video.php:57
msgid "Cannot delete this video."
-msgstr "Ø¥Øصائيات واضØØ©"
+msgstr ""
-#: Database words id 1
-#, fuzzy
+# This file lists all description strings from your Ampache-database ->
+# preference-table.
+# Please do not delete or modify the content by yourself. It will be
+# automatically (re)generated
+# if you run './gather-messages.sh [-gu|--getutds].
+# Last Update: 16.11.2015 01:36:06 CET
+#
+#: Database preference table id 1
msgid "Allow Downloads"
-msgstr "تنزيل"
+msgstr ""
-#: Database words id 4
+#: Database preference table id 4
msgid "Popular Threshold"
msgstr ""
-#: Database words id 19
+#: Database preference table id 19
msgid "Transcode Bitrate"
msgstr ""
-#: Database words id 22
+#: Database preference table id 22
msgid "Website Title"
msgstr ""
-#: Database words id 23
-#, fuzzy
+#: Database preference table id 23
msgid "Lock Songs"
-msgstr "# أغاني"
+msgstr ""
-#: Database words id 24
+#: Database preference table id 24
msgid "Forces Http play regardless of port"
msgstr ""
-#: Database words id 25
-msgid "Non-Standard Http Port"
-msgstr ""
-
-#: Database words id 29
+#: Database preference table id 29
msgid "Type of Playback"
msgstr ""
-#: Database words id 31
+#: Database preference table id 31
msgid "Language"
msgstr ""
-#: Database words id 32
-#, fuzzy
+#: Database preference table id 32
msgid "Playlist Type"
-msgstr "الاسم التشغيل"
+msgstr ""
-#: Database words id 33
+#: Database preference table id 33
msgid "Theme"
msgstr ""
-#: Database words id 40
-#, fuzzy
+#: Database preference table id 40
msgid "Localplay Access"
-msgstr "لعب المØلية"
+msgstr ""
-#: Database words id 41
-#, fuzzy
+#: Database preference table id 41
msgid "Localplay Type"
-msgstr "لعب المØلية"
+msgstr ""
-#: Database words id 44
-#, fuzzy
+#: Database preference table id 44
msgid "Allow Streaming"
-msgstr "يتدÙÙ‚"
+msgstr ""
-#: Database words id 45
-#, fuzzy
+#: Database preference table id 45
msgid "Allow Democratic Play"
-msgstr "إدارة التشغيل الديمقراطية"
+msgstr ""
-#: Database words id 46
-#, fuzzy
+#: Database preference table id 46
msgid "Allow Localplay Play"
-msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù…Ø¬Ù…ÙˆØ¹Ø© لعب المØلية الزور"
+msgstr ""
-#: Database words id 47
-#, fuzzy
+#: Database preference table id 47
msgid "Statistics Day Threshold"
-msgstr "اØصاءات"
+msgstr ""
-#: Database words id 51
+#: Database preference table id 51
msgid "Offset Limit"
msgstr ""
-#: Database words id 52
+#: Database preference table id 52
msgid "Rate Limit"
msgstr ""
-#: Database words id 53
-#, fuzzy
+#: Database preference table id 53
msgid "Playlist Method"
-msgstr "نوع التشغيل"
+msgstr ""
-#: Database words id 55 69 72
-#, fuzzy
+# is already in the source code
+# but to avoid confusion, it's added and commented
+# msgid "Transcoding"
+# msgstr ""
+# is already in the source code
+# but to avoid confusion, it's added and commented
+# msgid "Show Lyrics"
+# msgstr ""
+#: Database preference table id 55 Database preference table id 69 Database
+#: preference table id 72
msgid "Shoutcast Active Instance"
-msgstr "درجة نشطة"
+msgstr ""
-#: Database words id 82
+#: Database preference table id 73
+msgid "Last.FM Username"
+msgstr ""
+
+#: Database preference table id 74
+msgid "Last.FM Password"
+msgstr ""
+
+#: Database preference table id 75
+msgid "Last.FM Submit Port"
+msgstr ""
+
+#: Database preference table id 76
+msgid "Last.FM Submit Host"
+msgstr ""
+
+#: Database preference table id 77
+msgid "Last.FM Submit URL"
+msgstr ""
+
+#: Database preference table id 78
+msgid "Last.FM Submit Challenge"
+msgstr ""
+
+#: Database preference table id 82
msgid "Now playing filtered per user"
msgstr ""
-#: Database words id 83
+#: Database preference table id 83
msgid "Album Default Sort"
msgstr ""
-#: Database words id 84
-#, fuzzy
+#: Database preference table id 84
msgid "Show # played"
-msgstr "تشغيل"
+msgstr ""
-#: Database words id 85
+#: Database preference table id 85
msgid "Show current song in Web player page title"
msgstr ""
-#: Database words id 86
+#: Database preference table id 86
msgid "Use SubSonic backend"
msgstr ""
-#: Database words id 87
+#: Database preference table id 87
msgid "Use Plex backend"
msgstr ""
-#: Database words id 88
+#: Database preference table id 88
msgid "Authorize Flash Web Player(s)"
msgstr ""
-#: Database words id 89
+#: Database preference table id 89
msgid "Authorize HTML5 Web Player(s)"
msgstr ""
-#: Database words id 90
+#: Database preference table id 90
msgid "Personal information visibility - Now playing"
msgstr ""
-#: Database words id 91
+#: Database preference table id 91
msgid "Personal information visibility - Recently played"
msgstr ""
-#: Database words id 92
+#: Database preference table id 92
msgid ""
"Personal information visibility - Recently played - Allow to show streaming "
"date/time"
msgstr ""
-#: Database words id 93
+#: Database preference table id 93
msgid ""
"Personal information visibility - Recently played - Allow to show streaming "
"agent"
msgstr ""
-#: Database words id 94
-msgid "Fix header/sidebars position on compatible themes"
+#: Database preference table id 94
+msgid "Fix header position on compatible themes"
msgstr ""
-#: Database words id 95
+#: Database preference table id 95
msgid "Check for Ampache updates automatically"
msgstr ""
-#: Database words id 96
+#: Database preference table id 96
msgid "AutoUpdate last check time"
msgstr ""
-#: Database words id 97
+#: Database preference table id 97
msgid "AutoUpdate last version from last check"
msgstr ""
-#: Database words id 98
+#: Database preference table id 98
msgid "AutoUpdate last version from last check is newer"
msgstr ""
-#: Database words id 99
+#: Database preference table id 99
msgid "Confirmation when closing current playing window"
msgstr ""
-#: Database words id 100
+#: Database preference table id 100
msgid "Auto-pause betweens tabs"
msgstr ""
-#: Database words id 101
+#: Database preference table id 101
msgid "Use beautiful stream url"
msgstr ""
-#: Database words id 102
-#, fuzzy
+#: Database preference table id 102
msgid "Allow Share"
-msgstr "يتدÙÙ‚"
+msgstr ""
-#: Database words id 103
+#: Database preference table id 103
msgid "Share links default expiration days (0=never)"
msgstr ""
-#: Database words id 104
+#: Database preference table id 104
msgid "Artist slideshow inactivity time"
msgstr ""
-#: Database words id 105
+#: Database preference table id 105
msgid "Broadcast web player by default"
msgstr ""
-#: Database words id 106
+#: Database preference table id 106
msgid "Limit number of future events"
msgstr ""
-#: Database words id 107
+#: Database preference table id 107
msgid "Limit number of past events"
msgstr ""
-#: Database words id 108
+#: Database preference table id 108
msgid "Album - Group multiple disks"
msgstr ""
-#: Database words id 109
+#: Database preference table id 109
msgid "Top menu"
msgstr ""
-#: Database words id 110
-msgid "Flickr api key"
-msgstr ""
-
-#: Database words id 111
+#: Database preference table id 110
msgid "Clear democratic votes of expired user sessions"
msgstr ""
-#: Database words id 112
+#: Database preference table id 111
msgid "Show donate button in footer"
msgstr ""
-#: Database words id 113
+#: Database preference table id 112
msgid "Uploads catalog destination"
msgstr ""
-#: Database words id 114
+#: Database preference table id 113
msgid "Allow users to upload media"
msgstr ""
-#: Database words id 115
+#: Database preference table id 114
msgid "Upload: create a subdirectory per user (recommended)"
msgstr ""
-#: Database words id 116
+#: Database preference table id 115
msgid "Upload: consider the user sender as the track's artist"
msgstr ""
-#: Database words id 117
+#: Database preference table id 116
msgid ""
"Upload: run the following script after upload (current directory = upload "
"target directory)"
msgstr ""
-#: Database words id 118
+#: Database preference table id 117
msgid "Upload: allow users to edit uploaded songs"
msgstr ""
-#: Database words id 119
+#: Database preference table id 118
msgid "Use DAAP backend"
msgstr ""
-#: Database words id 120
+#: Database preference table id 119
msgid "DAAP backend password"
msgstr ""
-#: Database words id 121
+#: Database preference table id 120
msgid "Use UPnP backend"
msgstr ""
-#: Database words id 122
+#: Database preference table id 121
msgid "Allow video features"
msgstr ""
-#: Database words id 123
+#: Database preference table id 122
msgid "Album - Group per release type"
msgstr ""
-#: Database words id 124
+#: Database preference table id 123
msgid "Ajax page load"
msgstr ""
-#: Database words id 125
-msgid "Amazon base url"
-msgstr ""
-
-#: Database words id 126
-msgid "Amazon max results pages"
-msgstr ""
-
-#: Database words id 127
-msgid "Amazon Access Key ID"
-msgstr ""
-
-#: Database words id 128
-msgid "Amazon Secret Access Key"
-msgstr ""
-
-#: Database words id 129
-msgid "Amazon associate tag"
-msgstr ""
-
-#: Database words id 130
+#: Database preference table id 124
msgid "Limit direct play to maximum media count"
msgstr ""
-#: Database words id 131
+#: Database preference table id 125
msgid "Show Albums of the moment at home page"
msgstr ""
-#: Database words id 132
+#: Database preference table id 126
msgid "Show Videos of the moment at home page"
msgstr ""
-#: Database words id 133
+#: Database preference table id 127
msgid "Show Recently Played at home page"
msgstr ""
-#: Database words id 134
+#: Database preference table id 128
msgid "Show Now Playing at home page"
msgstr ""
-#: Database words id 135
+#: Database preference table id 129
msgid "Custom logo url"
msgstr ""
-#: Database words id 136
+#: Database preference table id 130
msgid "Album - Group per release type Sort"
msgstr ""
-#: Database words id 137
+#: Database preference table id 131
msgid "WebPlayer browser notifications"
msgstr ""
-#: Database words id 138
+#: Database preference table id 132
msgid "WebPlayer browser notifications timeout (seconds)"
msgstr ""
-#: Database words id 139
-#, fuzzy
+#: Database preference table id 133
msgid "Allow geolocation"
-msgstr "تنزيل"
+msgstr ""
-#: Database words id 140
+#: Database preference table id 134
msgid "Authorize JavaScript decoder (Aurora.js) in Web Player(s)"
msgstr ""
-#: Database words id 141
+#: Database preference table id 139
+msgid "Upload: allow users to remove uploaded songs"
+msgstr ""
+
+#: Database preference table id 140
+msgid "Custom login page logo url"
+msgstr ""
+
+#: Database preference table id 141
msgid "Custom favicon url"
msgstr ""
-#: Database words id 142
+#: Database preference table id 142
msgid "Custom text footer"
msgstr ""
-#: Database words id 143
+#: Database preference table id 143
msgid "Use WebDAV backend"
msgstr ""
-#, fuzzy
-#~ msgid "Manage Users"
-#~ msgstr "تØديث المستخدم"
+#: Database preference table id 144
+msgid "Receive notifications by email (shouts, private messages, ...)"
+msgstr ""
-#~ msgid "Create Date"
-#~ msgstr "خلق تاريخ"
-
-#, fuzzy
-#~ msgid "Catalog Clean sStarted..."
-#~ msgstr "نوع التسويقي"
-
-#, fuzzy
-#~ msgid "add a catalog"
-#~ msgstr "Ø¥Øصائيات واضØØ©"
-
-#, fuzzy
-#~ msgid "- Catalog Clean"
-#~ msgstr "نوع التسويقي"
-
-#, fuzzy
-#~ msgid "- Catalog Verify"
-#~ msgstr "تØقق من الماضي"
-
-#, fuzzy
-#~ msgid "- Catalog Add"
-#~ msgstr "نوع التسويقي"
-
-#, fuzzy
-#~ msgid "- Catalog Art Gather"
-#~ msgstr "نوع التسويقي"
-
-#, fuzzy
-#~ msgid "- Playlist Import"
-#~ msgstr "نوع التشغيل"
-
-#, fuzzy
-#~ msgid "- Starting Clean - "
-#~ msgstr "نوع التسويقي"
-
-#, fuzzy
-#~ msgid "- Starting Verify - "
-#~ msgstr "تØقق من الماضي"
-
-#, fuzzy
-#~ msgid "- Starting Add - "
-#~ msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
-
-#, fuzzy
-#~ msgid "Starting Media Art Search"
-#~ msgstr "بدءا من البØØ« ÙÙŠ الÙنون الألبوم"
+#: Database preference table id 145
+msgid "Theme color"
+msgstr ""
diff --git a/sources/locale/base/TRANSLATIONS b/sources/locale/base/TRANSLATIONS
deleted file mode 100644
index 84b2de3..0000000
--- a/sources/locale/base/TRANSLATIONS
+++ /dev/null
@@ -1,121 +0,0 @@
--------------------------------------------------------------------------------
---------- TRANSLATIONS - Ampache Translation Guide -----------
--------------------------------------------------------------------------------
-
-Contents:
-
- 1. Introduction
- a) Getting the Necessary tools
- b) Quick Reference
- 2. Creating a New Translation
- a) Translating
- b) Creating a MO file
- 3. Updating an Existing Translation
- a) Merging existing file
- b) Generating the MO file
- 4. Questions?
-
-Introduction:
-
- Ampache uses gettext to handle translating between different languages if
- you are interested in translating Ampache into a new language or updating
- an existing translations simply follow the directions provided below.
-
- A) Getting the Necessary Tools
-
- Before attempting to translate Ampache into a new language we recommend
- contacting us on IRC (chat.freenode.net #ampache) to make sure that nobody else is
- already working on a translation. Once you are ready to start your
- translation you will need to get a few tools
-
- - Gettext http://www.gnu.org/software/gettext/
- - xgettext (Generates PO files)
- - msgmerge (Merges old and new PO files)
- - msgfmt (Generates the MO file from a PO file)
-
- B) Quick Reference
-
- Below are listed all of the commands you may have to run when working on
- a translation
-
- # Gather All info
- ./gather-messages.sh --all
-
- # Create New po file
- LANG=YOURLANG ./gather-messages.sh --init
- Example: LANG=ja_JP.UTF-8 ./gather-messages.sh --init
- locale/ja_JP/LC_MESSAGES/messages.po will create.
-
- # Merge with existing po file
- ./gather-messages.sh --merge
-
- # Combine Old & New po files
- msgmerge old.po messages.po --output-file=new.po
-
- # Generate MO file for use by gettext
- ./gather-messages.sh --format
-
-Creating a New Translation:
-
- A) Translating
-
- We do our best to keep an up to date po file in /locale/base feel free to
- use this file rather than attempting to generate your own. If you would
- like to gather a new PO file simply run /locale/base/gather-messages.sh
- (Linux only)
-
- Once you have an up to date PO file you will need to figure out the
- country code for the language you are translating into. There are many
- lists on the web.
- http://www.gnu.org/software/gettext/manual/html_chapter/gettext_16.html
-
- Create the following directory structure and put your po file in the
- LC_MESSAGES directory
- /locale//LC_MESSAGES/
-
- Start Translating!
-
- C) Creating a MO File
-
- Once you have finished translating the PO file you need to convert it into
- a MO file in order for Gettext to be able to use it. Simply run the command
- listed below.
-
- msgfmt messages.po -o /messages.mo
-
- Unfortunately currently Ampache doesn't automatically detect new languages
- and thus you have to edit the code directly in order for it to pickup your
- new language. Find /lib/preferences.php and then find "case 'lang':" under
- the "create_preference_input" function and add a line for your own
- language. For example to add en_US support add the following line
-
- echo "\t\n";
-
- Make sure that it comes after the
" . $value . "
\n"; } @@ -371,4 +390,14 @@ END; return AmpConfig::get('web_path') . AmpConfig::get('theme_path') . '/images/ampache.png'; } } + + public static function is_grid_view($type) + { + $isgv = true; + $cn = 'browse_' . $type . '_grid_view'; + if (isset($_COOKIE[$cn])) { + $isgv = ($_COOKIE[$cn] == 'true'); + } + return $isgv; + } } diff --git a/sources/lib/class/update.class.php b/sources/lib/class/update.class.php index 688939a..e18355c 100644 --- a/sources/lib/class/update.class.php +++ b/sources/lib/class/update.class.php @@ -2,21 +2,21 @@ /* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * - * LICENSE: GNU General Public License, version 2 (GPLv2) + * LICENSE: GNU Affero General Public License, version 3 (AGPLv3) * Copyright 2001 - 2015 Ampache.org * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License v2 - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see
' . '- Made some minor changes to song table to reduce size of each row.
' . @@ -164,7 +163,7 @@ class Update $version[] = array('version' => '340006','description' => $update_string); $update_string = '- Altered the session table, making value a LONGTEXT.
'; - $version[] = array('version' => '340007','description' => $update_string); + $version[] = array('version' => '340007','description' => $update_string); $update_string = '- Modified Playlist_Data table to account for multiple object types.
' . '- Verified previous updates, adjusting as needed.
' . @@ -206,7 +205,7 @@ class Update $version[] = array('version' => '340016','description'=>$update_string); $update_string = '- Fix Tables for new Democratic Play methodology.
'; - $version[] = array('version' => '340017','description'=>$update_string); + $version[] = array('version' => '340017','description'=>$update_string); $update_string = '- Modify the Tag tables so that they actually work.
' . '- Alter the Prefix fields to allow for more prefixs.
'; @@ -227,10 +226,10 @@ class Update $version[] = array('version'=>'350004','description'=>$update_string); $update_string = "- Add table for Video files
"; - $version[] = array('version'=>'350005','description'=>$update_string); + $version[] = array('version'=>'350005','description'=>$update_string); $update_string = "- Add data for Lyrics
"; - $version[] = array('version'=>'350006','description'=>$update_string); + $version[] = array('version'=>'350006','description'=>$update_string); $update_string = '- Remove unused fields from catalog, playlist, playlist_data
' . '- Add tables for dynamic playlists
' . @@ -262,250 +261,283 @@ class Update $version[] = array('version'=>'360003','description'=>$update_string); $update_string = '- Add uniqueness constraint to ratings.
'; - $version[] = array('version' => '360004','description' => $update_string); + $version[] = array('version' => '360004','description' => $update_string); $update_string = '- Modify tmp_browse to allow caching of multiple browses per session.
'; - $version[] = array('version' => '360005','description' => $update_string); + $version[] = array('version' => '360005','description' => $update_string); $update_string = '- Add table for dynamic playlists.
'; - $version[] = array('version' => '360006','description' => $update_string); + $version[] = array('version' => '360006','description' => $update_string); $update_string = '- Verify remote_username and remote_password were added correctly to catalog table.
'; - $version[] = array('version' => '360008','description' => $update_string); + $version[] = array('version' => '360008','description' => $update_string); $update_string = '- Allow long sessionids in tmp_playlist table.
'; - $version[] = array('version' => '360009', 'description' => $update_string); + $version[] = array('version' => '360009', 'description' => $update_string); $update_string = '- Allow compound MBIDs in the artist table.
'; - $version[] = array('version' => '360010', 'description' => $update_string); + $version[] = array('version' => '360010', 'description' => $update_string); $update_string = '- Add table to store stream session playlist.
'; - $version[] = array('version' => '360011', 'description' => $update_string); + $version[] = array('version' => '360011', 'description' => $update_string); $update_string = '- Drop enum for the type field in session.
'; - $version[] = array('version' => '360012', 'description' => $update_string); + $version[] = array('version' => '360012', 'description' => $update_string); $update_string = '- Update stream_playlist table to address performance issues.
'; - $version[] = array('version' => '360013', 'description' => $update_string); + $version[] = array('version' => '360013', 'description' => $update_string); $update_string = '- Increase the length of sessionids again.
'; - $version[] = array('version' => '360014', 'description' => $update_string); + $version[] = array('version' => '360014', 'description' => $update_string); $update_string = '- Add iframes parameter to preferences.
'; - $version[] = array('version' => '360015', 'description' => $update_string); + $version[] = array('version' => '360015', 'description' => $update_string); $update_string = '- Optionally filter Now Playing to return only the last song per user.
'; - $version[] = array('version' => '360016', 'description' => $update_string); + $version[] = array('version' => '360016', 'description' => $update_string); $update_string = '- Add user flags on objects.
'; - $version[] = array('version' => '360017', 'description' => $update_string); + $version[] = array('version' => '360017', 'description' => $update_string); $update_string = '- Add album default sort value to preferences.
'; - $version[] = array('version' => '360018', 'description' => $update_string); + $version[] = array('version' => '360018', 'description' => $update_string); $update_string = '- Add option to show number of times a song was played.
'; - $version[] = array('version' => '360019', 'description' => $update_string); + $version[] = array('version' => '360019', 'description' => $update_string); $update_string = '- Catalog types are plugins now.
'; - $version[] = array('version' => '360020', 'description' => $update_string); + $version[] = array('version' => '360020', 'description' => $update_string); $update_string = '- Add insertion date on Now Playing and option to show the current song in page title for Web player.
'; - $version[] = array('version' => '360021', 'description' => $update_string); + $version[] = array('version' => '360021', 'description' => $update_string); $update_string = '- Remove unused live_stream fields and add codec field.
'; - $version[] = array('version' => '360022', 'description' => $update_string); + $version[] = array('version' => '360022', 'description' => $update_string); $update_string = '- Enable/Disable SubSonic and Plex backend.
'; - $version[] = array('version' => '360023', 'description' => $update_string); + $version[] = array('version' => '360023', 'description' => $update_string); $update_string = '- Drop flagged table.
'; - $version[] = array('version' => '360024', 'description' => $update_string); + $version[] = array('version' => '360024', 'description' => $update_string); $update_string = '- Add options to enable HTML5 / Flash on web players.
'; - $version[] = array('version' => '360025', 'description' => $update_string); + $version[] = array('version' => '360025', 'description' => $update_string); $update_string = '- Added agent to `object_count` table.
'; - $version[] = array('version' => '360026','description' => $update_string); + $version[] = array('version' => '360026','description' => $update_string); $update_string = '- Add option to allow/disallow to show personnal information to other users (now playing and recently played).
'; - $version[] = array('version' => '360027','description' => $update_string); + $version[] = array('version' => '360027','description' => $update_string); - $update_string = '- Personnal information: allow/disallow to show in now playing.
'. - '- Personnal information: allow/disallow to show in recently played.
'. + $update_string = '- Personnal information: allow/disallow to show in now playing.
' . + '- Personnal information: allow/disallow to show in recently played.
' . '- Personnal information: allow/disallow to show time and/or agent in recently played.
'; $version[] = array('version' => '360028','description' => $update_string); $update_string = '- Add new table to store wanted releases.
'; - $version[] = array('version' => '360029','description' => $update_string); + $version[] = array('version' => '360029','description' => $update_string); $update_string = '- New table to store song previews.
'; - $version[] = array('version' => '360030','description' => $update_string); + $version[] = array('version' => '360030','description' => $update_string); $update_string = '- Add option to fix header position on compatible themes.
'; - $version[] = array('version' => '360031','description' => $update_string); + $version[] = array('version' => '360031','description' => $update_string); $update_string = '- Add check update automatically option.
'; - $version[] = array('version' => '360032','description' => $update_string); + $version[] = array('version' => '360032','description' => $update_string); $update_string = '- Add song waveform as song data.
'; - $version[] = array('version' => '360033','description' => $update_string); + $version[] = array('version' => '360033','description' => $update_string); $update_string = '- Add settings for confirmation when closing window and auto-pause between tabs.
'; - $version[] = array('version' => '360034','description' => $update_string); + $version[] = array('version' => '360034','description' => $update_string); $update_string = '- Add beautiful stream url setting.
'; - $version[] = array('version' => '360035','description' => $update_string); + $version[] = array('version' => '360035','description' => $update_string); $update_string = '- Remove unused parameters.
'; - $version[] = array('version' => '360036','description' => $update_string); + $version[] = array('version' => '360036','description' => $update_string); $update_string = '- Add sharing features.
'; - $version[] = array('version' => '360037','description' => $update_string); + $version[] = array('version' => '360037','description' => $update_string); $update_string = '- Add missing albums browse on missing artists.
'; - $version[] = array('version' => '360038','description' => $update_string); + $version[] = array('version' => '360038','description' => $update_string); $update_string = '- Add website field on users.
'; - $version[] = array('version' => '360039','description' => $update_string); + $version[] = array('version' => '360039','description' => $update_string); $update_string = '- Add channels.
'; - $version[] = array('version' => '360041','description' => $update_string); + $version[] = array('version' => '360041','description' => $update_string); $update_string = '- Add broadcasts and player control.
'; - $version[] = array('version' => '360042','description' => $update_string); + $version[] = array('version' => '360042','description' => $update_string); $update_string = '- Add slideshow on currently played artist preference.
'; - $version[] = array('version' => '360043','description' => $update_string); + $version[] = array('version' => '360043','description' => $update_string); $update_string = '- Add artist description/recommendation external service data cache.
'; - $version[] = array('version' => '360044','description' => $update_string); + $version[] = array('version' => '360044','description' => $update_string); $update_string = '- Set user field on playlists as optional.
'; - $version[] = array('version' => '360045','description' => $update_string); + $version[] = array('version' => '360045','description' => $update_string); $update_string = '- Add broadcast web player by default preference.
'; - $version[] = array('version' => '360046','description' => $update_string); + $version[] = array('version' => '360046','description' => $update_string); $update_string = '- Add apikey field on users.
'; - $version[] = array('version' => '360047','description' => $update_string); + $version[] = array('version' => '360047','description' => $update_string); $update_string = '- Add concerts options.
'; - $version[] = array('version' => '360048','description' => $update_string); + $version[] = array('version' => '360048','description' => $update_string); $update_string = '- Add album group multiple disks setting.
'; - $version[] = array('version' => '360049','description' => $update_string); + $version[] = array('version' => '360049','description' => $update_string); $update_string = '- Add top menu setting.
'; - $version[] = array('version' => '360050','description' => $update_string); + $version[] = array('version' => '360050','description' => $update_string); $update_string = '- Copy default .htaccess configurations.
'; - $version[] = array('version' => '360051','description' => $update_string); + $version[] = array('version' => '360051','description' => $update_string); $update_string = '- Drop unused dynamic_playlist tables and add session id to votes.
'; - $version[] = array('version' => '370001','description' => $update_string); + $version[] = array('version' => '370001','description' => $update_string); $update_string = '- Add tag persistent merge reference.
'; - $version[] = array('version' => '370002','description' => $update_string); + $version[] = array('version' => '370002','description' => $update_string); $update_string = '- Add show/hide donate button preference.
'; - $version[] = array('version' => '370003','description' => $update_string); + $version[] = array('version' => '370003','description' => $update_string); $update_string = '- Add license information and user\'s artist association.
'; - $version[] = array('version' => '370004','description' => $update_string); + $version[] = array('version' => '370004','description' => $update_string); $update_string = '- Add new column album_artist into table song.
'; - $version[] = array('version' => '370005','description' => $update_string); + $version[] = array('version' => '370005','description' => $update_string); $update_string = '- Add random and limit options to smart playlists.
'; - $version[] = array('version' => '370006','description' => $update_string); + $version[] = array('version' => '370006','description' => $update_string); $update_string = '- Add DAAP backend preference.
'; - $version[] = array('version' => '370007','description' => $update_string); + $version[] = array('version' => '370007','description' => $update_string); $update_string = '- Add UPnP backend preference.
'; - $version[] = array('version' => '370008','description' => $update_string); + $version[] = array('version' => '370008','description' => $update_string); $update_string = '- Enhance video support with TVShows and Movies.
'; - $version[] = array('version' => '370009','description' => $update_string); + $version[] = array('version' => '370009','description' => $update_string); $update_string = '- Add MusicBrainz Album Release Group identifier.
'; - $version[] = array('version' => '370010','description' => $update_string); + $version[] = array('version' => '370010','description' => $update_string); $update_string = '- Add Prefix to TVShows and Movies.
'; - $version[] = array('version' => '370011','description' => $update_string); + $version[] = array('version' => '370011','description' => $update_string); $update_string = '- Add metadata information to albums / songs / videos.
'; - $version[] = array('version' => '370012','description' => $update_string); + $version[] = array('version' => '370012','description' => $update_string); $update_string = '- Replace iframe with ajax page load.
'; - $version[] = array('version' => '370013','description' => $update_string); + $version[] = array('version' => '370013','description' => $update_string); $update_string = '- Modified release_date in video table to signed int.
'; - $version[] = array('version' => '370014','description' => $update_string); + $version[] = array('version' => '370014','description' => $update_string); $update_string = '- Add session_remember table to store remember tokens.
'; - $version[] = array('version' => '370015','description' => $update_string); + $version[] = array('version' => '370015','description' => $update_string); $update_string = '- Add limit of media count for direct play preference.
'; - $version[] = array('version' => '370016','description' => $update_string); + $version[] = array('version' => '370016','description' => $update_string); $update_string = '- Add home display settings.
'; - $version[] = array('version' => '370017','description' => $update_string); + $version[] = array('version' => '370017','description' => $update_string); $update_string = '- Enhance tag persistent merge reference.
'; - $version[] = array('version' => '370018','description' => $update_string); + $version[] = array('version' => '370018','description' => $update_string); $update_string = '- Add album group order setting.
'; - $version[] = array('version' => '370019','description' => $update_string); + $version[] = array('version' => '370019','description' => $update_string); $update_string = '- Add webplayer browser notification settings.
'; - $version[] = array('version' => '370020','description' => $update_string); + $version[] = array('version' => '370020','description' => $update_string); $update_string = '- Add rating to playlists, tvshows and tvshows seasons.
'; - $version[] = array('version' => '370021','description' => $update_string); + $version[] = array('version' => '370021','description' => $update_string); $update_string = '- Add users geolocation.
'; - $version[] = array('version' => '370022','description' => $update_string); + $version[] = array('version' => '370022','description' => $update_string); $update_string = " - Add Aurora.js webplayer option.
"; - $version[] = array('version' => '370023','description' => $update_string); + $version[] = array('version' => '370023','description' => $update_string); $update_string = " - Add count_type column to object_count table.
"; - $version[] = array('version' => '370024','description' => $update_string); + $version[] = array('version' => '370024','description' => $update_string); $update_string = " - Add state and city fields to user table.
"; - $version[] = array('version' => '370025','description' => $update_string); + $version[] = array('version' => '370025','description' => $update_string); $update_string = " - Add replay gain fields to song_data table.
"; - $version[] = array('version' => '370026','description' => $update_string); + $version[] = array('version' => '370026','description' => $update_string); $update_string = " - Move column album_artist from table song to table album.
"; - $version[] = array('version' => '370027','description' => $update_string); + $version[] = array('version' => '370027','description' => $update_string); $update_string = " - Add width and height in table image.
"; - $version[] = array('version' => '370028','description' => $update_string); + $version[] = array('version' => '370028','description' => $update_string); $update_string = " - Set image column from image table as nullable.
"; - $version[] = array('version' => '370029','description' => $update_string); + $version[] = array('version' => '370029','description' => $update_string); $update_string = " - Add an option to allow users to remove uploaded songs.
"; - $version[] = array('version' => '370030','description' => $update_string); + $version[] = array('version' => '370030','description' => $update_string); $update_string = " - Add an option to customize login art, favicon and text footer.
"; - $version[] = array('version' => '370031','description' => $update_string); + $version[] = array('version' => '370031','description' => $update_string); $update_string = " - Add WebDAV backend preference.
"; - $version[] = array('version' => '370032','description' => $update_string); + $version[] = array('version' => '370032','description' => $update_string); $update_string = " - Add Label tables.
"; - $version[] = array('version' => '370033','description' => $update_string); + $version[] = array('version' => '370033','description' => $update_string); $update_string = " - Add User messages and user follow tables.
"; - $version[] = array('version' => '370034','description' => $update_string); + $version[] = array('version' => '370034','description' => $update_string); $update_string = " - Add option on user fullname to show/hide it publicly.
"; - $version[] = array('version' => '370035','description' => $update_string); + $version[] = array('version' => '370035','description' => $update_string); + + $update_string = " - Add track number field to stream_playlist table.
"; + $version[] = array('version' => '370036','description' => $update_string); + + $update_string = " - Delete http_port preference (use ampache.cfg.php configuration instead).
"; + $version[] = array('version' => '370037','description' => $update_string); + $update_string = " - Add theme color option.
"; + $version[] = array('version' => '370038','description' => $update_string); + + $update_string = " - Renamed false named sample_rate option name in preference table.
"; + $version[] = array('version' => '370039','description' => $update_string); + + $update_string = " - Add user_activity table.
"; + $version[] = array('version' => '370040','description' => $update_string); + + $update_string = "- Add basic metadata tables.
"; + $version[] = array('version' => '370041', 'description' => $update_string); + + $update_string = "- Add podcasts.
"; + $version[] = array('version' => '380001', 'description' => $update_string); + + $update_string = "- Add bookmarks.
"; + $version[] = array('version' => '380002', 'description' => $update_string); + + $update_string = "- Add unique constraint on tag_map table.
"; + $version[] = array('version' => '380003', 'description' => $update_string); + + $update_string = "- Add preference subcategory.
"; + $version[] = array('version' => '380004', 'description' => $update_string); + + $update_string = "- Add manual update flag on artist.
"; + $version[] = array('version' => '380005', 'description' => $update_string); + return $version; } @@ -523,13 +555,16 @@ class Update } $update_needed = false; - if (!defined('CLI')) { echo "
- \n"; }
+ if (!defined('CLI')) {
+ echo "
- '; }
+ if (!defined('CLI')) {
+ echo '
- '; + } echo 'Version: ', self::format_version($update['version']); if (defined('CLI')) { echo "\n", str_replace('
\n"; } } // if newer - } // foreach versions - if (!defined('CLI')) { echo "
', "\n", $update['description']), "\n"; @@ -537,16 +572,19 @@ class Update echo '
', $update['description'], " - '; + } echo 'Version: ', self::format_version($update['version']); if (defined('CLI')) { echo "\n", str_replace('
- \n";
+ }
foreach (self::$versions as $update) {
-
if ($update['version'] > $current_version) {
$update_needed = true;
- if (!defined('CLI')) { echo '
'; } + if (!defined('CLI')) { + echo '
'; + } echo T_('No updates needed.'); if (!defined('CLI')) { - echo ' [', T_('Return to main page'), ']
'; + echo ' [', T_('Return to main page'), ']'; } else { echo "\n"; } @@ -586,7 +624,6 @@ class Update } foreach (self::$versions as $version) { - // If it's newer than our current version let's see if a function // exists and run the bugger. if ($version['version'] > $current_version) { @@ -598,13 +635,11 @@ class Update if ($success) { self::set_version('db_version', $version['version']); } else { - Error::display('update'); + AmpError::display('update'); return false; } } - } - } // end foreach version // Once we've run all of the updates let's re-sync the character set as @@ -638,23 +673,23 @@ class Update public static function update_340003() { $retval = true; - $sql = "ALTER TABLE `song` CHANGE `mode` `mode` ENUM( 'abr', 'vbr', 'cbr' ) NULL DEFAULT 'cbr'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` CHANGE `mode` `mode` ENUM( 'abr', 'vbr', 'cbr' ) NULL DEFAULT 'cbr'"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song` CHANGE `time` `time` SMALLINT( 5 ) UNSIGNED NOT NULL DEFAULT '0'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` CHANGE `time` `time` SMALLINT( 5 ) UNSIGNED NOT NULL DEFAULT '0'"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song` CHANGE `rate` `rate` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` CHANGE `rate` `rate` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song` CHANGE `bitrate` `bitrate` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` CHANGE `bitrate` `bitrate` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song` CHANGE `track` `track` SMALLINT( 5 ) UNSIGNED NULL DEFAULT NULL "; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` CHANGE `track` `track` SMALLINT( 5 ) UNSIGNED NULL DEFAULT NULL "; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `user` CHANGE `disabled` `disabled` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user` CHANGE `disabled` `disabled` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'"; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `album_data` (" . "`album_id` INT( 11 ) UNSIGNED NOT NULL , " . @@ -664,57 +699,57 @@ class Update "`thumb_mime` VARCHAR( 64 ) NULL , " . "UNIQUE ( `album_id` )" . ") ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); /* Foreach the Albums and move the data into the new album_data table */ - $sql = "SELECT * FROM album"; + $sql = "SELECT * FROM album"; $db_results = Dba::write($sql); while ($data = Dba::fetch_assoc($db_results)) { - $id = $data['id']; - $art = Dba::escape($data['art']); + $id = $data['id']; + $art = Dba::escape($data['art']); $art_mime = Dba::escape($data['art_mime']); - $sql = "INSERT INTO `album_data` (`album_id`,`art`,`art_mime`)" . + $sql = "INSERT INTO `album_data` (`album_id`,`art`,`art_mime`)" . " VALUES ('$id','$art','$art_mime')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); } // end while - $sql = "RENAME TABLE `song_ext_data` TO `song_data`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "RENAME TABLE `song_ext_data` TO `song_data`"; + $retval &= Dba::write($sql); - $sql = "RENAME TABLE `preferences` TO `preference`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "RENAME TABLE `preferences` TO `preference`"; + $retval &= Dba::write($sql); - $sql = "RENAME TABLE `ratings` TO `rating`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "RENAME TABLE `ratings` TO `rating`"; + $retval &= Dba::write($sql); // Go ahead and drop the art/thumb stuff - $sql = "ALTER TABLE `album` DROP `art`, DROP `art_mime`, DROP `thumb`, DROP `thumb_mime`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `album` DROP `art`, DROP `art_mime`, DROP `thumb`, DROP `thumb_mime`"; + $retval &= Dba::write($sql); // We need to fix the user_vote table - $sql = "ALTER TABLE `user_vote` CHANGE `user` `user` INT( 11 ) UNSIGNED NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user_vote` CHANGE `user` `user` INT( 11 ) UNSIGNED NOT NULL"; + $retval &= Dba::write($sql); // Remove offset limit from the user - $sql = "ALTER TABLE `user` DROP `offset_limit`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user` DROP `offset_limit`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `rating` CHANGE `user_rating` `rating` ENUM( '-1', '0', '1', '2', '3', '4', '5' ) NOT NULL DEFAULT '0'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `rating` CHANGE `user_rating` `rating` ENUM( '-1', '0', '1', '2', '3', '4', '5' ) NOT NULL DEFAULT '0'"; + $retval &= Dba::write($sql); /* Add the rate_limit preference */ $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('rate_limit','8192','Rate Limit','100','integer','streaming')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); /* Add the playlist_method preference and remove it from the user table */ $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('playlist_method','normal','Playlist Method','5','string','streaming')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `update_info` ADD UNIQUE (`key`)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `update_info` ADD UNIQUE (`key`)"; + $retval &= Dba::write($sql); return $retval; } // update_340003 @@ -728,22 +763,22 @@ class Update { $retval = true; /* Alter the session.id so that it's 64 */ - $sql = "ALTER TABLE `session` CHANGE `id` `id` VARCHAR( 64 ) NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `session` CHANGE `id` `id` VARCHAR( 64 ) NOT NULL"; + $retval &= Dba::write($sql); /* Add Playlist Related Preferences */ $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('playlist_add','append','Add Behavior','5','string','playlist')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); // Switch the existing preferences over to this new catagory $sql = "UPDATE `preference` SET `catagory`='playlist' WHERE `name`='playlist_method' " . " OR `name`='playlist_type'"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); // Change the default value for playlist_method - $sql = "UPDATE `preference` SET `value`='normal' WHERE `name`='playlist_method'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `preference` SET `value`='normal' WHERE `name`='playlist_method'"; + $retval &= Dba::write($sql); // Add in the shoutbox $sql = "CREATE TABLE `user_shout` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , " . @@ -754,19 +789,19 @@ class Update "`object_id` INT( 11 ) UNSIGNED NOT NULL , " . "`object_type` VARCHAR( 32 ) NOT NULL " . ") ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `user_shout` ADD INDEX ( `sticky` )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user_shout` ADD INDEX ( `sticky` )"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `user_shout` ADD INDEX ( `date` )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user_shout` ADD INDEX ( `date` )"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `user_shout` ADD INDEX ( `user` )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user_shout` ADD INDEX ( `user` )"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `now_playing` CHANGE `start_time` `expire` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `now_playing` CHANGE `start_time` `expire` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0'"; + $retval &= Dba::write($sql); $sql = "OPTIMIZE TABLE `album`"; Dba::write($sql); @@ -782,26 +817,26 @@ class Update { $retval = true; - $sql = "UPDATE `preference` SET `catagory`='playlist' WHERE `name`='random_method'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `preference` SET `catagory`='playlist' WHERE `name`='random_method'"; + $retval &= Dba::write($sql); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('transcode','default','Transcoding','25','string','streaming')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); /* We need to check for playlist_method here because I fubar'd an earlier update */ - $sql = "SELECT * FROM `preference` WHERE `name`='playlist_method'"; + $sql = "SELECT * FROM `preference` WHERE `name`='playlist_method'"; $db_results = Dba::read($sql); if (!Dba::num_rows($db_results)) { /* Add the playlist_method preference and remove it from the user table */ $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('playlist_method','default','Playlist Method','5','string','playlist')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); } // Add in the object_type to the tmpplaylist data table so that we can have non-songs in there - $sql = "ALTER TABLE `tmp_playlist_data` ADD `object_type` VARCHAR( 32 ) NULL AFTER `tmp_playlist`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tmp_playlist_data` ADD `object_type` VARCHAR( 32 ) NULL AFTER `tmp_playlist`"; + $retval &= Dba::write($sql); return $retval; } // update_340005 @@ -827,15 +862,15 @@ class Update { $retval = true; // Tweak the session table to handle larger session vars for my page-a-nation hotness - $sql = "ALTER TABLE `session` CHANGE `value` `value` LONGTEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `session` CHANGE `value` `value` LONGTEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `now_playing` CHANGE `id` `id` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `now_playing` CHANGE `id` `id` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"; + $retval &= Dba::write($sql); // Now longer needed because of the new hotness - $sql = "ALTER TABLE `now_playing` DROP `session`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `now_playing` DROP `session`"; + $retval &= Dba::write($sql); return $retval; } // update_340007 @@ -848,34 +883,34 @@ class Update public static function update_340008() { $retval = true; - $sql = "ALTER TABLE `playlist_data` CHANGE `song` `object_id` INT( 11 ) UNSIGNED NULL DEFAULT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `playlist_data` CHANGE `song` `object_id` INT( 11 ) UNSIGNED NULL DEFAULT NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `playlist_data` CHANGE `dyn_song` `dynamic_song` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `playlist_data` CHANGE `dyn_song` `dynamic_song` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `playlist_data` ADD `object_type` VARCHAR( 32 ) NOT NULL DEFAULT 'song' AFTER `object_id`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `playlist_data` ADD `object_type` VARCHAR( 32 ) NOT NULL DEFAULT 'song' AFTER `object_id`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `playlist` ADD `genre` INT( 11 ) UNSIGNED NOT NULL AFTER `type`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `playlist` ADD `genre` INT( 11 ) UNSIGNED NOT NULL AFTER `type`"; + $retval &= Dba::write($sql); - $sql = "DELETE FROM `preference` WHERE `name`='allow_downsample_playback'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DELETE FROM `preference` WHERE `name`='allow_downsample_playback'"; + $retval &= Dba::write($sql); - $sql = "UPDATE `preference` SET `description`='Transcode Bitrate' WHERE `name`='sample_rate'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `preference` SET `description`='Transcode Bitrate' WHERE `name`='sample_rate'"; + $retval &= Dba::write($sql); // Check for old tables and drop if found, seems like there was a glitch // that caused them not to get dropped.. *shrug* - $sql = "DROP TABLE IF EXISTS `preferences`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DROP TABLE IF EXISTS `preferences`"; + $retval &= Dba::write($sql); - $sql = "DROP TABLE IF EXISTS `song_ext_data`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DROP TABLE IF EXISTS `song_ext_data`"; + $retval &= Dba::write($sql); - $sql = "DROP TABLE IF EXISTS `ratings`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DROP TABLE IF EXISTS `ratings`"; + $retval &= Dba::write($sql); return $retval; } @@ -887,14 +922,14 @@ class Update public static function update_340009() { $retval = true; - $sql = "ALTER TABLE `album` ADD `disk` smallint(5) UNSIGNED DEFAULT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `album` ADD `disk` smallint(5) UNSIGNED DEFAULT NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `album` ADD INDEX (`disk`)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `album` ADD INDEX (`disk`)"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `access_list` ADD `dns` VARCHAR( 255 ) NOT NULL AFTER `end`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `access_list` ADD `dns` VARCHAR( 255 ) NOT NULL AFTER `end`"; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `artist_data` (" . "`artist_id` INT( 11 ) UNSIGNED NOT NULL ," . @@ -904,7 +939,7 @@ class Update "`thumb_mime` VARCHAR( 32 ) NOT NULL ," . "`bio` TEXT NOT NULL , " . "UNIQUE (`artist_id`) ) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); return $retval; } @@ -916,20 +951,20 @@ class Update public static function update_340010() { $retval = true; - $sql = "UPDATE `preference` SET `catagory`='options' WHERE `name` LIKE 'localplay_%'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `preference` SET `catagory`='options' WHERE `name` LIKE 'localplay_%'"; + $retval &= Dba::write($sql); - $sql = "DELETE FROM `preference` WHERE `name`='playlist_add'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DELETE FROM `preference` WHERE `name`='playlist_add'"; + $retval &= Dba::write($sql); - $sql = "UPDATE `preference` SET `catagory`='plugins' WHERE (`name` LIKE 'mystrands_%' OR `name` LIKE 'lastfm_%') AND `catagory`='options'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `preference` SET `catagory`='plugins' WHERE (`name` LIKE 'mystrands_%' OR `name` LIKE 'lastfm_%') AND `catagory`='options'"; + $retval &= Dba::write($sql); - $sql = "UPDATE `preference` SET `value`='default' WHERE `name`='playlist_method'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `preference` SET `value`='default' WHERE `name`='playlist_method'"; + $retval &= Dba::write($sql); - $sql = "UPDATE `preference` SET `description`='Localplay Config' WHERE `name`='localplay_level'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `preference` SET `description`='Localplay Config' WHERE `name`='localplay_level'"; + $retval &= Dba::write($sql); return $retval; } @@ -942,8 +977,8 @@ class Update public static function update_340012() { $retval = true; - $sql = "ALTER TABLE `catalog` ADD `add_path` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL AFTER `path`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `catalog` ADD `add_path` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL AFTER `path`"; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `democratic` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . "`name` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL ," . @@ -952,13 +987,13 @@ class Update "`user` INT( 11 ) NOT NULL ," . "`primary` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'" . ") ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `democratic` ADD INDEX (`primary`)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `democratic` ADD INDEX (`primary`)"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `democratic` ADD INDEX (`level`)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `democratic` ADD INDEX (`level`)"; + $retval &= Dba::write($sql); return $retval; } @@ -996,17 +1031,17 @@ class Update public static function update_340014() { $retval = true; - $sql = "DROP TABLE IF EXISTS `session_api`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DROP TABLE IF EXISTS `session_api`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `session` CHANGE `type` `type` ENUM ('mysql','ldap','http','api','xml-rpc') NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `session` CHANGE `type` `type` ENUM ('mysql','ldap','http','api','xml-rpc') NOT NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `session` ADD `agent` VARCHAR ( 255 ) NOT NULL AFTER `type`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `session` ADD `agent` VARCHAR ( 255 ) NOT NULL AFTER `type`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `session` ADD INDEX (`type`)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `session` ADD INDEX (`type`)"; + $retval &= Dba::write($sql); return $retval; } @@ -1021,14 +1056,14 @@ class Update public static function update_340015() { $retval = true; - $sql = "ALTER TABLE `playlist` DROP `date`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `playlist` DROP `date`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `playlist` ADD `date` INT ( 11 ) UNSIGNED NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `playlist` ADD `date` INT ( 11 ) UNSIGNED NOT NULL"; + $retval &= Dba::write($sql); // Pull all of the rating information - $sql = "SELECT `id`,`rating` FROM `rating`"; + $sql = "SELECT `id`,`rating` FROM `rating`"; $db_results = Dba::read($sql); $results = array(); @@ -1037,16 +1072,16 @@ class Update $results[] = $row; } - $sql = "ALTER TABLE `rating` DROP `rating`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `rating` DROP `rating`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `rating` ADD `rating` TINYINT ( 4 ) NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `rating` ADD `rating` TINYINT ( 4 ) NOT NULL"; + $retval &= Dba::write($sql); foreach ($results as $row) { $rating = Dba::escape($row['rating']); - $id = Dba::escape($row['id']); - $sql = "UPDATE `rating` SET `rating`='$rating' WHERE `id`='$id'"; + $id = Dba::escape($row['id']); + $sql = "UPDATE `rating` SET `rating`='$rating' WHERE `id`='$id'"; Dba::write($sql); } @@ -1075,8 +1110,8 @@ class Update { $retval = true; - $sql = "ALTER TABLE `tmp_playlist` DROP `base_playlist`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tmp_playlist` DROP `base_playlist`"; + $retval &= Dba::write($sql); $sql = "DELETE FROM `tmp_playlist` WHERE `session`='-1'"; Dba::write($sql); @@ -1098,20 +1133,20 @@ class Update public static function update_350001() { $retval = true; - $sql = "ALTER TABLE `tag_map` ADD `tag_id` INT ( 11 ) UNSIGNED NOT NULL AFTER `id`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tag_map` ADD `tag_id` INT ( 11 ) UNSIGNED NOT NULL AFTER `id`"; + $retval &= Dba::write($sql); - $sql = "RENAME TABLE `tags` TO `tag`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "RENAME TABLE `tags` TO `tag`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `tag` CHANGE `map_id` `id` INT ( 11 ) UNSIGNED NOT NULL auto_increment"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tag` CHANGE `map_id` `id` INT ( 11 ) UNSIGNED NOT NULL auto_increment"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `album` CHANGE `prefix` `prefix` VARCHAR ( 32 ) NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `album` CHANGE `prefix` `prefix` VARCHAR ( 32 ) NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `artist` CHANGE `prefix` `prefix` VARCHAR ( 32 ) NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `artist` CHANGE `prefix` `prefix` VARCHAR ( 32 ) NULL"; + $retval &= Dba::write($sql); return $retval; } @@ -1128,15 +1163,15 @@ class Update { $retval = true; - $sql = "ALTER TABLE `song` DROP `genre`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` DROP `genre`"; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `user_catalog` (`user` INT( 11 ) UNSIGNED NOT NULL ,`catalog` INT( 11 ) UNSIGNED NOT NULL ,`level` SMALLINT( 4 ) UNSIGNED NOT NULL DEFAULT '5', " . "INDEX ( `user` )) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `user_catalog` ADD INDEX ( `catalog` )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user_catalog` ADD INDEX ( `catalog` )"; + $retval &= Dba::write($sql); return $retval; } @@ -1152,14 +1187,14 @@ class Update { $retval = true; - $sql = "ALTER TABLE `tag` DROP `order`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tag` DROP `order`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `tag` ADD UNIQUE ( `name` )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tag` ADD UNIQUE ( `name` )"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `tag` CHANGE `name` `name` VARCHAR( 255 )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tag` CHANGE `name` `name` VARCHAR( 255 )"; + $retval &= Dba::write($sql); // Make sure that they don't have any of the mystrands crap left $sql = "DELETE FROM `preference` WHERE `name`='mystrands_user' OR `name`='mystrands_pass'"; @@ -1178,17 +1213,17 @@ class Update { $retval = true; - $sql = "ALTER TABLE `session` CHANGE `ip` `ip` VARBINARY( 255 ) NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `session` CHANGE `ip` `ip` VARBINARY( 255 ) NULL"; + $retval &= Dba::write($sql); // Pull all of the IP history, this could take a while - $sql = "SELECT * FROM `ip_history`"; + $sql = "SELECT * FROM `ip_history`"; $db_results = Dba::read($sql); $ip_history = array(); while ($row = Dba::fetch_assoc($db_results)) { - $row['ip'] = long2ip($row['ip']); + $row['ip'] = long2ip($row['ip']); $ip_history[] = $row; } @@ -1196,29 +1231,29 @@ class Update $sql = "TRUNCATE `ip_history`"; Dba::write($sql); - $sql = "ALTER TABLE `ip_history` CHANGE `ip` `ip` VARBINARY( 255 ) NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `ip_history` CHANGE `ip` `ip` VARBINARY( 255 ) NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `ip_history` ADD `agent` VARCHAR ( 255 ) NULL AFTER `date`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `ip_history` ADD `agent` VARCHAR ( 255 ) NULL AFTER `date`"; + $retval &= Dba::write($sql); // Reinsert the old rows foreach ($ip_history as $row) { - $ip = Dba::escape(inet_pton($row['ip'])); + $ip = Dba::escape(inet_pton($row['ip'])); $sql = "INSERT INTO `ip_history` (`user`,`ip`,`date`,`agent`) " . "VALUES ('" . $row['user'] . "','" . $ip . "','" . $row['date'] . "',NULL)"; Dba::write($sql); } // First pull all of their current ACL's - $sql = "SELECT * FROM `access_list`"; + $sql = "SELECT * FROM `access_list`"; $db_results = Dba::read($sql); $acl_information = array(); while ($row = Dba::fetch_assoc($db_results)) { - $row['start'] = long2ip($row['start']); - $row['end'] = long2ip($row['end']); + $row['start'] = long2ip($row['start']); + $row['end'] = long2ip($row['end']); $acl_information[] = $row; } @@ -1226,26 +1261,26 @@ class Update Dba::write($sql); // Make the changes to the database - $sql = "ALTER TABLE `access_list` CHANGE `start` `start` VARBINARY( 255 ) NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `access_list` CHANGE `start` `start` VARBINARY( 255 ) NOT NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `access_list` CHANGE `end` `end` VARBINARY( 255 ) NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `access_list` CHANGE `end` `end` VARBINARY( 255 ) NOT NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `access_list` DROP `dns`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `access_list` DROP `dns`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `access_list` ADD `enabled` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `key`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `access_list` ADD `enabled` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `key`"; + $retval &= Dba::write($sql); // If we had nothing in there before add some base ALLOW ALL stuff as // we're going to start defaulting Access Control on. if (!count($acl_information)) { $v6_start = Dba::escape(inet_pton('::')); - $v6_end = Dba::escape(inet_pton('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff')); + $v6_end = Dba::escape(inet_pton('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff')); $v4_start = Dba::escape(inet_pton('0.0.0.0')); - $v4_end = Dba::escape(inet_pton('255.255.255.255')); - $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . + $v4_end = Dba::escape(inet_pton('255.255.255.255')); + $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . "VALUES ('DEFAULTv4','75','$v4_start','$v4_end',NULL,'-1','interface','1')"; Dba::write($sql); $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . @@ -1261,9 +1296,9 @@ class Update foreach ($acl_information as $row) { $row['start'] = Dba::escape(inet_pton($row['start'])); - $row['end'] = Dba::escape(inet_pton($row['end'])); - $row['key'] = Dba::escape($row['key']); - $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . + $row['end'] = Dba::escape(inet_pton($row['end'])); + $row['key'] = Dba::escape($row['key']); + $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . "VALUES ('" . Dba::escape($row['name']) . "','" . intval($row['level']) . "','" . $row['start'] . "','" . $row['end'] . "','" . $row['key'] . "','" . intval($row['user']) . "','" . $row['type'] . "','1')"; @@ -1296,19 +1331,19 @@ class Update "`mime` VARCHAR( 255 ) NOT NULL," . "`enabled` TINYINT( 1) NOT NULL DEFAULT '1'" . ") ENGINE = MYISAM "; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `access_list` ADD INDEX ( `enabled` )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `access_list` ADD INDEX ( `enabled` )"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `video` ADD INDEX ( `file` )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `video` ADD INDEX ( `file` )"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `video` ADD INDEX ( `enabled` )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `video` ADD INDEX ( `enabled` )"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `video` ADD INDEX ( `title` )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `video` ADD INDEX ( `title` )"; + $retval &= Dba::write($sql); return $retval; } @@ -1347,25 +1382,25 @@ class Update Dba::write($sql); // Remove dead column - $sql = "ALTER TABLE `playlist_data` DROP `dynamic_song`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `playlist_data` DROP `dynamic_song`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `playlist` DROP `genre`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `playlist` DROP `genre`"; + $retval &= Dba::write($sql); // Add track item to tmp_playlist_data so we can order this stuff manually - $sql = "ALTER TABLE `tmp_playlist_data` ADD `track` INT ( 11 ) UNSIGNED NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tmp_playlist_data` ADD `track` INT ( 11 ) UNSIGNED NULL"; + $retval &= Dba::write($sql); - $sql = "DROP TABLE `genre`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DROP TABLE `genre`"; + $retval &= Dba::write($sql); // Clean up the catalog and add last_clean to it - $sql = "ALTER TABLE `catalog` ADD `last_clean` INT ( 11 ) UNSIGNED NULL AFTER `last_update`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `catalog` ADD `last_clean` INT ( 11 ) UNSIGNED NULL AFTER `last_update`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `catalog` DROP `add_path`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `catalog` DROP `add_path`"; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `dynamic_playlist` (" . "`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . @@ -1374,7 +1409,7 @@ class Update "`date` INT( 11 ) UNSIGNED NOT NULL ," . "`type` VARCHAR( 128 ) NOT NULL" . ") ENGINE = MYISAM "; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `dynamic_playlist_data` (" . "`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . @@ -1384,7 +1419,7 @@ class Update "`external_operator` VARCHAR( 64 ) NOT NULL ," . "`value` VARCHAR( 255 ) NOT NULL" . ") ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); return $retval; } @@ -1399,29 +1434,29 @@ class Update public static function update_350008() { $retval = true; - $sql = "ALTER TABLE `now_playing` CHANGE `song_id` `object_id` INT( 11 ) UNSIGNED NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `now_playing` CHANGE `song_id` `object_id` INT( 11 ) UNSIGNED NOT NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `now_playing` ADD `object_type` VARCHAR ( 255 ) NOT NULL AFTER `object_id`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `now_playing` ADD `object_type` VARCHAR ( 255 ) NOT NULL AFTER `object_id`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `now_playing` ADD INDEX ( `expire` )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `now_playing` ADD INDEX ( `expire` )"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `video` ADD `addition_time` INT( 11 ) UNSIGNED NOT NULL AFTER `mime`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `video` ADD `addition_time` INT( 11 ) UNSIGNED NOT NULL AFTER `mime`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `video` ADD `update_time` INT( 11 ) UNSIGNED NULL AFTER `addition_time`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `video` ADD `update_time` INT( 11 ) UNSIGNED NULL AFTER `addition_time`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `video` ADD INDEX (`addition_time`)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `video` ADD INDEX (`addition_time`)"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `video` ADD INDEX (`update_time`)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `video` ADD INDEX (`update_time`)"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song` DROP `hash`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` DROP `hash`"; + $retval &= Dba::write($sql); return $retval; } @@ -1436,14 +1471,14 @@ class Update { $retval = true; - $sql = "ALTER TABLE `album` ADD `mbid` CHAR ( 36 ) AFTER `prefix`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `album` ADD `mbid` CHAR ( 36 ) AFTER `prefix`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `artist` ADD `mbid` CHAR ( 36 ) AFTER `prefix`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `artist` ADD `mbid` CHAR ( 36 ) AFTER `prefix`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song` ADD `mbid` CHAR ( 36 ) AFTER `track`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` ADD `mbid` CHAR ( 36 ) AFTER `track`"; + $retval &= Dba::write($sql); // Remove any RIO related information from the database as the plugin has been removed $sql = "DELETE FROM `update_info` WHERE `key` LIKE 'Plugin_Ri%'"; @@ -1465,40 +1500,40 @@ class Update { $retval = true; // Drop the key from catalog and ACL - $sql = "ALTER TABLE `catalog` DROP `key`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `catalog` DROP `key`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `access_list` DROP `key`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `access_list` DROP `key`"; + $retval &= Dba::write($sql); // Add in Username / Password for catalog - to be used for remote catalogs - $sql = "ALTER TABLE `catalog` ADD `remote_username` VARCHAR ( 255 ) AFTER `catalog_type`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `catalog` ADD `remote_username` VARCHAR ( 255 ) AFTER `catalog_type`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `catalog` ADD `remote_password` VARCHAR ( 255 ) AFTER `remote_username`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `catalog` ADD `remote_password` VARCHAR ( 255 ) AFTER `remote_username`"; + $retval &= Dba::write($sql); // Adjust the Filename field in song, make it gi-normous. If someone has // anything close to this file length, they seriously need to reconsider // what they are doing. - $sql = "ALTER TABLE `song` CHANGE `file` `file` VARCHAR ( 4096 )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` CHANGE `file` `file` VARCHAR ( 4096 )"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `video` CHANGE `file` `file` VARCHAR ( 4096 )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `video` CHANGE `file` `file` VARCHAR ( 4096 )"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `live_stream` CHANGE `url` `url` VARCHAR ( 4096 )"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `live_stream` CHANGE `url` `url` VARCHAR ( 4096 )"; + $retval &= Dba::write($sql); // Index the Artist, Album, and Song tables for fulltext searches. - $sql = "ALTER TABLE `artist` ADD FULLTEXT(`name`)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `artist` ADD FULLTEXT(`name`)"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `album` ADD FULLTEXT(`name`)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `album` ADD FULLTEXT(`name`)"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song` ADD FULLTEXT(`title`)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` ADD FULLTEXT(`title`)"; + $retval &= Dba::write($sql); // Now add in the min_object_count preference and the random_method $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . @@ -1519,7 +1554,8 @@ class Update */ public static function update_360003() { - $sql = "CREATE TABLE `image` (" . + $retval = true; + $sql = "CREATE TABLE `image` (" . "`id` int(11) unsigned NOT NULL auto_increment," . "`image` mediumblob NOT NULL," . "`mime` varchar(64) NOT NULL," . @@ -1530,7 +1566,7 @@ class Update "KEY `object_type` (`object_type`)," . "KEY `object_id` (`object_id`)" . ") ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; - $retval = Dba::write($sql); + $retval &= Dba::write($sql); foreach (array('album', 'artist') as $type) { $sql = "SELECT `" . $type . "_id` AS `object_id`, " . @@ -1547,8 +1583,8 @@ class Update $row['object_id'] . "')"; Dba::write($sql); } - $sql = "DROP TABLE `" . $type . "_data`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DROP TABLE `" . $type . "_data`"; + $retval &= Dba::write($sql); } return $retval; @@ -1574,8 +1610,8 @@ class Update { $retval = true; - $sql = "DROP TABLE IF EXISTS `tmp_browse`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DROP TABLE IF EXISTS `tmp_browse`"; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `tmp_browse` (" . "`id` int(13) NOT NULL auto_increment," . @@ -1584,7 +1620,7 @@ class Update "`object_data` longtext," . "PRIMARY KEY (`sid`,`id`)" . ") ENGINE=MyISAM DEFAULT CHARSET=utf8"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); return $retval; } @@ -1616,11 +1652,11 @@ class Update */ public static function update_360008() { - $retval = true; + $retval = true; $remote_username = false; $remote_password = false; - $sql = "DESCRIBE `catalog`"; + $sql = "DESCRIBE `catalog`"; $db_results = Dba::read($sql); while ($row = Dba::fetch_assoc($db_results)) { @@ -1634,12 +1670,12 @@ class Update if (!$remote_username) { // Add in Username / Password for catalog - to be used for remote catalogs - $sql = "ALTER TABLE `catalog` ADD `remote_username` VARCHAR ( 255 ) AFTER `catalog_type`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `catalog` ADD `remote_username` VARCHAR ( 255 ) AFTER `catalog_type`"; + $retval &= Dba::write($sql); } if (!$remote_password) { - $sql = "ALTER TABLE `catalog` ADD `remote_password` VARCHAR ( 255 ) AFTER `remote_username`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `catalog` ADD `remote_password` VARCHAR ( 255 ) AFTER `remote_username`"; + $retval &= Dba::write($sql); } return $retval; @@ -1721,9 +1757,9 @@ class Update { $retval = true; - $retval = Dba::write('ALTER TABLE `stream_playlist` CHANGE `sid` `sid` VARCHAR(256)') ? $retval : false; - $retval = Dba::write('ALTER TABLE `tmp_playlist` CHANGE `session` `session` VARCHAR(256)') ? $retval : false; - $retval = Dba::write('ALTER TABLE `session` CHANGE `id` `id` VARCHAR(256) NOT NULL') ? $retval : false; + $retval &= Dba::write('ALTER TABLE `stream_playlist` CHANGE `sid` `sid` VARCHAR(256)'); + $retval &= Dba::write('ALTER TABLE `tmp_playlist` CHANGE `session` `session` VARCHAR(256)'); + $retval &= Dba::write('ALTER TABLE `session` CHANGE `id` `id` VARCHAR(256) NOT NULL'); return $retval; } @@ -1739,12 +1775,12 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('iframes','1','Iframes',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -1760,12 +1796,12 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('now_playing_per_user','1','Now playing filtered per user',50,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -1800,12 +1836,12 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('album_sort','0','Album Default Sort',25,'string','interface')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -1821,12 +1857,12 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('show_played_times','0','Show # played',25,'string','interface')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -1840,7 +1876,7 @@ class Update { $retval = true; - $sql = "SELECT `id`, `catalog_type`, `path`, `remote_username`, `remote_password` FROM `catalog`"; + $sql = "SELECT `id`, `catalog_type`, `path`, `remote_username`, `remote_password` FROM `catalog`"; $db_results = Dba::read($sql); $c = Catalog::create_catalog_type('local'); @@ -1850,28 +1886,28 @@ class Update while ($results = Dba::fetch_assoc($db_results)) { if ($results['catalog_type'] == 'local') { - $sql = "INSERT INTO `catalog_local` (`path`, `catalog_id`) VALUES (?, ?)"; - $retval = Dba::write($sql, array($results['path'], $results['id'])) ? $retval : false; + $sql = "INSERT INTO `catalog_local` (`path`, `catalog_id`) VALUES (?, ?)"; + $retval &= Dba::write($sql, array($results['path'], $results['id'])); } elseif ($results['catalog_type'] == 'remote') { - $sql = "INSERT INTO `catalog_remote` (`uri`, `username`, `password`, `catalog_id`) VALUES (?, ?, ?, ?)"; - $retval = Dba::write($sql, array($results['path'], $results['remote_username'], $results['remote_password'], $results['id'])) ? $retval : false; + $sql = "INSERT INTO `catalog_remote` (`uri`, `username`, `password`, `catalog_id`) VALUES (?, ?, ?, ?)"; + $retval &= Dba::write($sql, array($results['path'], $results['remote_username'], $results['remote_password'], $results['id'])); } } - $sql = "ALTER TABLE `catalog` DROP `path`, DROP `remote_username`, DROP `remote_password`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `catalog` DROP `path`, DROP `remote_username`, DROP `remote_password`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `catalog` MODIFY COLUMN `catalog_type` varchar(128)"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `catalog` MODIFY COLUMN `catalog_type` varchar(128)"; + $retval &= Dba::write($sql); - $sql = "UPDATE `artist` SET `mbid` = null WHERE `mbid` = ''"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `artist` SET `mbid` = null WHERE `mbid` = ''"; + $retval &= Dba::write($sql); - $sql = "UPDATE `album` SET `mbid` = null WHERE `mbid` = ''"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `album` SET `mbid` = null WHERE `mbid` = ''"; + $retval &= Dba::write($sql); - $sql = "UPDATE `song` SET `mbid` = null WHERE `mbid` = ''"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `song` SET `mbid` = null WHERE `mbid` = ''"; + $retval &= Dba::write($sql); return $retval; } @@ -1885,17 +1921,17 @@ class Update { $retval = true; - $sql = "ALTER TABLE `now_playing` ADD `insertion` INT (11) AFTER `expire`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `now_playing` ADD `insertion` INT (11) AFTER `expire`"; + $retval &= Dba::write($sql); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('song_page_title','1','Show current song in Web player page title',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -1909,11 +1945,11 @@ class Update { $retval = true; - $sql = "ALTER TABLE `live_stream` ADD `codec` VARCHAR(32) NULL AFTER `catalog`, DROP `frequency`, DROP `call_sign`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `live_stream` ADD `codec` VARCHAR(32) NULL AFTER `catalog`, DROP `frequency`, DROP `call_sign`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `stream_playlist` ADD `codec` VARCHAR(32) NULL AFTER `time`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `stream_playlist` ADD `codec` VARCHAR(32) NULL AFTER `time`"; + $retval &= Dba::write($sql); return $retval; } @@ -1929,21 +1965,21 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('subsonic_backend','1','Use SubSonic backend',100,'boolean','system')"; - $retval = Dba::write($sql) ? $retval: false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('plex_backend','0','Use Plex backend',100,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -1970,21 +2006,21 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('webplayer_flash','1','Authorize Flash Web Player(s)',25,'boolean','streaming')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('webplayer_html5','1','Authorize HTML5 Web Player(s)',25,'boolean','streaming')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2011,12 +2047,12 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('allow_personal_info','1','Allow to show my personal info to other users (now playing, recently played)',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2033,32 +2069,32 @@ class Update $retval = true; // Update previous update preference - $sql = "UPDATE `preference` SET `name`='allow_personal_info_now', `description`='Personal information visibility - Now playing' WHERE `name`='allow_personal_info'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `preference` SET `name`='allow_personal_info_now', `description`='Personal information visibility - Now playing' WHERE `name`='allow_personal_info'"; + $retval &= Dba::write($sql); // Insert new recently played preference $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('allow_personal_info_recent','1','Personal information visibility - Recently played',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + "VALUES ('allow_personal_info_recent','1','Personal information visibility - Recently played / actions',25,'boolean','interface')"; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); // Insert streaming time preference $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('allow_personal_info_time','1','Personal information visibility - Recently played - Allow to show streaming date/time',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); // Insert streaming agent preference $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('allow_personal_info_agent','1','Personal information visibility - Recently played - Allow to show streaming agent',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2118,10 +2154,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('ui_fixed','0','Fix header position on compatible themes',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2137,10 +2173,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('autoupdate','1','Check for Ampache updates automatically',25,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); Preference::insert('autoupdate_lastcheck','AutoUpdate last check time','','25','string','internal'); Preference::insert('autoupdate_lastversion','AutoUpdate last version from last check','','25','string','internal'); @@ -2158,11 +2194,11 @@ class Update { $retval = true; - $sql = "ALTER TABLE `song_data` ADD `waveform` MEDIUMBLOB NULL AFTER `language`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song_data` ADD `waveform` MEDIUMBLOB NULL AFTER `language`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `user_shout` ADD `data` VARCHAR(256) NULL AFTER `object_type`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user_shout` ADD `data` VARCHAR(256) NULL AFTER `object_type`"; + $retval &= Dba::write($sql); return $retval; } @@ -2178,17 +2214,17 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('webplayer_confirmclose','0','Confirmation when closing current playing window',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('webplayer_pausetabs','1','Auto-pause betweens tabs',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2204,10 +2240,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('stream_beautiful_url','0','Enable url rewriting',100,'boolean','streaming')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2221,20 +2257,20 @@ class Update { $retval = true; - $sql = "DELETE FROM `preference` WHERE `name` LIKE 'ellipse_threshold_%'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DELETE FROM `preference` WHERE `name` LIKE 'ellipse_threshold_%'"; + $retval &= Dba::write($sql); - $sql = "DELETE FROM `preference` WHERE `name` = 'min_object_count'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DELETE FROM `preference` WHERE `name` = 'min_object_count'"; + $retval &= Dba::write($sql); - $sql = "DELETE FROM `preference` WHERE `name` = 'bandwidth'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DELETE FROM `preference` WHERE `name` = 'bandwidth'"; + $retval &= Dba::write($sql); - $sql = "DELETE FROM `preference` WHERE `name` = 'features'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DELETE FROM `preference` WHERE `name` = 'features'"; + $retval &= Dba::write($sql); - $sql = "DELETE FROM `preference` WHERE `name` = 'tags_userlist'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DELETE FROM `preference` WHERE `name` = 'tags_userlist'"; + $retval &= Dba::write($sql); return $retval; } @@ -2264,21 +2300,21 @@ class Update "`public_url` varchar(255) CHARACTER SET utf8 NULL," . "`description` varchar(255) CHARACTER SET utf8 NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('share','0','Allow Share',100,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + "VALUES ('share','0','Allow Share',100,'boolean','options')"; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('share_expire','7','Share links default expiration days (0=never)',100,'integer','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'7')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'7')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2292,16 +2328,16 @@ class Update { $retval = true; - $sql = "ALTER TABLE `wanted` ADD `artist_mbid` varchar(1369) CHARACTER SET utf8 NULL AFTER `artist`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `wanted` ADD `artist_mbid` varchar(1369) CHARACTER SET utf8 NULL AFTER `artist`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `wanted` MODIFY `artist` int(11) NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `wanted` MODIFY `artist` int(11) NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song_preview` ADD `artist_mbid` varchar(1369) CHARACTER SET utf8 NULL AFTER `artist`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song_preview` ADD `artist_mbid` varchar(1369) CHARACTER SET utf8 NULL AFTER `artist`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song_preview` MODIFY `artist` int(11) NULL"; + $sql = "ALTER TABLE `song_preview` MODIFY `artist` int(11) NULL"; $retval= Dba::write($sql) ? $retval : false; return $retval; @@ -2386,7 +2422,7 @@ class Update "`object_id` int(11) unsigned NOT NULL," . "`send_date` int(11) unsigned NOT NULL DEFAULT '0'," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); return $retval; } @@ -2402,10 +2438,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('slideshow_time','0','Artist slideshow inactivity time',25,'integer','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2423,7 +2459,7 @@ class Update "ADD `placeformed` varchar(64) NULL," . "ADD `yearformed` int(4) NULL," . "ADD `last_update` int(11) unsigned NOT NULL DEFAULT '0'"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `recommendation` (" . "`id` int(11) unsigned NOT NULL AUTO_INCREMENT," . @@ -2431,7 +2467,7 @@ class Update "`object_id` int(11) unsigned NOT NULL," . "`last_update` int(11) unsigned NOT NULL DEFAULT '0'," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `recommendation_item` (" . "`id` int(11) unsigned NOT NULL AUTO_INCREMENT," . @@ -2441,7 +2477,7 @@ class Update "`rel` varchar(256) NULL," . "`mbid` varchar(1369) NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); return $retval; } @@ -2468,10 +2504,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('broadcast_by_default','0','Broadcast web player by default',25,'boolean','streaming')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2498,17 +2534,17 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('concerts_limit_future','0','Limit number of future events',25,'integer','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('concerts_limit_past','0','Limit number of past events',25,'integer','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2524,10 +2560,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('album_group','0','Album - Group multiple disks',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2543,10 +2579,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('topmenu','0','Top menu',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2565,8 +2601,8 @@ class Update return true; } - $htaccess_play_file = AmpConfig::get('prefix') . '/play/.htaccess'; - $htaccess_rest_file = AmpConfig::get('prefix') . '/rest/.htaccess'; + $htaccess_play_file = AmpConfig::get('prefix') . '/play/.htaccess'; + $htaccess_rest_file = AmpConfig::get('prefix') . '/rest/.htaccess'; $htaccess_channel_file = AmpConfig::get('prefix') . '/channel/.htaccess'; $ret = true; @@ -2574,14 +2610,14 @@ class Update $created = false; if (check_htaccess_play_writable()) { if (!install_rewrite_rules($htaccess_play_file, AmpConfig::get('raw_web_path'), false)) { - Error::add('general', T_('File copy error.')); + AmpError::add('general', T_('File copy error.')); } else { $created = true; } } if (!$created) { - Error::add('general', T_('Cannot copy default .htaccess file.') . ' Please copy ' . $htaccess_play_file . '.dist to ' . $htaccess_play_file . '.'); + AmpError::add('general', T_('Cannot copy default .htaccess file.') . ' Please copy ' . $htaccess_play_file . '.dist to ' . $htaccess_play_file . '.'); $ret = false; } } @@ -2590,14 +2626,14 @@ class Update $created = false; if (check_htaccess_rest_writable()) { if (!install_rewrite_rules($htaccess_rest_file, AmpConfig::get('raw_web_path'), false)) { - Error::add('general', T_('File copy error.')); + AmpError::add('general', T_('File copy error.')); } else { $created = true; } } if (!$created) { - Error::add('general', T_('Cannot copy default .htaccess file.') . ' Please copy ' . $htaccess_rest_file . '.dist to ' . $htaccess_rest_file . '.'); + AmpError::add('general', T_('Cannot copy default .htaccess file.') . ' Please copy ' . $htaccess_rest_file . '.dist to ' . $htaccess_rest_file . '.'); $ret = false; } } @@ -2606,14 +2642,14 @@ class Update $created = false; if (check_htaccess_channel_writable()) { if (!install_rewrite_rules($htaccess_channel_file, AmpConfig::get('raw_web_path'), false)) { - Error::add('general', T_('File copy error.')); + AmpError::add('general', T_('File copy error.')); } else { $created = true; } } if (!$created) { - Error::add('general', T_('Cannot copy default .htaccess file.') . ' Please copy ' . $htaccess_channel_file . '.dist to ' . $htaccess_channel_file . '.'); + AmpError::add('general', T_('Cannot copy default .htaccess file.') . ' Please copy ' . $htaccess_channel_file . '.dist to ' . $htaccess_channel_file . '.'); $ret = false; } } @@ -2630,20 +2666,20 @@ class Update { $retval = true; - $sql = "DROP TABLE dynamic_playlist"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "DROP TABLE dynamic_playlist_data"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DROP TABLE dynamic_playlist"; + $retval &= Dba::write($sql); + $sql = "DROP TABLE dynamic_playlist_data"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `user_vote` ADD `sid` varchar(256) CHARACTER SET utf8 NULL AFTER `date`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user_vote` ADD `sid` varchar(256) CHARACTER SET utf8 NULL AFTER `date`"; + $retval &= Dba::write($sql); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('demo_clear_sessions','0','Clear democratic votes of expired user sessions',25,'boolean','playlist')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2670,10 +2706,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('show_donate','1','Show donate button in footer',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2689,48 +2725,48 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('upload_catalog','-1','Uploads catalog destination',75,'integer','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'-1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'-1')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('allow_upload','0','Allow users to upload media',75,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + "VALUES ('allow_upload','0','Allow users to upload media',75,'boolean','options')"; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('upload_subdir','1','Upload: create a subdirectory per user (recommended)',75,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('upload_user_artist','0','Upload: consider the user sender as the track\'s artist',75,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('upload_script','','Upload: run the following script after upload (current directory = upload target directory)',75,'string','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('upload_allow_edit','1','Upload: allow users to edit uploaded songs',75,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); - $sql = "ALTER TABLE `artist` ADD `user` int(11) NULL AFTER `last_update`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `artist` ADD `user` int(11) NULL AFTER `last_update`"; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `license` (" . "`id` int(11) unsigned NOT NULL AUTO_INCREMENT," . @@ -2738,39 +2774,39 @@ class Update "`description` varchar(256) NULL," . "`external_link` varchar(256) NOT NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('_default', '')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY', 'https://creativecommons.org/licenses/by/3.0/')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY NC', 'https://creativecommons.org/licenses/by-nc/3.0/')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY NC ND', 'https://creativecommons.org/licenses/by-nc-nd/3.0/')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY NC SA', 'https://creativecommons.org/licenses/by-nc-sa/3.0/')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY ND', 'https://creativecommons.org/licenses/by-nd/3.0/')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY SA', 'https://creativecommons.org/licenses/by-sa/3.0/')"; - $retval= Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('Licence Art Libre', 'http://artlibre.org/licence/lal/')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('Yellow OpenMusic', 'http://openmusic.linuxtag.org/yellow.html')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('Green OpenMusic', 'http://openmusic.linuxtag.org/green.html')"; - $retval= Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('Gnu GPL Art', 'http://gnuart.org/english/gnugpl.html')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('WTFPL', 'https://en.wikipedia.org/wiki/WTFPL')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('FMPL', 'http://www.fmpl.org/fmpl.html')"; - $retval = Dba::write($sql) ? $retval : false; - $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('C Reaction', 'http://morne.free.fr/Necktar7/creaction.htm')"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('_default', '')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY', 'https://creativecommons.org/licenses/by/3.0/')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY NC', 'https://creativecommons.org/licenses/by-nc/3.0/')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY NC ND', 'https://creativecommons.org/licenses/by-nc-nd/3.0/')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY NC SA', 'https://creativecommons.org/licenses/by-nc-sa/3.0/')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY ND', 'https://creativecommons.org/licenses/by-nd/3.0/')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('CC BY SA', 'https://creativecommons.org/licenses/by-sa/3.0/')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('Licence Art Libre', 'http://artlibre.org/licence/lal/')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('Yellow OpenMusic', 'http://openmusic.linuxtag.org/yellow.html')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('Green OpenMusic', 'http://openmusic.linuxtag.org/green.html')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('Gnu GPL Art', 'http://gnuart.org/english/gnugpl.html')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('WTFPL', 'https://en.wikipedia.org/wiki/WTFPL')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('FMPL', 'http://www.fmpl.org/fmpl.html')"; + $retval &= Dba::write($sql); + $sql = "INSERT INTO `license`(`name`, `external_link`) VALUES ('C Reaction', 'http://morne.free.fr/Necktar7/creaction.htm')"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song` ADD `user_upload` int(11) NULL AFTER `addition_time`, ADD `license` int(11) NULL AFTER `user_upload`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` ADD `user_upload` int(11) NULL AFTER `addition_time`, ADD `license` int(11) NULL AFTER `user_upload`"; + $retval &= Dba::write($sql); return $retval; } @@ -2810,23 +2846,23 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('daap_backend','0','Use DAAP backend',100,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('daap_pass','','DAAP backend password',100,'string','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; + $retval &= Dba::write($sql, array($id)); $sql = "CREATE TABLE `daap_session` (" . "`id` int(11) unsigned NOT NULL AUTO_INCREMENT," . "`creationdate` int(11) unsigned NOT NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); return $retval; } @@ -2843,10 +2879,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('upnp_backend','0','Use UPnP backend',100,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2860,9 +2896,9 @@ class Update { $retval = true; - $sql = "ALTER TABLE `video` ADD `release_date` date NULL AFTER `enabled`, " . - "ADD `played` tinyint(1) unsigned DEFAULT '1' NOT NULL AFTER `enabled`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `video` ADD `release_date` date NULL AFTER `enabled`, " . + "ADD `played` tinyint(1) unsigned DEFAULT '0' NOT NULL AFTER `enabled`"; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `tvshow` (" . "`id` int(11) unsigned NOT NULL AUTO_INCREMENT," . @@ -2870,14 +2906,14 @@ class Update "`summary` varchar(256) NULL," . "`year` int(11) unsigned NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `tvshow_season` (" . "`id` int(11) unsigned NOT NULL AUTO_INCREMENT," . "`season_number` int(11) unsigned NOT NULL," . "`tvshow` int(11) unsigned NOT NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `tvshow_episode` (" . "`id` int(11) unsigned NOT NULL," . @@ -2886,7 +2922,7 @@ class Update "`episode_number` int(11) unsigned NOT NULL," . "`summary` varchar(256) NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `movie` (" . "`id` int(11) unsigned NOT NULL," . @@ -2894,31 +2930,31 @@ class Update "`summary` varchar(256) NULL," . "`year` int(11) unsigned NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval= Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `personal_video` (" . "`id` int(11) unsigned NOT NULL," . "`location` varchar(256) NULL," . "`summary` varchar(256) NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `clip` (" . "`id` int(11) unsigned NOT NULL," . "`artist` int(11) NULL," . "`song` int(11) NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('allow_video','1','Allow video features',25,'integer','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + "VALUES ('allow_video','1','Allow video features',75,'integer','options')"; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); - $sql = "ALTER TABLE `image` ADD `kind` VARCHAR( 32 ) NULL DEFAULT 'default' AFTER `object_id`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `image` ADD `kind` VARCHAR( 32 ) NULL DEFAULT 'default' AFTER `object_id`"; + $retval &= Dba::write($sql); return $retval; } @@ -2943,11 +2979,11 @@ class Update { $retval = true; - $sql = "ALTER TABLE `tvshow` ADD `prefix` varchar(32) CHARACTER SET utf8 NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tvshow` ADD `prefix` varchar(32) CHARACTER SET utf8 NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `movie` ADD `prefix` varchar(32) CHARACTER SET utf8 NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `movie` ADD `prefix` varchar(32) CHARACTER SET utf8 NULL"; + $retval &= Dba::write($sql); return $retval; } @@ -2961,21 +2997,21 @@ class Update { $retval = true; - $sql = "ALTER TABLE `album` ADD `release_type` varchar(32) CHARACTER SET utf8 NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `album` ADD `release_type` varchar(32) CHARACTER SET utf8 NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song` ADD `composer` varchar(256) CHARACTER SET utf8 NULL, ADD `channels` MEDIUMINT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` ADD `composer` varchar(256) CHARACTER SET utf8 NULL, ADD `channels` MEDIUMINT NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `video` ADD `channels` MEDIUMINT NULL, ADD `bitrate` MEDIUMINT(8) NULL, ADD `video_bitrate` MEDIUMINT(8) NULL, ADD `display_x` MEDIUMINT(8) NULL, ADD `display_y` MEDIUMINT(8) NULL, ADD `frame_rate` FLOAT NULL, ADD `mode` ENUM( 'abr', 'vbr', 'cbr' ) NULL DEFAULT 'cbr'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `video` ADD `channels` MEDIUMINT NULL, ADD `bitrate` MEDIUMINT(8) NULL, ADD `video_bitrate` MEDIUMINT(8) NULL, ADD `display_x` MEDIUMINT(8) NULL, ADD `display_y` MEDIUMINT(8) NULL, ADD `frame_rate` FLOAT NULL, ADD `mode` ENUM( 'abr', 'vbr', 'cbr' ) NULL DEFAULT 'cbr'"; + $retval &= Dba::write($sql); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('album_release_type','1','Album - Group per release type',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -2989,15 +3025,15 @@ class Update { $retval = true; - $sql = "DELETE FROM `preference` WHERE `name` = 'iframes'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "DELETE FROM `preference` WHERE `name` = 'iframes'"; + $retval &= Dba::write($sql); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('ajax_load','1','Ajax page load',25,'boolean','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3010,8 +3046,8 @@ class Update public static function update_370014() { $retval = true; - $sql="ALTER TABLE `video` CHANGE COLUMN `release_date` `release_date` INT NULL DEFAULT NULL" ; - $retval = Dba::write($sql) ? $retval : false; + $sql ="ALTER TABLE `video` CHANGE COLUMN `release_date` `release_date` INT NULL DEFAULT NULL" ; + $retval &= Dba::write($sql); return $retval; } @@ -3023,12 +3059,12 @@ class Update public static function update_370015() { $retval = true; - $sql = "CREATE TABLE `session_remember` (" . + $sql = "CREATE TABLE `session_remember` (" . "`username` varchar(16) NOT NULL," . "`token` varchar(32) NOT NULL," . "`expire` int(11) NULL," . "PRIMARY KEY (`username`, `token`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); return $retval; } @@ -3043,10 +3079,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('direct_play_limit','0','Limit direct play to maximum media count',25,'integer','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3062,38 +3098,38 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('home_moment_albums','1','Show Albums of the moment at home page',25,'integer','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('home_moment_videos','1','Show Videos of the moment at home page',25,'integer','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('home_recently_played','1','Show Recently Played at home page',25,'integer','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('home_now_playing','1','Show Now Playing at home page',25,'integer','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('custom_logo','','Custom logo url',25,'string','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3106,25 +3142,25 @@ class Update public static function update_370018() { $retval = true; - $sql = "CREATE TABLE IF NOT EXISTS `tag_merge` ( " . + $sql = "CREATE TABLE IF NOT EXISTS `tag_merge` ( " . "`tag_id` int(11) NOT NULL, " . "`merged_to` int(11) NOT NULL, " . "FOREIGN KEY (`tag_id`) REFERENCES `tag` (`tag_id`), " . "FOREIGN KEY (`merged_to`) REFERENCES `tag` (`tag_id`), " . "PRIMARY KEY (`tag_id`, `merged_to`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "INSERT INTO `tag_merge` (`tag_id`, `merged_to`) " . "SELECT `tag`.`id`, `tag`.`merged_to` " . "FROM `tag` " . "WHERE `merged_to` IS NOT NULL"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `tag` DROP COLUMN `merged_to`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tag` DROP COLUMN `merged_to`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `tag` ADD COLUMN `is_hidden` TINYINT(1) NOT NULL DEFAULT 0"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `tag` ADD COLUMN `is_hidden` TINYINT(1) NOT NULL DEFAULT 0"; + $retval &= Dba::write($sql); return $retval; } @@ -3140,10 +3176,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('album_release_type_sort','album,ep,live,single','Album - Group per release type Sort',25,'string','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'album,ep,live,single')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'album,ep,live,single')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3159,17 +3195,17 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('browser_notify','1','WebPlayer browser notifications',25,'integer','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('browser_notify_timeout','10','WebPlayer browser notifications timeout (seconds)',25,'integer','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'10')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'10')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3183,8 +3219,8 @@ class Update { $retval = true; - $sql = "ALTER TABLE `rating` CHANGE `object_type` `object_type` ENUM ('artist','album','song','stream','video','playlist','tvshow','tvshow_season') NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `rating` CHANGE `object_type` `object_type` ENUM ('artist','album','song','stream','video','playlist','tvshow','tvshow_season') NULL"; + $retval &= Dba::write($sql); return $retval; } @@ -3198,18 +3234,18 @@ class Update { $retval = true; - $sql = "ALTER TABLE `session` ADD COLUMN `geo_latitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_longitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_name` VARCHAR(255) NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `session` ADD COLUMN `geo_latitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_longitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_name` VARCHAR(255) NULL"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `object_count` ADD COLUMN `geo_latitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_longitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_name` VARCHAR(255) NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `object_count` ADD COLUMN `geo_latitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_longitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_name` VARCHAR(255) NULL"; + $retval &= Dba::write($sql); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('geolocation','0','Allow geolocation',25,'integer','options')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3225,12 +3261,12 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('webplayer_aurora','1','Authorize JavaScript decoder (Aurora.js) in Web Player(s)',25,'boolean','streaming')"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3244,8 +3280,8 @@ class Update { $retval = true; - $sql = "ALTER TABLE `object_count` ADD COLUMN `count_type` VARCHAR(16) NOT NULL DEFAULT 'stream'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `object_count` ADD COLUMN `count_type` VARCHAR(16) NOT NULL DEFAULT 'stream'"; + $retval &= Dba::write($sql); return $retval; } @@ -3259,8 +3295,8 @@ class Update { $retval = true; - $sql = "ALTER TABLE `user` ADD COLUMN `state` VARCHAR(64) NULL, ADD COLUMN `city` VARCHAR(64) NULL"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user` ADD COLUMN `state` VARCHAR(64) NULL, ADD COLUMN `city` VARCHAR(64) NULL"; + $retval &= Dba::write($sql); return $retval; } @@ -3276,7 +3312,7 @@ class Update $sql = "ALTER TABLE `song_data` ADD COLUMN `replaygain_track_gain` DECIMAL(10,6) NULL, ADD COLUMN `replaygain_track_peak` DECIMAL(10,6) NULL, " . "ADD COLUMN `replaygain_album_gain` DECIMAL(10,6) NULL, ADD COLUMN `replaygain_album_peak` DECIMAL(10,6) NULL"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); return $retval; } @@ -3291,14 +3327,14 @@ class Update { $retval = true; - $sql = "ALTER TABLE `album` ADD `album_artist` int(11) unsigned DEFAULT NULL AFTER `release_type`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `album` ADD `album_artist` int(11) unsigned DEFAULT NULL AFTER `release_type`"; + $retval &= Dba::write($sql); - $sql = "UPDATE `album` INNER JOIN `song` ON `album`.`id` = `song`.`album` SET `album`.`album_artist` = `song`.`album_artist`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "UPDATE `album` INNER JOIN `song` ON `album`.`id` = `song`.`album` SET `album`.`album_artist` = `song`.`album_artist`"; + $retval &= Dba::write($sql); - $sql = "ALTER TABLE `song` DROP COLUMN `album_artist`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `song` DROP COLUMN `album_artist`"; + $retval &= Dba::write($sql); return $retval; } @@ -3315,18 +3351,18 @@ class Update { $retval = true; - $sql = "select `width` from `image`"; + $sql = "select `width` from `image`"; $db_results = Dba::read($sql); if (!$db_results) { - $sql = "ALTER TABLE `image` ADD `width` int(4) unsigned DEFAULT 0 AFTER `image`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `image` ADD `width` int(4) unsigned DEFAULT 0 AFTER `image`"; + $retval &= Dba::write($sql); } - $sql = "select `height` from `image`"; + $sql = "select `height` from `image`"; $db_results = Dba::read($sql); if (!$db_results) { - $sql = "ALTER TABLE `image` ADD `height` int(4) unsigned DEFAULT 0 AFTER `width`"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `image` ADD `height` int(4) unsigned DEFAULT 0 AFTER `width`"; + $retval &= Dba::write($sql); } return $retval; @@ -3342,8 +3378,8 @@ class Update { $retval = true; - $sql = "ALTER TABLE `image` CHANGE COLUMN `image` `image` MEDIUMBLOB NULL DEFAULT NULL" ; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `image` CHANGE COLUMN `image` `image` MEDIUMBLOB NULL DEFAULT NULL" ; + $retval &= Dba::write($sql); return $retval; } @@ -3359,10 +3395,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('upload_allow_remove','1','Upload: allow users to remove uploaded songs',75,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3378,24 +3414,24 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('custom_login_logo','','Custom login page logo url',75,'string','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('custom_favicon','','Custom favicon url',75,'string','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; + $retval &= Dba::write($sql, array($id)); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('custom_text_footer','','Custom text footer',75,'string','interface')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3411,10 +3447,10 @@ class Update $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('webdav_backend','0','Use WebDAV backend',100,'boolean','system')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3439,7 +3475,7 @@ class Update "`user` int(11) unsigned NULL," . "`creation_date` int(11) unsigned NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `label_asso` (" . "`id` int(11) unsigned NOT NULL AUTO_INCREMENT," . @@ -3447,7 +3483,7 @@ class Update "`artist` int(11) unsigned NOT NULL," . "`creation_date` int(11) unsigned NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); return $retval; } @@ -3470,7 +3506,7 @@ class Update "`is_read` tinyint(1) unsigned NOT NULL DEFAULT '0'," . "`creation_date` int(11) unsigned NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "CREATE TABLE `user_follower` (" . "`id` int(11) unsigned NOT NULL AUTO_INCREMENT," . @@ -3478,14 +3514,14 @@ class Update "`follow_user` int(11) unsigned NOT NULL," . "`follow_date` int(11) unsigned NULL," . "PRIMARY KEY (`id`)) ENGINE = MYISAM"; - $retval = Dba::write($sql) ? $retval : false; + $retval &= Dba::write($sql); $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . "VALUES ('notify_email','0','Receive notifications by email (shouts, private messages, ...)',25,'boolean','options')"; - $retval = Dba::write($sql) ? $retval : false; - $id = Dba::insert_id(); - $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; - $retval = Dba::write($sql, array($id)) ? $retval : false; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'0')"; + $retval &= Dba::write($sql, array($id)); return $retval; } @@ -3499,8 +3535,269 @@ class Update { $retval = true; - $sql = "ALTER TABLE `user` ADD COLUMN `fullname_public` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'"; - $retval = Dba::write($sql) ? $retval : false; + $sql = "ALTER TABLE `user` ADD COLUMN `fullname_public` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'"; + $retval &= Dba::write($sql); + + return $retval; + } + + /** + * update_370036 + * + * Add field for track number when generating streaming playlists + */ + public static function update_370036() + { + $retval = true; + + $sql = "ALTER TABLE `stream_playlist` ADD COLUMN `track_num` SMALLINT( 5 ) DEFAULT '0'"; + $retval &= Dba::write($sql); + + return $retval; + } + + /** + * update_370037 + * + * Delete http_port preference (use ampache.cfg.php configuration instead) + */ + public static function update_370037() + { + $retval = true; + + $sql = "DELETE FROM `preference` WHERE `name` = 'http_port'"; + $retval &= Dba::write($sql); + + return $retval; + } + + /** + * update_370038 + * + * Add theme color option + */ + public static function update_370038() + { + $retval = true; + + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('theme_color','dark','Theme color',0,'special','interface')"; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'dark')"; + $retval &= Dba::write($sql, array($id)); + + return $retval; + } + + /** + * update_370039 + * + * Renamed false named sample_rate option name in preference table + */ + public static function update_370039() + { + $retval = true; + + $sql = "UPDATE `preference` SET `name` = 'transcode_bitrate' WHERE `preference`.`name` = 'sample_rate'"; + $retval &= Dba::write($sql); + + return $retval; + } + + /** + * update_370040 + * + * Add user_activity table + */ + public static function update_370040() + { + $retval = true; + + $sql = "CREATE TABLE `user_activity` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , " . + "`user` INT( 11 ) NOT NULL , " . + "`action` varchar(20) NOT NULL , " . + "`object_id` INT( 11 ) UNSIGNED NOT NULL , " . + "`object_type` VARCHAR( 32 ) NOT NULL, " . + "`activity_date` INT( 11 ) UNSIGNED NOT NULL" . + ") ENGINE = MYISAM"; + $retval &= Dba::write($sql); + + return $retval; + } + + /** + * update_370041 + * + * Add Metadata tables and preferences + */ + public static function update_370041() + { + $retval = true; + + $sql = "CREATE TABLE `metadata_field` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , " . + "`name` varchar(255) NOT NULL , " . + "`public` tinyint(1) NOT NULL , " . + "UNIQUE KEY `name` (`name`) " . + ") ENGINE = MYISAM"; + $retval &= Dba::write($sql); + + $sql = "CREATE TABLE `metadata` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , " . + "`object_id` INT( 11 ) UNSIGNED NOT NULL , " . + "`field` INT( 11 ) UNSIGNED NOT NULL , " . + "`data` text COLLATE utf8_unicode_ci NOT NULL , " . + "`type` varchar(50) CHARACTER SET utf8 DEFAULT NULL , " . + "KEY `field` (`field`) , " . + "KEY `object_id` (`object_id`) , " . + "KEY `type` (`type`) , " . + "KEY `objecttype` (`object_id`,`type`) , " . + "KEY `objectfield` (`object_id`,`field`,`type`) " . + ") ENGINE = MYISAM"; + $retval &= Dba::write($sql); + + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('disabled_custom_metadata_fields','','Disable custom metadata fields (ctrl / shift click to select multiple)',100,'string','system')"; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; + $retval &= Dba::write($sql, array($id)); + + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('disabled_custom_metadata_fields_input','','Disable custom metadata fields. Insert them in a comma separated list. They will add to the fields selected above.',100,'string','system')"; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'')"; + $retval &= Dba::write($sql, array($id)); + + return $retval; + } + + /** + * update_380001 + * + * Add podcasts + */ + public static function update_380001() + { + $retval = true; + + $sql = "CREATE TABLE `podcast` (`id` int( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , " . + "`feed` varchar(4096) NOT NULL , " . + "`catalog` int(11) NOT NULL , " . + "`title` varchar(255) CHARACTER SET utf8 NOT NULL , " . + "`website` varchar(255) NULL , " . + "`description` varchar(4096) CHARACTER SET utf8 NULL , " . + "`language` varchar(5) NULL , " . + "`copyright` varchar(64) NULL , " . + "`generator` varchar(64) NULL , " . + "`lastbuilddate` int(11) UNSIGNED DEFAULT '0' NOT NULL , " . + "`lastsync` int(11) UNSIGNED DEFAULT '0' NOT NULL" . + ") ENGINE = MYISAM"; + $retval &= Dba::write($sql); + + $sql = "CREATE TABLE `podcast_episode` (`id` int( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , " . + "`title` varchar(255) CHARACTER SET utf8 NOT NULL , " . + "`guid` varchar(255) NOT NULL , " . + "`podcast` int(11) NOT NULL , " . + "`state` varchar(32) NOT NULL , " . + "`file` varchar(4096) CHARACTER SET utf8 NULL , " . + "`source` varchar(4096) NULL , " . + "`size` bigint(20) UNSIGNED DEFAULT '0' NOT NULL , " . + "`time` smallint(5) UNSIGNED DEFAULT '0' NOT NULL , " . + "`website` varchar(255) NULL , " . + "`description` varchar(4096) CHARACTER SET utf8 NULL , " . + "`author` varchar(64) NULL , " . + "`category` varchar(64) NULL , " . + "`played` tinyint(1) UNSIGNED DEFAULT '0' NOT NULL , " . + "`pubdate` int(11) UNSIGNED NOT NULL , " . + "`addition_time` int(11) UNSIGNED NOT NULL" . + ") ENGINE = MYISAM"; + $retval &= Dba::write($sql); + + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('podcast_keep','10','Podcast: # latest episodes to keep',100,'integer','system')"; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'10')"; + $retval &= Dba::write($sql, array($id)); + + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('podcast_new_download','1','Podcast: # episodes to download when new episodes are available',100,'integer','system')"; + $retval &= Dba::write($sql); + $id = Dba::insert_id(); + $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')"; + $retval &= Dba::write($sql, array($id)); + + $sql = "ALTER TABLE `rating` CHANGE `object_type` `object_type` ENUM ('artist','album','song','stream','video','playlist','tvshow','tvshow_season','podcast','podcast_episode') NULL"; + $retval &= Dba::write($sql); + + return $retval; + } + + /** + * update_380002 + * + * Add bookmarks + */ + public static function update_380002() + { + $retval = true; + + $sql = "CREATE TABLE `bookmark` (`id` int( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , " . + "`user` int(11) UNSIGNED NOT NULL , " . + "`position` int(11) UNSIGNED DEFAULT '0' NOT NULL , " . + "`comment` varchar(255) CHARACTER SET utf8 NOT NULL , " . + "`object_type` varchar(64) NOT NULL , " . + "`object_id` int(11) UNSIGNED NOT NULL , " . + "`creation_date` int(11) UNSIGNED DEFAULT '0' NOT NULL , " . + "`update_date` int(11) UNSIGNED DEFAULT '0' NOT NULL" . + ") ENGINE = MYISAM"; + $retval &= Dba::write($sql); + + return $retval; + } + + /** + * update_380003 + * + * Add unique constraint on tag_map table + */ + public static function update_380003() + { + $retval = true; + + $sql = "ALTER IGNORE TABLE `tag_map` ADD UNIQUE INDEX `UNIQUE_TAG_MAP` (`object_id`, `object_type`, `user`, `tag_id`)"; + $retval &= Dba::write($sql); + + return $retval; + } + + /** + * update_380004 + * + * Add preference subcategory + */ + public static function update_380004() + { + $retval = true; + + $sql = "ALTER TABLE `preference` ADD `subcatagory` varchar(128) CHARACTER SET utf8 DEFAULT NULL AFTER `catagory`"; + $retval &= Dba::write($sql); + + return $retval; + } + + /** + * update_380005 + * + * Add manual update flag on artist + */ + public static function update_380005() + { + $retval = true; + + $sql = "ALTER TABLE `artist` ADD COLUMN `manual_update` SMALLINT( 1 ) DEFAULT '0'"; + $retval &= Dba::write($sql); return $retval; } diff --git a/sources/lib/class/upload.class.php b/sources/lib/class/upload.class.php index 5943c6a..18146ff 100644 --- a/sources/lib/class/upload.class.php +++ b/sources/lib/class/upload.class.php @@ -2,21 +2,21 @@ /* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * - * LICENSE: GNU General Public License, version 2 (GPLv2) + * LICENSE: GNU Affero General Public License, version 3 (AGPLv3) * Copyright 2001 - 2015 Ampache.org * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License v2 - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see';
+ $fdate = date('m/d/Y H:i:s', $this->activity_date);
+ echo '
';
+ if ($user->f_avatar_mini) {
+ echo '' . $user->f_avatar_mini . ' ';
+ }
+ echo $fdate;
+ echo '
';
+
+ $descr = $user->f_link . ' ';
+ switch ($this->action) {
+ case 'shout':
+ $descr .= T_('commented on');
+ break;
+ case 'upload':
+ $descr .= T_('uploaded');
+ break;
+ case 'play':
+ $descr .= T_('played');
+ break;
+ case 'userflag':
+ $descr .= T_('favorited');
+ break;
+ case 'follow':
+ $descr .= T_('started to follow');
+ break;
+ default:
+ $descr .= T_('did something on');
+ break;
+ }
+ $descr .= ' ' . $libitem->f_link;
+ echo '';
+ echo $descr;
+
+ if (Core::is_library_item($this->object_type)) {
+ echo ' ';
+ $libitem->display_art(10);
+ }
+ echo '
';
+
+ echo ''; + } // show +} //end useractivity class + diff --git a/sources/lib/class/userflag.class.php b/sources/lib/class/userflag.class.php index bb1535f..a276e3d 100644 --- a/sources/lib/class/userflag.class.php +++ b/sources/lib/class/userflag.class.php @@ -2,21 +2,21 @@ /* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * - * LICENSE: GNU General Public License, version 2 (GPLv2) + * LICENSE: GNU Affero General Public License, version 3 (AGPLv3) * Copyright 2001 - 2015 Ampache.org * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License v2 - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see
"); @@ -390,34 +394,54 @@ class vainfo $info['replaygain_album_gain'] = $info['replaygain_album_gain'] ?: floatval($tags['replaygain_album_gain']); $info['replaygain_album_peak'] = $info['replaygain_album_peak'] ?: floatval($tags['replaygain_album_peak']); - $info['track'] = $info['track'] ?: intval($tags['track']); - $info['resolution_x'] = $info['resolution_x'] ?: intval($tags['resolution_x']); - $info['resolution_y'] = $info['resolution_y'] ?: intval($tags['resolution_y']); - $info['display_x'] = $info['display_x'] ?: intval($tags['display_x']); - $info['display_y'] = $info['display_y'] ?: intval($tags['display_y']); - $info['frame_rate'] = $info['frame_rate'] ?: floatval($tags['frame_rate']); + $info['track'] = $info['track'] ?: intval($tags['track']); + $info['resolution_x'] = $info['resolution_x'] ?: intval($tags['resolution_x']); + $info['resolution_y'] = $info['resolution_y'] ?: intval($tags['resolution_y']); + $info['display_x'] = $info['display_x'] ?: intval($tags['display_x']); + $info['display_y'] = $info['display_y'] ?: intval($tags['display_y']); + $info['frame_rate'] = $info['frame_rate'] ?: floatval($tags['frame_rate']); $info['video_bitrate'] = $info['video_bitrate'] ?: intval($tags['video_bitrate']); - $info['audio_codec'] = $info['audio_codec'] ?: trim($tags['audio_codec']); - $info['video_codec'] = $info['video_codec'] ?: trim($tags['video_codec']); - $info['description'] = $info['description'] ?: trim($tags['description']); + $info['audio_codec'] = $info['audio_codec'] ?: trim($tags['audio_codec']); + $info['video_codec'] = $info['video_codec'] ?: trim($tags['video_codec']); + $info['description'] = $info['description'] ?: trim($tags['description']); - $info['tvshow'] = $info['tvshow'] ?: trim($tags['tvshow']); - $info['tvshow_year'] = $info['tvshow_year'] ?: trim($tags['tvshow_year']); - $info['tvshow_season'] = $info['tvshow_season'] ?: trim($tags['tvshow_season']); + $info['tvshow'] = $info['tvshow'] ?: trim($tags['tvshow']); + $info['tvshow_year'] = $info['tvshow_year'] ?: trim($tags['tvshow_year']); + $info['tvshow_season'] = $info['tvshow_season'] ?: trim($tags['tvshow_season']); $info['tvshow_episode'] = $info['tvshow_episode'] ?: trim($tags['tvshow_episode']); - $info['release_date'] = $info['release_date'] ?: trim($tags['release_date']); - - $info['tvshow_art'] = $info['tvshow_art'] ?: trim($tags['tvshow_art']); + $info['release_date'] = $info['release_date'] ?: trim($tags['release_date']); + $info['summary'] = $info['summary'] ?: trim($tags['summary']); + $info['tvshow_summary'] = $info['tvshow_summary'] ?: trim($tags['tvshow_summary']); + + $info['tvshow_art'] = $info['tvshow_art'] ?: trim($tags['tvshow_art']); $info['tvshow_season_art'] = $info['tvshow_season_art'] ?: trim($tags['tvshow_season_art']); - $info['art'] = $info['art'] ?: trim($tags['art']); + $info['art'] = $info['art'] ?: trim($tags['art']); + + if (AmpConfig::get('enable_custom_metadata') && is_array($tags)) { + // Add rest of the tags without typecast to the array + foreach ($tags as $tag => $value) { + if (!isset($info[$tag]) && !is_array($value)) { + $info[$tag] = (!is_array($value)) ? trim($value) : $value; + } + } + } } - + // Some things set the disk number even though there aren't multiple if ($info['totaldisks'] == 1 && $info['disk'] == 1) { unset($info['disk']); unset($info['totaldisks']); } + // Determine the correct file size, do not get fooled by the size which may be returned by id3v2! + if (isset($results['general']['size'])) { + $size = $results['general']['size']; + } else { + $size = Core::get_filesize(Core::conv_lc_file($filename)); + } + + $info['size'] = $info['size'] ?: $size; + return $info; } @@ -536,7 +560,7 @@ class vainfo $results['general'] = $this->_parse_general($this->_raw); - $cleaned = self::clean_tag_info($results, self::get_tag_type($results, 'getid3_tag_order'), $this->filename); + $cleaned = self::clean_tag_info($results, self::get_tag_type($results, 'getid3_tag_order'), $this->filename); $cleaned['raw'] = $results; return $cleaned; @@ -571,7 +595,7 @@ class vainfo $plugin_names = Plugin::get_plugins('get_metadata'); foreach ($tag_order as $tag_source) { if (in_array($tag_source, $plugin_names)) { - $plugin = new Plugin($tag_source); + $plugin = new Plugin($tag_source); $installed_version = Plugin::get_plugin_version($plugin->_plugin->name); if ($installed_version) { if ($plugin->load($GLOBALS['user'])) { @@ -591,26 +615,31 @@ class vainfo private function _parse_general($tags) { $parsed = array(); + + if ((in_array('movie', $this->gather_types)) || (in_array('tvshow', $this->gather_types))) { + $parsed['title'] = $this->formatVideoName(urldecode($this->_pathinfo['filename'])); + } else { + $parsed['title'] = urldecode($this->_pathinfo['filename']); + } - $parsed['title'] = urldecode($this->_pathinfo['filename']); - $parsed['mode'] = $tags['audio']['bitrate_mode']; + $parsed['mode'] = $tags['audio']['bitrate_mode']; if ($parsed['mode'] == 'con') { $parsed['mode'] = 'cbr'; } - $parsed['bitrate'] = $tags['audio']['bitrate']; - $parsed['channels'] = intval($tags['audio']['channels']); - $parsed['rate'] = intval($tags['audio']['sample_rate']); - $parsed['size'] = $this->_forcedSize ?: $tags['filesize']; - $parsed['encoding'] = $tags['encoding']; - $parsed['mime'] = $tags['mime_type']; - $parsed['time'] = ($this->_forcedSize ? ((($this->_forcedSize - $tags['avdataoffset']) * 8) / $tags['bitrate']) : $tags['playtime_seconds']); - $parsed['audio_codec'] = $tags['audio']['dataformat']; - $parsed['video_codec'] = $tags['video']['dataformat']; - $parsed['resolution_x'] = $tags['video']['resolution_x']; - $parsed['resolution_y'] = $tags['video']['resolution_y']; - $parsed['display_x'] = $tags['video']['display_x']; - $parsed['display_y'] = $tags['video']['display_y']; - $parsed['frame_rate'] = $tags['video']['frame_rate']; + $parsed['bitrate'] = $tags['audio']['bitrate']; + $parsed['channels'] = intval($tags['audio']['channels']); + $parsed['rate'] = intval($tags['audio']['sample_rate']); + $parsed['size'] = $this->_forcedSize ?: $tags['filesize']; + $parsed['encoding'] = $tags['encoding']; + $parsed['mime'] = $tags['mime_type']; + $parsed['time'] = ($this->_forcedSize ? ((($this->_forcedSize - $tags['avdataoffset']) * 8) / $tags['bitrate']) : $tags['playtime_seconds']); + $parsed['audio_codec'] = $tags['audio']['dataformat']; + $parsed['video_codec'] = $tags['video']['dataformat']; + $parsed['resolution_x'] = $tags['video']['resolution_x']; + $parsed['resolution_y'] = $tags['video']['resolution_y']; + $parsed['display_x'] = $tags['video']['display_x']; + $parsed['display_y'] = $tags['video']['display_y']; + $parsed['frame_rate'] = $tags['video']['frame_rate']; $parsed['video_bitrate'] = $tags['video']['bitrate']; if (isset($tags['ape'])) { @@ -745,8 +774,8 @@ class vainfo $parsed['track'] = $data[0]; break; case 'discnumber': - $elements = explode('/', $data[0]); - $parsed['disk'] = $elements[0]; + $elements = explode('/', $data[0]); + $parsed['disk'] = $elements[0]; $parsed['totaldisks'] = $elements[1]; break; case 'date': @@ -817,13 +846,17 @@ class vainfo $parsed['genre'] = $this->parseGenres($data); break; case 'part_of_a_set': - $elements = explode('/', $data[0]); - $parsed['disk'] = $elements[0]; + $elements = explode('/', $data[0]); + $parsed['disk'] = $elements[0]; $parsed['totaldisks'] = $elements[1]; break; case 'track_number': $parsed['track'] = $data[0]; break; + case 'comment': + // First array key can be xFF\xFE in case of UTF-8, better to get it this way + $parsed['comment'] = reset($data); + break; case 'comments': $parsed['comment'] = $data[0]; break; @@ -897,8 +930,13 @@ class vainfo $parsed['rating'][$user->id] = $popm['rating'] / 255 * 5; } } + // Rating made by an unknow user, adding it to super user (id=-1) + else { + $parsed['rating'][-1] = $popm['rating'] / 255 * 5; + } } } + return $parsed; } @@ -956,7 +994,7 @@ class vainfo $parsed['mb_artistid'] = $data[0]; break; case 'MusicBrainz Album Type': - $parsed['release_type'] = $data[0]; + $parsed['release_type'] = $data[0]; break; case 'track_number': $parsed['track'] = $data[0]; @@ -984,55 +1022,140 @@ class vainfo return $parsed; } - /** - * _parse_filename - * * This function uses the file and directory patterns to pull out extra tag * information. + * parses TV show name variations: + * 1. title.[date].S#[#]E#[#].ext (Upper/lower case) + * 2. title.[date].#[#]X#[#].ext (both upper/lower case letters + * 3. title.[date].Season #[#] Episode #[#].ext + * 4. title.[date].###.ext (maximum of 9 seasons) + * parse directory path for name, season and episode numbers + * /TV shows/show name [(year)]/[season ]##/##.Episode.Title.ext + * parse movie names: + * title.[date].ext + * /movie title [(date)]/title.ext */ - private function _parse_filename($filename) + private function _parse_filename($filepath) { - $origin = $filename; + $origin = $filepath; $results = array(); - - if (in_array('music', $this->gather_types) || in_array('clip', $this->gather_types)) { - // Correctly detect the slash we need to use here - if (strpos($filename, '/') !== false) { - $slash_type = '/'; - $slash_type_preg = $slash_type; + if (strpos($filepath, '/') !== false) { + $slash_type = '/'; + $slash_type_preg = $slash_type; + } else { + $slash_type = "\\"; + $slash_type_preg = $slash_type . $slash_type; + } + $file = pathinfo($filepath,PATHINFO_FILENAME); + + if (in_array('tvshow', $this->gather_types)) { + $season = array(); + $episode = array(); + $tvyear = array(); + $temp = array(); + preg_match("~(?<=\(\[\<\{)[1|2][0-9]{3}|[1|2][0-9]{3}~", $filepath,$tvyear); + $results['year'] = !empty($tvyear) ? intval($tvyear[0]) : null; + + if (preg_match("~[Ss](\d+)[Ee](\d+)~", $file, $seasonEpisode)) { + $temp = preg_split("~(((\.|_|\s)[Ss]\d+(\.|_)*[Ee]\d+))~",$file,2); + preg_match("~(?<=[Ss])\d+~", $file, $season); + preg_match("~(?<=[Ee])\d+~", $file, $episode); } else { - $slash_type = '\\'; - $slash_type_preg = $slash_type . $slash_type; + if (preg_match("~[\_\-\.\s](\d{1,2})[xX](\d{1,2})~", $file, $seasonEpisode)) { + $temp = preg_split("~[\.\_\s\-\_]\d+[xX]\d{2}[\.\s\-\_]*|$~",$file); + preg_match("~\d+(?=[Xx])~", $file, $season); + preg_match("~(?<=[Xx])\d+~", $file, $episode); + } else { + if (preg_match("~[S|s]eason[\_\-\.\s](\d+)[\.\-\s\_]?\s?[e|E]pisode[\s\-\.\_]?(\d+)[\.\s\-\_]?~", $file, $seasonEpisode)) { + $temp = preg_split("~[\.\s\-\_][S|s]eason[\s\-\.\_](\d+)[\.\s\-\_]?\s?[e|E]pisode[\s\-\.\_](\d+)([\s\-\.\_])*~",$file,3); + preg_match("~(?<=[Ss]eason[\.\s\-\_])\d+~", $file, $season); + preg_match("~(?<=[Ee]pisode[\.\s\-\_])\d+~", $file, $episode); + } else { + if (preg_match("~[\_\-\.\s](\d)(\d\d)[\_\-\.\s]*~", $file, $seasonEpisode)) { + $temp = preg_split("~[\.\s\-\_](\d)(\d\d)[\.\s\-\_]~",$file); + $season[0] = $seasonEpisode[1]; + if (preg_match("~[\_\-\.\s](\d)(\d\d)[\_\-\.\s]~", $file, $seasonEpisode)) { + $temp = preg_split("~[\.\s\-\_](\d)(\d\d)[\.\s\-\_]~",$file); + $season[0] = $seasonEpisode[1]; + $episode[0] = $seasonEpisode[2]; + } + } + } + } + } + + $results['tvshow_season'] = $season[0]; + $results['tvshow_episode'] = $episode[0]; + $results['tvshow'] = $this->formatVideoName($temp[0]); + $results['original_name'] = $this->formatVideoName($temp[1]); + + // Try to identify the show information from parent folder + if (!$results['tvshow']) { + $folders = preg_split("~" . $slash_type . "~", $filepath, -1, PREG_SPLIT_NO_EMPTY); + if ($results['tvshow_season'] && $results['tvshow_episode']) { + // We have season and episode, we assume parent folder is the tvshow name + $filetitle = end($folders); + $results['tvshow'] = $this->formatVideoName($filetitle); + } else { + // Or we assume each parent folder contains one missing information + if (preg_match('/[\/\\\\]([^\/\\\\]*)[\/\\\\]Season (\d{1,2})[\/\\\\]((E|Ep|Episode)\s?(\d{1,2})[\/\\\\])?/i', $filepath, $matches)) { + if ($matches != null) { + $results['tvshow'] = $this->formatVideoName($matches[1]); + $results['tvshow_season'] = $matches[2]; + if (isset($matches[5])) { + $results['tvshow_episode'] = $matches[5]; + } else { + //match pattern like 10.episode name.mp4 + if (preg_match("~^(\d\d)[\_\-\.\s]?(.*)~", $file, $matches)) { + $results['tvshow_episode'] = $matches[1]; + $results['original_name'] = $this->formatVideoName($matches[2]); + } else { + //Fallback to match any 3-digit Season/Episode that fails the standard pattern above. + preg_match("~(\d)(\d\d)[\_\-\.\s]?~", $file, $matches); + $results['tvshow_episode'] = $matches[2]; + } + } + } + } + } } + $results['title'] = $results['tvshow']; + } + + if (in_array('movie', $this->gather_types)) { + $results['original_name'] = $results['title'] = $this->formatVideoName($file); + } + + if (in_array('music', $this->gather_types) || in_array('clip', $this->gather_types)) { // Combine the patterns $pattern = preg_quote($this->_dir_pattern) . $slash_type_preg . preg_quote($this->_file_pattern); - + // Remove first left directories from filename to match pattern $cntslash = substr_count($pattern, preg_quote($slash_type)) + 1; - $filepart = explode($slash_type, $filename); + $filepart = explode($slash_type, $filepath); if (count($filepart) > $cntslash) { - $filename = implode($slash_type, array_slice($filepart, count($filepart) - $cntslash)); + $filepath = implode($slash_type, array_slice($filepart, count($filepart) - $cntslash)); } - + // Pull out the pattern codes into an array preg_match_all('/\%\w/', $pattern, $elements); - + // Mangle the pattern by turning the codes into regex captures $pattern = preg_replace('/\%[Ty]/', '([0-9]+?)', $pattern); $pattern = preg_replace('/\%\w/', '(.+?)', $pattern); $pattern = str_replace('/', '\/', $pattern); $pattern = str_replace(' ', '\s', $pattern); $pattern = '/' . $pattern . '\..+$/'; - + // Pull out our actual matches - preg_match($pattern, $filename, $matches); + preg_match($pattern, $filepath, $matches); if ($matches != null) { // The first element is the full match text $matched = array_shift($matches); - debug_event('vainfo', $pattern . ' matched ' . $matched . ' on ' . $filename, 5); - + debug_event('vainfo', $pattern . ' matched ' . $matched . ' on ' . $filepath, 5); + // Iterate over what we found foreach ($matches as $key => $value) { $new_key = translate_pattern_code($elements['0'][$key]); @@ -1041,162 +1164,34 @@ class vainfo } } - $results['title'] = $results['title'] ?: basename($filename); + $results['title'] = $results['title'] ?: basename($filepath); if ($this->islocal) { $results['size'] = Core::get_filesize(Core::conv_lc_file($origin)); } } } - - if (in_array('tvshow', $this->gather_types)) { - $pathinfo = pathinfo($filename); - $filetitle = $pathinfo['filename']; - - $results = array_merge($results, $this->parseEpisodeName($filetitle)); - if (!$results['tvshow']) { - // Try to identify the show information from parent folder - $filetitle = basename($pathinfo['dirname']); - $results = array_merge($results, $this->parseEpisodeName($filetitle)); - - if (!$results['tvshow']) { - if ($results['tvshow_season'] && $results['tvshow_episode']) { - // We have season and episode, we assume parent folder is the tvshow name - $pathinfo = pathinfo($pathinfo['dirname']); - $filetitle = basename($pathinfo['dirname']); - $results['tvshow'] = $this->fixSerieName($filetitle); - } else { - // Or we assume each parent folder contains one missing information - if (preg_match('/[\/\\\\]([^\/\\\\]*)[\/\\\\]Season (\d{1,2})[\/\\\\]((E|Ep|Episode)\s?(\d{1,2})[\/\\\\])?/i', $filename, $matches)) { - if ($matches != null) { - $results['tvshow'] = $this->fixSerieName($matches[1]); - $results['tvshow_season'] = $matches[2]; - if (isset($matches[5])) { - $results['tvshow_episode'] = $matches[5]; - } - } - } - } - } - } - } - - if (in_array('movie', $this->gather_types)) { - $pathinfo = pathinfo($filename); - $filetitle = $pathinfo['filename']; - $results['title'] = $this->fixVideoReleaseName($filetitle); - if (!$results['title']) { - // Try to identify the movie information from parent folder - $filetitle = basename($pathinfo['dirname']); - $results['title'] = $this->fixVideoReleaseName($filetitle); - } - } - return $results; } - - private function parseEpisodeName($filetitle) + + private function removeCommonAbbreviations($name) { - $patterns = array( - '/(.*)s(\d\d)e(\d\d)(\D.*)/i', - '/(.*)s(\d\d)(\D)(.*)/i', - '/(.*)\D(\d{1,2})x(\d\d)(\D)(.*)/i', - '/(.*)\D(\d{1,2})x(\d\d)$/i', - '/(\D*)[\.|\-|_](\d)(\d\d)([\.|\-|_]\D.*)/i', - '/(\D*)(\d)[^0-9](\d\d)(\D.*)/i' - ); + $abbr = explode(",",AmpConfig::get('common_abbr')); + $commonabbr = preg_replace("~\n~", '',$abbr); + $commonabbr[] = '[1|2][0-9]{3}'; //Remove release year - $results = array(); - for ($i=0;$i
" "you have to 'Make it ready' on the catalog table." msgstr "" -#: ../../modules/catalog/dropbox.catalog.php:116 -#: ../../templates/show_account.inc.php:93 -#: ../../templates/show_edit_user.inc.php:129 +#: ../../modules/catalog/dropbox/dropbox.catalog.php:114 +#: ../../templates/show_account.inc.php:109 +#: ../../templates/show_edit_user.inc.php:132 msgid "API Key" msgstr "" -#: ../../modules/catalog/dropbox.catalog.php:117 -#: ../../modules/catalog/soundcloud.catalog.php:114 +#: ../../modules/catalog/dropbox/dropbox.catalog.php:115 +#: ../../modules/catalog/soundcloud/soundcloud.catalog.php:107 #: ../../templates/show_add_share.inc.php:35 msgid "Secret" msgstr "" -#: ../../modules/catalog/dropbox.catalog.php:118 -#: ../../modules/catalog/local.catalog.php:111 +#: ../../modules/catalog/dropbox/dropbox.catalog.php:116 +#: ../../modules/catalog/local/local.catalog.php:104 #: ../../templates/show_stats.inc.php:71 msgid "Path" msgstr "مسار" -#: ../../modules/catalog/dropbox.catalog.php:119 +#: ../../modules/catalog/dropbox/dropbox.catalog.php:117 msgid "Get chunked files on analyze" msgstr "" -#: ../../modules/catalog/dropbox.catalog.php:178 -#, fuzzy +#: ../../modules/catalog/dropbox/dropbox.catalog.php:176 msgid "Error: API Key and Secret Required for Dropbox Catalogs" -msgstr "بعد لالكتالوجات" +msgstr "" -#: ../../modules/catalog/dropbox.catalog.php:184 +#: ../../modules/catalog/dropbox/dropbox.catalog.php:182 msgid "Invalid