modification: phpwebgallery.net moves to piwigo.org

modification: doc/README_*.txt much simpler with link to piwigo.org for
installation and upgrade guides.

modification: latest_version has changed its path on the website to download
directory.

deletion: doc/ChangeLog was useless and outdated.


git-svn-id: http://piwigo.org/svn/branches/2.0@3132 68402e56-0260-453c-a942-63ccdbb3a9ee

22 files changed, 60 insertions, 968 deletions

diff --git a/admin/intro.php b/admin/intro.php
index 254896878..9d37a1b30 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -42,7 +42,7 @@ check_status(ACCESS_ADMINISTRATOR);
 // Check for upgrade : code inspired from punbb
 if (isset($_GET['action']) and 'check_upgrade' == $_GET['action'])
 {
-  if (!fetchRemote(PHPWG_URL.'/latest_version', $result))
+  if (!fetchRemote(PHPWG_URL.'/download/latest_version', $result))
   {
     array_push($page['errors'], l10n('Unable to check for upgrade.'));
   }
diff --git a/doc/ChangeLog b/doc/ChangeLog
deleted file mode 100644
index 7c9c084d7..000000000
--- a/doc/ChangeLog
+++ /dev/null
@@ -1,822 +0,0 @@
-2005-11-07 Pierrick LE GALL
-	
-	* bug 180 fixed: remote_site.tpl doesn't validate.
-
-	* translation bug fixed: generate_file_listing.php doesn't exist,
-	it's create_listing_file.php !
-
-2005-11-07 Pierrick LE GALL
-
-	* bug 184 fixed: for the third time...
-
-2005-11-07 Pierrick LE GALL
-
-	* improvement: use a "filter" form for adding user comments.
-
-2005-11-05 Pierrick LE GALL
-
-	* bug 186 fixed: useless template theme icons deleted. Remaining
-	icons in GIF converted to PNG.
-
-2005-10-31 Pierrick LE GALL
-
-	* bug 185 fixed: errors in language items.
-
-2005-10-31 Pierrick LE GALL
-
-	* modification: use "filter" class for quickconnect box (with some
-	custom modifications)
-
-	* bug fixed: the total number of pictures had disappeared
-
-2005-10-30 volcom
-	
-	* bug 190 fixed: issue in stats.tpl display
-	* bug fixed: labels of monthly, daily graph fixed
-
-2005-10-26 chrisaga
-
-	* bug 177 fixed: for Safari (was fixed for Konqueror only)
-
-2005-10-25 Pierrick LE GALL
-
-	* bug 183 fixed: Warning when trying to associate an image with an
-	already associated category. Just coded the TODO instructions I
-	had let some time ago.
-
-2005-10-23 chrisaga
-
-	* bug 184 fixed: .png button left aligned in IE
-
-2005-10-23 Pierrick LE GALL
-
-	* bug 182 fixed: newly created user is not displayed in the user
-	list.
-
-2005-10-23 Pierrick LE GALL
-
-	* bug fixed: during file tree synchronization, warning on finding
-	the next rank of category which has no sub-categories yet.
-	
-2005-10-23 chrisaga
-
-	* bug fixed: cat-list.tpl validate now
-
-	* improvement: removed some unnecessary css rules from old tests in 
-	FROM  design in file default-layout.css
-
-2005-10-23 Pierrick LE GALL
-
-	* bug 181 fixed: "Parameters not created in phpwebgallery_config
-	during upgrade". gallery_title and gallery_description had not
-	been added to config table. (use|show)_(exif|iptc) and
-	authorize_remembering have also been removed...
-
-2005-10-22 chrisaga
-
-	* bug 177 fixed: icon tools wrong position in Safari and Konqueror
-	Needed a little trick to fix it. Put the trick in a fix-khtml.css
-	Loading in header.tpl and protected from IE, Geko and Opera,
-	just in case (couldn't found a safari css-only filter wich validate)
-	
-	* bug fixed: issue in the FORM in remote_site.tpl which prevented
-	HTML validation (still something to do with the TABLE).
-
-2005-10-22 Pierrick LE GALL
-
-	* bug fixed: link on a single day in
-	Administration>General>History was missing
-
-2005-10-22 Pierrick LE GALL
-
-	* bug 173 fixed: due to phpBB user identifiers management, the
-	method to find the next user identifier has changer to MAX+1.
-
-	* improvement: information message when new user added
-
-	* bug fixed: language item "Username" used instead of "login".
-	
-2005-10-20 chrisaga
-
-	* bug 176 fixed: need a javascript to handle transparent PNG
-	background in IE (tribute to Bob Osola
-	http://homepage.ntlworld.com/bobosola/index.htm)
-
-	* display: fixed another IE childselector bug in Categories
-	Management admin page and improved display of this page in all
-	browsers too.
-
-2005-10-18 Pierrick LE GALL
-
-	* bug 174 fixed: use_exif_mapping configuration parameter was not
-	used to list database fields to update from EXIF values.
-
-2005-10-18 Pierrick LE GALL
-
-	* bug 172 fixed: crash when changing password with an external
-	users table. The same kind of correction was also made in
-	picture.php and register.php.
-
-2005-10-18 Pierrick LE GALL
-
-	* bug 159 and 166 fixed: parameter "options" for mail() function
-	disabled by default.
-
-2005-10-18 chrisaga
-
-	* display : smaller font-size and, as requested, fonts more like 1.4
-
-	* bug 165 fixed : La largeur par défaut en PIXELS pas en Kb
-
-2005-10-18 chrisaga
-
-	* display : in group_list.tpl - wrong form class, mixed html tags, ...
-
-	* display : suppress bullets in admin->synchronize and checkbox
-	under select
-
-	* display : set standard font size to 12pt
-
-2005-10-17 Pierrick LE GALL
-
-	* improvement: use new function get_language_filepath in about.php
-	(complement of bug 168 correction)
-	
-2005-10-17 Pierrick LE GALL
-
-	* bug 154 fixed: "Calendar category, too precise dates". Bug came
-	from the bigger precision of creation_date and available_date in
-	images tables. Need to retrieve only the year-month-day
-	information.
-	
-2005-10-17 volcom
-
-	* new: history details by month,day
-	
-2005-10-15 Pierrick LE GALL
-
-	* modification: localized labels in Administration>Pictures>Caddie
-
-	* translation: bug fixed on special categories title in French
-
-	* translation: all help pages were translated in french
-
-2005-10-09 Pierrick LE GALL
-
-	* new: "quick start" section in Administration>General>Instructions
-	
-2005-10-08 Pierrick LE GALL
-
-	* translation: new items related to configuration parameters
-	gallery_title and gallery_description in GUI.
-
-2005-10-08 Pierrick LE GALL
-
-	* modification: configuration parameters gallery_title and
-	gallery_description are GUI managed in
-	Administration>Configuration>General
-
-	* bug fixed: configuration parameters (use|show)_(exif|iptc) and
-	authorize_remembering should have been deleted from config table
-	some time ago.
-	
-2005-10-08 Pierrick LE GALL
-
-	* new: mass virtual categories movement manager in
-	Administration>Categories>Move screen.
-
-2005-10-05 Pierrick LE GALL
-
-	* bug 160 fixed: (part one of the bug) hard coded column name of
-	users table had to be replaced by the configurable column
-	name. This correction was made by a full rewrite of filtered users
-	list management. The other bug (not submited in bugtracker) that
-	needed this rewrite was that when you choose "all" as target for
-	mass users modification, you expected to apply modification on
-	filtered users, not all users.
-
-	* bug 160 fixed: (part two of the bug) hard coded column name for
-	primary key in mass_updates function.
-
-	* modification: configuration parameter users_page is now located
-	in the correct file (include/config_default.inc.php instead of
-	admin/user_list.php)
-
-2005-09-27 Pierrick LE GALL
-	
-	* bug 168 fixed: crash when language file does not
-	exists. Constant PHPWG_DEFAULT_LANGUAGE added. New function
-	get_language_filepath always used to find language files.
-
-2005-09-26 Pierrick LE GALL
-
-	* bug 158 fixed: display error on "double selects" screens (with
-	MSIE, strange behavior). VDigital modification optimizes width
-	usage :-)
-
-2005-09-25 Pierrick LE GALL
-
-	* bug 163 fixed: link error when cookies disabled in admin/stats
-
-2005-09-24 Pierrick LE GALL
-
-	* bug fixed: HTML error on nested UL in categories menu.
-
-	* bug 161 fixed: guest_id not taken into account for history table
-	insert.
-
-	* bug 164 fixed: category inserted in history table becomes too
-	long if HTML tags are kept.
-
-2005-09-24 Pierrick LE GALL
-
-	* bug 162 fixed: division by zero when trying to view "all" items
-	in admin/element_set_(global|unit)
-
-	* bug 156 fixed: error when selection is empty was not catched.
-	
-2005-09-21 Pierrick LE GALL
-
-	* bug 151 fixed: default maxheight was not proposed as "set to"
-	option in admin/user_list
-
-2005-09-21 Pierrick LE GALL
-
-	* bug 150 fixed: in category permissions management, wrong column
-	name when using an external users table.
-
-2005-09-20 Pierrick LE GALL
-
-	* update: upgrade from 1.4.0 or 1.4.1. Upgrade from 1.3.x is not
-	available anymore.
-
-	* update: README files updated for very near branch 1.5 :-)
-
-	* new: file tools/config_local.inc.php as example for optional
-	include/config_local.inc.php
-
-	* bug fixed: configuration parameter show_picture_name_on_title
-	was useless
-
-2005-09-18 Pierrick LE GALL
-
-	* bug 111 fixed: "Can't add virtual category when cookie
-	disabled". Correction reported from branch 1.4.
-
-	* bug 109 fixed : "disabled "best rated" menu item when rating is
-	not enabled". Correction reported from branch 1.4.
-
-	* bug 95 fixed : "default maxwidth and maxheight not registered
-	". Correction reported from branch 1.4.
-
-2005-09-18 Pierrick LE GALL
-
-	* bug 107 fixed: crash when logging visit on a category containing
-	"'" character. Correction reported from branch 1.4
-
-	* bug fixed: in admin/stats, incorrect SQL queries gave no result.
-
-2005-09-18 Pierrick LE GALL
-
-	* bug 101 fixed: "problem with IE search on keywords". correction
-	reported from branch 1.4
-
-2005-09-17 Pierrick LE GALL
-
-	* new: automatic new password sent by mail when requested by user
-
-2005-09-17 Pierrick LE GALL
-
-	* improvement: add information about how to use an external table
-	for users
-	
-	* bug fixed: uses user configuration fields for filtering in
-	admin/user_list
-
-	* bug fixed: don't try to create feeds automatically during
-	sync_users (when line in user_infos is missing)
-
-	* bug fixed: create_user_infos function gives status admin if user
-	id matches $conf['webmaster_id']
-
-2005-09-17 Pierrick LE GALL
-
-	* new: the number of elements waiting for validation is notified
-	in RSS feed.
-
-2005-09-17 Pierrick LE GALL
-
-	* translation: common and admin strings translated in french from
-	english files
-
-2005-09-14 Pierrick LE GALL
-
-	* improvement: long localized messages are in HTML files instead
-	of $lang array. This is the case of admin/help and about pages.
-
-	* deletion: of unused functions (ts_to_mysqldt, is_image,
-	TN_exists, check_date_format, date_convert,
-	get_category_directories, get_used_metadata_list, array_remove,
-	pwg_write_debug, get_group_restrictions,
-	get_all_group_restrictions, is_group_allowed, style_select,
-	deprecated_getAttribute).
-
-	* new: many new contextual help pages to replace descriptions
-	previously included in pages.
-
-	* modification: reorganisation of language files. Deletion of
-	unused language keys, alphabetical sort. No faq.lang.php anymore
-	(replaced by help.html). Only done for en_UK.iso-8859-1.
-
-2005-09-03 Pierrick LE GALL
-
-	* bug fixed : no display of first added element date in
-	admin/intro if no element in the gallery.
-
-2005-09-03 Pierrick LE GALL
-
-	* new : template yoga, made by yoDan, helped by chrisaga for
-	integration becomes the official template.
-
-2005-09-03 Pierrick LE GALL
-
-	* modification : less configuration parameters in administration
-	screen. These parameters are move to
-	include/config_default.inc.php.
-
-	* new : ability to add a single picture to caddie from picture.php
-
-	* new : contextual help, only a few pages are available.
-
-	* new : ability to delete users from admin/user_list
-
-	* modification : reorganization of configuration file
-
-	* new : configuration parameter use_exif_mapping
-
-	* improvement : MOD hidemail added to standard
-
-2005-08-26 Pierrick LE GALL
-
-	* new : HTML BODY identifier to let CSS stylesheets manage
-	specific behaviour.
-
-	* deletion : admin/search useless
-
-	* improvement : in admin/user_list, special behaviour for
-	true/false fields (expand, show_comments)
-
-	* new : gallery_title and gallery_description are displayed at the
-	top of each page.
-
-	* improvement : simplification in HTML for categories menu.
-
-	* improvement : standardization of presentation in all public
-	pages (identification, registration, search, profile,
-	notification, comments, etc.)
-
-2005-08-25 Pierrick LE GALL
-
-	* deletion : no mail notification anymore. Feature replaced by RSS
-	feed notification.
-
-	* improvement : on waiting pictures management. Ability to
-	validate all or reject all in one clic.
-
-2005-08-21 Pierrick LE GALL
-
-	* modification : adaptation of template variables and blocks in
-	comments page to display comment by comment instead of picture by
-	picture.
-
-2005-08-20 Pierrick LE GALL
-
-	* improvement : dedicated page for user comments validation/reject
-	in administration. (screen is not shared with public part of the
-	gallery). Ability to validate all or reject all in one clic.
-
-2005-08-19 Pierrick LE GALL
-
-	* improvement : less compact presentation of screen
-	admin/element_set_unit.
-
-2005-08-19 Pierrick LE GALL
-
-	* improvement : standardization of categories navigation bar on
-	top of administration screen element_set_(global|unit),
-	cat_modify, cat_list, cat_perm.
-
-	* new : direct link to admin/cat_modify from category.php.
-
-2005-08-19 Pierrick LE GALL
-
-	* modification : RSS feed work only with a given feed
-	identifier. Thus we can avoid fixed frequency notification to
-	concentrate on variable frequency notification, which is much more
-	interesting. To do this, feeds have moved to a dedicated table
-	allowing each user (including guest user) to have more than on
-	feed.
-	
-2005-08-18 Pierrick LE GALL
-
-	* bug 133 fixed : (report from branch 1.4) Deleting user favorites
-	is too restrictive. Instead of deleting a favorite because it
-	belongs to at least one forbidden category, a favorite is deleted
-	if it belongs to no authorized category (which was the expected
-	behaviour).
-
-2005-08-18 Pierrick LE GALL
-
-	* bug 134 fixed : "Nb of images incorectly rendered in "tool tip"
-	near category in category menu". Correction reported (and
-	improved) from branch 1.4
-
-2005-08-18 Pierrick LE GALL
-
-	* improvement : screen admin/picture_modify
-	rewritten. Presentation copied from admin/cat_modify : fieldsets
-	regroup fields. Ability to synchronize metadata for the displayed
-	item.
-
-	* bug 110 fixed : "return to element view from element edition
-	fails depending on permissions". If a reachable (for the connected
-	admin) category is available, a "jump to" link is displayed, by
-	default, using the category given in URL.
-
-	* bug fixed : in mass_updates function, the first item of
-	$fields['update'] has not always 0 for id (as in any array).
-
-	* modification : get_keywords function understands spaces as
-	separator, allow less than 3 chars keywords, allow quotes.
-
-	* new : ability to allow HTML in picture or category description
-	(false by default)
-
-2005-08-17 Pierrick LE GALL
-
-	* improvement : in admin/user_perm, already authorized categories
-	thanks to group associations are displayed and not taken into
-	account for user specific permissions.
-
-2005-08-17 Pierrick LE GALL
-
-	* modification : major simplification of admin.php. Titles are
-	managed by included page, localized items are managed directly in
-	the template.
-
-	* new : sub template admin/double_select is included in templates
-	admin/cat_options, admin/user_perm and admin/group_perm. I haven't
-	been able to use it in admin/picture_modify because it seems
-	impossible to have two instance of the same sub-template without
-	interfering.
-
-	* modification : bug 99, in profile manager, no auto submit when
-	changing language (useless and generate accessibility problem).
-
-	* improvement : HTML semantically correct for administration menu,
-	simpler syntax, less tags, correct tags (dl/dt/dd instead of
-	div/div).
-
-	* modification : number of waiting elements and unvalidated
-	comments are displayed in admin/intro instead of administration
-	menu (with a link to the dedicated pages).
-
-	* deletion : no link to profile from admin/user_list anymore (no
-	need).
-
-2005-08-16 Pierrick LE GALL
-
-	* modification : admin/group_list screen completely rewrite to
-	present the list of existing groups and a form to add a new
-	group. Here you can delete a group, go to permissions management
-	for a group, go to member list of a group (on admin/user_list with
-	a filter on group).
-	
-	* modification : admin/user_perm and admin/group_perm are not
-	directly reachable by the admin menu anymore. Only the user/group
-	list lets you reach user/group permissions management screen.
-
-2005-08-15 Pierrick LE GALL
-
-	* new : introduction page to administration section. This page
-	gives informations about PhpWebGallery version, PHP version, MySQL
-	version, gallery database informations (number of categories,
-	elements, users, comments). Ability to request phpwebgallery.net
-	for upgrade.
-
-	* deletion : of obsolete admin/admin_phpinfo.php page replaced by
-	a link in introduction page.
-
-2005-08-14 Pierrick LE GALL
-
-	* modification : simplification of HTML/CSS code for double select
-	screen to manage categories properties (admin/cat_options)
-
-2005-08-14 Pierrick LE GALL
-
-	* new : ability to set an element as representant of its category
-	directly from picture.php screen.
-
-	* improvement : dedicated icon to add elements into caddie. Ths
-	icon is displayed in the category title bar.
-	
-2005-08-14 Pierrick LE GALL
-
-	* new : maintenance screen in administration. There you can update
-	categories informations (number of images, date of the last added
-	element), update images informations (path, average rate), purge
-	obsolete sessions, purge history.
-
-	* new : ability to have random representative for categories. This
-	configuration parameter is set to false by default.
-
-	* new : ability to set an element as representative of a category
-	without belonging to the category. Thus, administrator can choose
-	representative even for empty categories.
-
-	* improvement : semantically superior design for category edition
-	screen by regrouping fields in fieldsets. The improved screen
-	contains action buttons as in category list screen.
-
-	* new : ability to move a virtual category (ie change its parent
-	category).
-
-	* bug fixed : the sync_users function checks all user children
-	tables (access, cache, group association).
-
-2005-08-08 Pierrick LE GALL
-
-	* new : external authentication in another users table. Previous
-	users table is divided between users (common properties with any
-	web application) and user_infos (phpwebgallery specific
-	informations). External table and fields can be configured.
-	
-	* modification : profile.php is not reachable through
-	administration anymore (not useful).
-
-	* modification : in profile.php, current password is mandatory
-	only if user tries to change his password. Username can't be
-	changed.
-
-	* deletion : of obsolete functions get_user_restrictions,
-	update_user_restrictions, get_user_all_restrictions,
-	is_user_allowed, update_user
-
-	* modification : $user['forbidden_categories'] equals at least
-	"-1" so that category_id NOT IN ($user['forbidden_categories'])
-	can always be used.
-
-	* modification : user_forbidden table becomes user_cache so that
-	not only restriction informations can be stored in this table.
-	
-2005-07-17 Pierrick LE GALL
-
-	* improvement : in admin/element_set_global, javascript is not
-	used anymore to select an item with its thumbnail
-
-2005-07-17 Pierrick LE GALL
-
-	* bug fixed : in admin/user_list, if target is "selection" and
-	that no user is selected, an error occurs
-
-2005-07-17 Pierrick LE GALL
-
-	* new feature : use Apache authentication. If
-	$conf['apache_authentication'] is set true : if no user matches
-	$_SERVER['REMOTE_USER'] in "users" table, PWG automatically
-	creates one. This way, users can customize the behaviour of the
-	application.
-
-	* template : new organisation of identification menu
-	(category.php). Simplification is required for Apache
-	authentication (no logout link even if user is externally logged
-	in)
-
-	* new : usernames can contain quotes (required because Apache
-	authentication authorized quotes in usernames)
-
-2005-07-17 Pierrick LE GALL
-
-	* new configuration parameter : hide thumbnail captions on main
-	page with $conf['show_thumbnail_caption']
-
-	* new configuration parameter : hide picture name in title on
-	picture presentation page with $conf['show_picture_name_on_title']
-
-	* template : new CSS classes to manage picture.php title
-	
-2005-07-16 Pierrick LE GALL
-
-	* new feature : RSS notification feed. Feed generator is an
-	external tool (FeedCreator class v1.7.2). New file feed.php
-
-	* new database field : comments.validation_date (datetime). This
-	field is required for notification feed.
-
-	* new database field : users.feed_id (varchar(50)). users.feed_id
-	is an alias of users.id but is much more complicated to find (50
-	characters, figures or letters, case sensitive) : the purpose is
-	to keep it secret (as far as possible).
-
-	* new database field : users.last_feed_check (datetime)
-
-	* new database field : users.registration_date (datetime)
-
-	* bug fixed : no need to add the (unavailable) session id to
-	install.php in the installation form.
-
-	* modified database field : images.date_available become more
-	precise (date to datetime). This precision is needed for
-	notification feed.
-
-	* new index : comments_i1 (validation_date). Might be useful for
-	feed queries.
-
-	* new index : comments_i2 (image_id). Useful each time you want to
-	have informations about an element and its associated comments.
-
-	* version 9.11 of mysqldump outputs database field names and table
-	names with backquote "`" (didn't find how to take them off)
-	
-2005-06-30 Pierrick LE GALL
-	
-	* category permissions management comes back! (it disappeared in
-	branch 1.4) This time, it is designed to support better long users
-	list. On this screen, for a particular category, admin can say
-	which groups and users are permitted.
-	
-2005-06-30 Pierrick LE GALL
-
-	* users managment : change display of filter (according to filter
-	on user comments)
-
-2005-06-30 Pierrick LE GALL
-
-	* categories management : new display with icon for actions
-	(delete, sub-categories, elements, edit, jump to, permissions)
-
-	* categories management : semantic HTML layout (using common
-	lists)
-
-	* categories management : new way to order categories of the same
-	level : a text field let the admin reorder all categories at once.
-	
-2005-06-25 Pierrick LE GALL
-
-	* new feature : ability to add links on the main page (see
-	include/config_default.inc.php)
-	
-2005-06-21 Pierrick LE GALL
-
-	* comments page rewritten : comments are displayed one by one,
-	with filters and display options available. The list of comments
-	is paginated.
-	
-2005-06-21 Pierrick LE GALL
-
-	* direct communication between templates and language items,
-	without needing a mapping in the PHP code.
-
-2005-06-21 Pierrick LE GALL
-
-	* new function get_name_from_file to centralize the construction
-	of displayed name from the filename
-
-	* new function l10n which returns the corresponding value from
-	$lang if existing. Else, the key is returned. This means that if a
-	language item is not translated, the key is displayed instead
-	(better than nothing).
-
-2005-06-11 Pierrick LE GALL
-
-	* errors and informations boxes : management centralized in
-	admin.php, $errors and $infos arrays replaced by $page['errors']
-	and $page['infos'], special management for admin/update.php (more
-	complex management)
-
-2005-06-11 Pierrick LE GALL
-
-	* bug 96 (informations given by uploaders are lost) correction
-	reported from branch 1.4
-
-2005-05-10 Pierrick LE GALL
-
-	* user list : links to profile page and permissions page are
-	represented by icons (more compact)
-
-	* user list : ability to associate to a group or to dissociate
-	from a group a list of selected users
-
-	* user list : ability to set user properties in "batch" mode (a
-	selection of users at once)
-
-	* user list : alternate background color for each line
-	
-2005-04-30 Pierrick LE GALL
-
-	* user list updated : ability to filter list on status. Function
-	get_enums comes back to retrieve the list of possible status in
-	the database.
-	
-2005-04-28 Pierrick LE GALL
-
-	* user list updated : ability to filter list on group
-
-2005-04-25 Pierrick LE GALL
-
-	* include/config.inc.php becomes include/config_default.inc.php :
-	this file should not be modified. A new file
-	include/config_local.inc.php can be used for overwriting
-	configuration parameters
-	
-2005-04-25 Pierrick LE GALL
-
-	* come back to previous version of include/constants.php :
-	%PWGVERSION% was not a mistake
-
-2005-04-25 Pierrick LE GALL
-
-	* profile.php is no longer used for listing users :
-	admin/user_list.php comes back (as in 1.3 branch)
-
-	* user list updated : ability to filter list on username
-
-2005-04-25 Gweltas
-
-	* ability to install even if file include/mysql.inc.php doesn't
-	exist
-
-	* monthly statistics
-
-	* installation labels updated (english only)
-
-2005-04-16 Pierrick LE GALL <pierrick /at/ phpwebgallery {dot} net>
-
-	* elements batch management : element_set page becomes the
-	frontend to element_set_global and element_set_unit, infos_images
-	(after a long time of use) become deprecated : the more powerful
-	element_set is used instead. Consequently, batch management
-	concerns caddie but also "normal categories".
-	
-	* refactoring code in admin.php to include the sub-file (clearer)
-
-	* caddie : function fill_caddie replaces the code in category.php
-	and can be used in admin/element_set.php
-
-	* caddie : caddie table is added in delete_elements function
-
-2005-04-16 Pierrick LE GALL <pierrick /at/ phpwebgallery {dot} net>
-
-	* elements batch management : in addition to global mode, a unit
-	mode is added : ability to manage a set of elements, element by
-	element. This screen is very close to the existing "infos_images"
-	(which will soon disappear).
-
-	* elements batch management : in screen element_set_global, the
-	display options are displayed at the top as in element_set_unit
-	
-2005-04-11 Pierrick LE GALL <pierrick /at/ phpwebgallery {dot} net>
-
-	* functions get_day_list and get_month_list moved from search.php
-	to include/functions.inc.php : these functions are now also used
-	in admin/element_set_global.php
-
-	* elements batch management improved : ability to set the number
-	of elements to display per line, ability to set {author, name,
-	creation date} fields, ability to add and remove keywords, ability
-	to take selected elements out of caddie
-
-2005-03-31 Pierrick LE GALL <pierrick at phpwebgallery dot net>
-
-	* apply category name and element name separation in calendar
-	special category
-
-	* change method of counting total number of viewable pictures :
-	pictures linked to more than one category are not counted twice.
-	
-2005-03-26 Pierrick LE GALL <pierrick at phpwebgallery dot net>
-
-	* "add to caddie" link is visible only when categories contains
-	elements. Only admin users can see this link
-
-	* elements batch management : impossible to create a link between
-	category and element that already exists
-
-	* logical separation of category name under thumbnail and element
-	name
-
-2005-03-25 Pierrick LE GALL <pierrick at phpwebgallery dot net>
-
-	* application version is defined at build or release
-	creation. This way, include/constants.php won't change at each
-	build.
-
-2005-03-25 Pierrick LE GALL <pierrick at phpwebgallery dot net>
-
-	* typo fixed : wrong block name closed in template
-
-2005-03-25 Pierrick LE GALL <pierrick at phpwebgallery dot net>
-	
-	* new feature : caddie. The purpose is batch management,
-	especially concerning elements to categories associations.This is
-	the very first release, needs many improvements.
diff --git a/doc/README_en.txt b/doc/README_en.txt
index 91b5eecc8..158282b13 100644
--- a/doc/README_en.txt
+++ b/doc/README_en.txt
@@ -1,47 +1,10 @@
-=============
+=======
 Piwigo
-=============
-
-http://piwigo.org
-
-
-Installation
-============
-
-1. extract files from the downloaded file (using tar or unzip command, or
-   softwares like 7-zip or winzip)
-
-2. place de source files on your website in the directory of your choice
-   ("gallery" for example)
-
-3. go to the URL http://your.domain/gallery/install.php and follow the
-   instructions of installation
-
-Upgrade
 =======
 
-1. elements to save :
-
- - file "include/mysql.inc.php"
- - file "include/config_local.inc.php"
- - file "template-common/local-layout.css"
- - file "template/yoga/local-layout.css"
- - directory "galleries"
- - any optional theme or extension you have intalled
- - your database (create a dump, using PhpMyAdmin for instance)
-
-2. delete all files and directories of your previous installation (but not
-   the previous listed elements)
-
-3. extract files from the downloaded file (using tar or unzip command, or
-   softwares like 7-zip or winzip)
-
-4. upload all the new version files to your website but the previous listed
-   elements. The only elements coming from the previous installed version
-   are the elements listed above.
-
-5. go to the URL http://your.domain/gallery/upgrade.php and follow the
-   instructions
+website:        http://piwigo.org
+Installation:   http://piwigo.org/basics/installation
+Upgrade:        http://piwigo.org/basics/upgrade
 
 How to start
 ============
@@ -49,7 +12,7 @@ How to start
 Once installed or upgraded, your gallery is ready to run. Start by
 displaying the installation directory in your browser :
 
-http://your.domain/gallery
+http://your.domain/photos
 
 Then identify as an administrator. A new link in Identification menu of main
 page will appear : Administration. Enter the administration panel.
@@ -63,14 +26,11 @@ Communication
 Newsletter
 ----------
 
-https://gna.org/mail/?group=phpwebgallery
+https://mail.gna.org/listinfo/phpwebgallery-announce/
 
 It is *highly* recommended to subscribe to Piwigo newsletter. This is
 extremely low-traffic, but will provide you with announcements of new
-Piwigo releases and serious bug notification. You will find available
-mailing lists at this URL :
-
-No spam, no commercial use.
+Piwigo releases and serious bug notification.
 
 Freshmeat
 ---------
@@ -83,23 +43,20 @@ release. Development releases notification are not send in the newsletter.
 Bugtracker
 ----------
 
-http://bugs.phpwebgallery.net
+http://piwigo.org/bugs
 
 Bugs and change requests tracking. The best way to have your bug corrected:
 it won't be forgotten (as in the forum).
 
-Wiki
-----
+Documentation
+-------------
 
-http://phpwebgallery.net/doc
+http://piwigo.org/doc
 
 Wiki documentation: everyone can participate to improve documentation
 content.
 
-Message board
--------------
-
-http://forum.phpwebgallery.net
+Forum
+-----
 
-All communications (installation help, technical discussions) that can't be
-done in other channels.
+http://piwigo.org/forum
diff --git a/doc/README_fr.txt b/doc/README_fr.txt
index 2915c1253..4b10557be 100644
--- a/doc/README_fr.txt
+++ b/doc/README_fr.txt
@@ -1,55 +1,19 @@
-=============
+=======
 Piwigo
-=============
-
-http://piwigo.org
-
-Installation
-============
-
-1. d�compresser � l'aide de winzip par exemple (winrar, winace et beaucoup
-   d'autres le permettent �galement) le fichier t�l�charg�.
-
-2. placer les fichiers d�compress�s sur votre serveur web dans le r�pertoire
-   de votre choix ("galerie" par exemple)
-
-3. se rendre � l'URL http://votre.domaine/galerie/install.php et suivre les
-   instructions
-
-Mise � jour
-===========
+=======
 
-1. �l�ments � sauvegarder :
+Site web:        http://fr.piwigo.org
+Installation:    http://fr.piwigo.org/basics/installation
+Mise � jour:     http://fr.piwigo.org/basics/upgrade
 
- - fichier "include/mysql.inc.php"
- - fichier "include/config_local.inc.php"
- - fichier "template-common/local-layout.css"
- - fichier "template/yoga/local-layout.css"
- - r�pertoire "galleries"
- - �ventuellement th�mes suppl�mentaires et extensions
- - votre base de donn�es (en cr�ant un dump, avec PhpMyAdmin par exemple)
-
-2. supprimer tous les fichiers et r�pertoires de la pr�c�dente installation
-   (sauf les �l�ments list�s ci-dessus)
-
-3. d�compresser � l'aide de winzip par exemple (winrar, winace et beaucoup
-   d'autres le permettent �galement) le fichier t�l�charg�.
-
-4. placer tous les fichiers de la nouvelle version sur votre site web sauf
-   pour les �lements list�s ci-dessus. Les seuls �l�ments venant de la
-   pr�c�dente installation sont ceux list�s ci-dessus.
-
-5. se rendre � l'URL http://votre.domaine/galerie/upgrade.php et suivre les
-   instructions
-
-Comment commencer
-=================
+Prendre un bon d�part
+=====================
 
 Une fois install�e ou mise � jour, votre galerie est pr�te �
 fonctionner. Commencez par vous rendre sur le r�pertoire d'installation dans
 votre navigateur : 
 
-http://votre.domaine/galerie
+http://votre.domaine/photos
 
 Ensuite, identifiez-vous en tant qu'un administrateur. Un nouveau lien dans
 le menu d'identification de la page principale va appara�tre :
@@ -64,15 +28,12 @@ Communication
 Newsletter
 ----------
 
-https://gna.org/mail/?group=phpwebgallery
+https://mail.gna.org/listinfo/phpwebgallery-announce-french/
 
 Il est *fortement* recommand� de souscrire � la newsletter de
 Piwigo. Tr�s peu de mails sont envoy�s, mais les informations sont
 importantes : nouvelles versions de l'application, notification de bugs
-importants (relatifs � la s�curit�). Vous trouverez les listes de
-discussions disponibles sur la page suivante :
-
-Pas de spam, pas d'utilisation commerciale.
+importants (relatifs � la s�curit�).
 
 Freshmeat
 ---------
@@ -86,7 +47,7 @@ pr�vu sur les mailing lists "announce").
 Outil de suivi de bogues
 ------------------------
 
-http://bugs.phpwebgallery.net
+http://piwigo.org/bugs
 
 Gestion des bugs, mais aussi demande de nouvelles fonctionnalit�s. Rien de
 plus efficace pour qu'un bug soit corrig� : tant qu'il ne l'est pas, la
@@ -98,18 +59,15 @@ forc�ment id�al car il ne s'agit pas de la m�me chose, mais le suivi du dev
 d'une nouvelle fonctionnalit� peut se mod�liser de la m�me fa�on que le
 suivi de la correction d'un bug.
 
-Wiki
-----
-
-http://phpwebgallery.net/doc
+Documentation
+-------------
 
-Documentation suivant le syst�me du wiki. Chacun peut participer �
-l'am�lioration de la doc.
+http://fr.piwigo.org/doc
 
 Forum de discussion
 -------------------
 
-http://forum.phpwebgallery.net
+http://fr.piwigo.org/forum
 
 Un forum est disponible et recommand� pour toutes les questions autres que
 les demandes d'�volution et rapport de bogue (installation, discussions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 0ef4811f8..c0f889808 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -165,8 +165,7 @@ $conf['meta_ref'] = true;
 //  for each link is associated a label
 //  $conf['links'] = array(
 //    'http://piwigo.org' => 'PWG website',
-//    'http://forum.phpwebgallery.net' => 'PWG forum',
-//    'http://phpwebgallery.net/doc' => 'PWG wiki'
+//    'http://piwigo.org/forum' => 'PWG forum',
 //    );
 //
 // Advenced use:
@@ -174,9 +173,9 @@ $conf['meta_ref'] = true;
 //  you can pass a array with different optional parameter values
 //  $conf['links'] = array(
 //    'http://piwigo.org' => array('label' => 'PWG website', 'new_window' => false, 'eval_visible' => 'return true;'),
-//    'http://forum.phpwebgallery.net' => array('label' => 'For ADMIN', 'new_window' => true, 'eval_visible' => 'return is_admin();'),
-//    'http://phpwebgallery.net/doc' => array('label' => 'For Guest', 'new_window' => true, 'eval_visible' => 'return is_a_guest();'),
-//    'http://download.gna.org/phpwebgallery/' =>
+//    'http://piwigo.org/forum' => array('label' => 'For ADMIN', 'new_window' => true, 'eval_visible' => 'return is_admin();'),
+//    'http://piwigo.org/ext' => array('label' => 'For Guest', 'new_window' => true, 'eval_visible' => 'return is_a_guest();'),
+//    'http://piwigo.org/downloads' =>
 //      array('label' => 'PopUp', 'new_window' => true,
 //      'nw_name' => 'PopUp', 'nw_features' => 'width=800,height=450,location=no,status=no,toolbar=no,scrollbars=no,menubar=no'),
 //    );
diff --git a/include/constants.php b/include/constants.php
index 69d76bcac..27e429a14 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -23,9 +23,9 @@
 
 // Default settings
 define('PHPWG_VERSION', '2.0');
-define('PHPWG_DOMAIN', 'phpwebgallery.net');
-define('PHPWG_URL', 'http://www.'.PHPWG_DOMAIN);
-define('PEM_URL', 'http://' . PHPWG_DOMAIN . '/ext_new'); /* need to be changed on final release */
+define('PHPWG_DOMAIN', 'piwigo.org');
+define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
+define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
 define('PHPWG_DEFAULT_LANGUAGE', 'en_UK');
 define('PHPWG_DEFAULT_TEMPLATE', 'yoga/Sylvia');
 
diff --git a/install/config.sql b/install/config.sql
index 8b7a622f5..6e086d59c 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -6,7 +6,7 @@ INSERT INTO piwigo_config (param,value,comment) VALUES ('comments_validation','f
 INSERT INTO piwigo_config (param,value,comment) VALUES ('comments_forall','false','even guest not registered can post comments');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('gallery_locked','false','Lock your gallery temporary for non admin users');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('gallery_title','Piwigo demonstration site','Title at top of each page and for RSS feed');
-INSERT INTO piwigo_config (param,value,comment) VALUES ('gallery_url','http://demo.piwigo.net','URL given in RSS feed');
+INSERT INTO piwigo_config (param,value,comment) VALUES ('gallery_url','http://piwigo.org/demo','URL given in RSS feed');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('rate','true','Rating pictures feature is enabled');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('rate_anonymous','true','Rating pictures feature is also enabled for visitors');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('page_banner','<h1>Piwigo demonstration site</h1><p>My photos web site</p>','html displayed on the top each page of your gallery');
diff --git a/install/upgrade_1.5.0.php b/install/upgrade_1.5.0.php
index d0d56653e..0d638d1e5 100644
--- a/install/upgrade_1.5.0.php
+++ b/install/upgrade_1.5.0.php
@@ -318,7 +318,7 @@ foreach ($queries as $query)
 //
 $params = array(
   'gallery_url' => array(
-    'http://demo.phpwebgallery.net',
+    'http://piwigo.org/demo',
     'URL given in RSS feed'
     ),
   'rate' => array(
diff --git a/language/de_DE/help.html b/language/de_DE/help.html
index 5b4a9860e..aafeb94e0 100644
--- a/language/de_DE/help.html
+++ b/language/de_DE/help.html
@@ -320,15 +320,15 @@ bekommt diese Einstellungen als Standart vorgegeben.</li>
    <li>Bei Fragen besuchen Sie bitte das Forum. Wenn ihre Frage dort nicht schon beantwortet wurde, scheuen Sie sich 
    sie dort zu stellen.
    Das
-<a href="http://forum.phpwebgallery.net">Forum</a> ist auf der Website von Piwigo. Siehe 
-auch <a href="http://phpwebgallery.net/doc">Offizielle Dokumentation von Piwigo</a> für 
+<a href="http://piwigo.org/forum">Forum</a> ist auf der Website von Piwigo. Siehe 
+auch <a href="http://piwigo.org/doc">Offizielle Dokumentation von Piwigo</a> für 
 weitere Informationen. </li>
 
    <li>Falls du eine Frage hast, die Piwigo community heisst dich herzlich Willkommen in ihrem<a
-  href="http://forum.phpwebgallery.net">ihrem Forum.</a>.</li>
+  href="http://piwigo.org/forum">ihrem Forum.</a>.</li>
 
 </ul>
   </div> <!-- misc_content --> 
 </div> <!-- instructionMisc -->
 
-</div>
\ No newline at end of file
+</div>
diff --git a/language/en_UK/help.html b/language/en_UK/help.html
index 4771ea268..9b841d085 100644
--- a/language/en_UK/help.html
+++ b/language/en_UK/help.html
@@ -300,7 +300,7 @@ must validate uploaded photos in <span class="pwgScreen">Administration &raquo;
   Default</span>. Every new registered user will use these default configuration settings.</li>
 
   <li>If you have any question, Piwigo community will welcome you on <a
-  href="http://forum.phpwebgallery.net">its forum</a>.</li>
+  href="http://piwigo.org/forum">its forum</a>.</li>
 
 </ul>
   </div> <!-- misc_content --> 
diff --git a/language/es_ES/help.html b/language/es_ES/help.html
index 5c6de89e2..55e294c9e 100644
--- a/language/es_ES/help.html
+++ b/language/es_ES/help.html
@@ -285,7 +285,7 @@ class="pwgScreen">Administración &raquo; Categorías &raquo; Propiedades &raquo
   <li>Una vez creado su galería, configure la fijación por defecto tal como deseado en
   <span class="pwgScreen">Administración &raquo; Configuración &raquo; Fijación por defecto</span>. En efecto, cada nuevo utilizador heredará de estas propiedades de fijación.</li>
 
-  <li>Totalmente para cuestión, la comunidad Piwigo está en la escucha sobre el <a href="http://forum.phpwebgallery.net">foro</a>.</li>
+  <li>Totalmente para cuestión, la comunidad Piwigo está en la escucha sobre el <a href="http://piwigo.org/forum">foro</a>.</li>
 
 </ul>
  
diff --git a/language/fr_FR/help.html b/language/fr_FR/help.html
index 8b606cc03..7b4b8740e 100644
--- a/language/fr_FR/help.html
+++ b/language/fr_FR/help.html
@@ -320,7 +320,7 @@ cela, un administrateur doit se rendre dans <span class="pwgScreen">Administrati
 défaut tel que désiré dans <span class="pwgScreen">Administation &raquo; Configuration &raquo; Affichage par défaut</span>. En effet, chaque nouvel
 utilisateur héritera de ces propriétés d'affichage.</li>
 
-  <li>Pour tout question, la communauté Piwigo est à l'écoute sur le <a href="http://forum.phpwebgallery.net">forum</a>.</li>
+  <li>Pour tout question, la communauté Piwigo est à l'écoute sur le <a href="http://piwigo.org/forum">forum</a>.</li>
 
 </ul>
   </div> <!-- misc_content --> 
diff --git a/language/hr_HR/help.html b/language/hr_HR/help.html
index 4771ea268..9b841d085 100644
--- a/language/hr_HR/help.html
+++ b/language/hr_HR/help.html
@@ -300,7 +300,7 @@ must validate uploaded photos in <span class="pwgScreen">Administration &raquo;
   Default</span>. Every new registered user will use these default configuration settings.</li>
 
   <li>If you have any question, Piwigo community will welcome you on <a
-  href="http://forum.phpwebgallery.net">its forum</a>.</li>
+  href="http://piwigo.org/forum">its forum</a>.</li>
 
 </ul>
   </div> <!-- misc_content --> 
diff --git a/language/it_IT/help.html b/language/it_IT/help.html
index b1163f545..6aaf1a3ff 100644
--- a/language/it_IT/help.html
+++ b/language/it_IT/help.html
@@ -315,7 +315,7 @@ di visualizzazione di default da <span class="pwgScreen">Amministrazione &raquo;
 ogni nuovo utente visualizzerrà la galleria con queste stesse impostazioni.</li>
 
    <li>Se avedte delle domande, la comunità di Piwigo sarà lieta di rispondere sul'<a
-  href="http://forum.phpwebgallery.net">forum</a>.</li>
+  href="http://piwigo.org/forum">forum</a>.</li>
 
 </ul>
   </div> <!-- misc_content --> 
diff --git a/language/nl_NL/about.html b/language/nl_NL/about.html
index b7dd21a51..0b20e0173 100644
--- a/language/nl_NL/about.html
+++ b/language/nl_NL/about.html
@@ -6,5 +6,5 @@
 
   <li>Heb je suggesties of commentaar, bezoek dan de  <a
   href="http://piwigo.org">Piwigo</a> officiele site, en
-  zijn <a href="http://forum.phpwebgallery.net">forum</a>.</li>
+  zijn <a href="http://piwigo.org/forum">forum</a>.</li>
 
diff --git a/language/nl_NL/help.html b/language/nl_NL/help.html
index 936013c1e..94ebb4d52 100644
--- a/language/nl_NL/help.html
+++ b/language/nl_NL/help.html
@@ -310,7 +310,7 @@ must validate uploaded photos in <span class="pwgScreen">Administration &raquo;
   Standaard</span>. Elke nieuwe geregistreerde gebruiker zal dezelfde standaard vertoningseigenschappen hebben.</li>
 
    <!--TODO--><li>If you have any question, Piwigo community will welcome you on <a
-  href="http://forum.phpwebgallery.net">its forum</a>.</li>
+  href="http://piwigo.org/forum">its forum</a>.</li>
 
 </ul>
   </div> <!-- misc_content --> 
diff --git a/language/pl_PL/help.html b/language/pl_PL/help.html
index cd216f62e..1423bfdd2 100644
--- a/language/pl_PL/help.html
+++ b/language/pl_PL/help.html
@@ -287,7 +287,7 @@ liter cyfr, znaków "-", "_" lub ".". Nie mogą zawierać spacji oraz pozostały
   Domyślne</span>. Jeżeli tak zrobisz każdy nowy użytkownik będzie miał taki sam domyślny wygląd stron galerii.</li>
 
   <li>Jeżeli masz pytania, społeczność Piwigo zaprasza Cię na forum <a
-  href="http://forum.phpwebgallery.net"></a>.</li>
+  href="http://piwigo.org/forum"></a>.</li>
 
 </ul>
   </div> <!-- misc_content --> 
diff --git a/language/ru_RU/help.html b/language/ru_RU/help.html
index 44646cb2b..61650de08 100644
--- a/language/ru_RU/help.html
+++ b/language/ru_RU/help.html
@@ -229,8 +229,8 @@
   Основные</span>Каждый новый пользователь будет видеть галерею так, как описано в этих настройках. </li>
 
   <li>Если у Вас есть вопросы, не стесняйтесь поискать ответы на <a
-  href="http://forum.phpwebgallery.net">форуме</a> или задать их там. Для получения более развернутых сведений, прочтите <a
-  href="http://phpwebgallery.net/doc/">официальную документация по Piwigo</a>.</li>
+  href="http://piwigo.org/forum">форуме</a> или задать их там. Для получения более развернутых сведений, прочтите <a
+  href="http://piwigo.org/doc/">официальную документация по Piwigo</a>.</li>
 
 </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/LocalFilesEditor/admin.php b/plugins/LocalFilesEditor/admin.php
index 105e450b3..6ac5fc6a1 100644
--- a/plugins/LocalFilesEditor/admin.php
+++ b/plugins/LocalFilesEditor/admin.php
@@ -68,7 +68,7 @@ $new_file['plug'] = "<?php\n/*
 Plugin Name: " . l10n('locfiledit_onglet_plug') . "
 Version: 1.0
 Description: " . l10n('locfiledit_onglet_plug') . "
-Plugin URI: http://www.phpwebgallery.net
+Plugin URI: http://piwigo.org
 Author:
 Author URI:
 */\n\n\n\n\n?>";
diff --git a/plugins/LocalFilesEditor/main.inc.php b/plugins/LocalFilesEditor/main.inc.php
index 110cefaa8..41c12e5df 100644
--- a/plugins/LocalFilesEditor/main.inc.php
+++ b/plugins/LocalFilesEditor/main.inc.php
@@ -3,7 +3,7 @@
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 Piwigo team    http://phpwebgallery.net |
+// | Copyright(C) 2003-2008 PhpWebGallery team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -25,7 +25,7 @@
 Plugin Name: LocalFiles Editor
 Version: 2.0
 Description: Edit local files from administration panel / Editeur de fichiers locaux
-Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=144
+Plugin URI: http://piwigo.org/ext/extension_view.php?eid=144
 Author: Piwigo team
 Author URI: http://piwigo.org
 */
diff --git a/plugins/language_switch/main.inc.php b/plugins/language_switch/main.inc.php
index 3b2885ddf..75545c33f 100644
--- a/plugins/language_switch/main.inc.php
+++ b/plugins/language_switch/main.inc.php
@@ -3,7 +3,7 @@
 // | Piwigo - a PHP based picture gallery                                  |
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 Piwigo team    http://phpwebgallery.net |
+// | Copyright(C) 2003-2008 PhpWebGallery team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -25,7 +25,7 @@
 Plugin Name: Language Switch
 Version: 2.0
 Description: Switch to another language from flags on your gallery home page.
-Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=123
+Plugin URI: http://piwigo.org/ext/extension_view.php?eid=123
 Author: Piwigo team
 Author URI: http://piwigo.org
 */
diff --git a/template-extension/yoga/local/README b/template-extension/yoga/local/README
index dc5a2132c..d62571a74 100644
--- a/template-extension/yoga/local/README
+++ b/template-extension/yoga/local/README
@@ -16,4 +16,4 @@ In future version of PWG, you probably won't have to edit the php code, but
 a parameter table instead.
 
 Feel free to ask in the forum for further assistance :
-http://forum.phpwebgallery.net/
+http://piwigo.org/forum