Merge commit '8fb95110c43e70f66eb5c14bb1446a3f1b5443a9' as 'mod/profile_friendlyurl'

10 files changed, 560 insertions, 0 deletions

diff --git a/mod/profile_friendlyurl/.DS_Store b/mod/profile_friendlyurl/.DS_Store
new file mode 100644
index 000000000..cf4270665
--- /dev/null
+++ b/mod/profile_friendlyurl/.DS_Store
diff --git a/mod/profile_friendlyurl/LICENCE.txt b/mod/profile_friendlyurl/LICENCE.txt
new file mode 100644
index 000000000..f7f800e54
--- /dev/null
+++ b/mod/profile_friendlyurl/LICENCE.txt
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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; either version 2 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.
+
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/mod/profile_friendlyurl/README.markdown b/mod/profile_friendlyurl/README.markdown
new file mode 100644
index 000000000..75637bac5
--- /dev/null
+++ b/mod/profile_friendlyurl/README.markdown
@@ -0,0 +1,27 @@
+Profile Friendly URL
+===================
+*Kévin Dunglas <dunglas@gmail.com> - http://lapin-blanc.net - 2010 - GPL v2*
+
+Creates friendly URLs for user's profiles as subdomains.
+Ie: http://example.com/pg/profile/user will become http://user.example.com
+
+Requirements
+------------
+* Access to the configuration of your DNS server
+* The Apache web server (either, you need to port the rewriting rules from the .htaccess file to the syntax supported by your web server)
+* PHP installed as module (as CGI, or with some restricting Apache configurations, you need to set the `session.cookie_domain` param of the `php.ini` file to something like ".yourdomain.com")
+
+Install
+-------
+1. Add a wildcard entry to your DNS server. Every should point to the web server hosting the Elgg application.
+   You can add a Bind entry like: *.example.com.   3600 IN  CNAME 10 www.example.com.
+2. If you are using Apache virtual hosts, add every subdomains to the Elgg vhost like this:
+    <VirtualHost *>
+      ServerName example.com
+      ServerAlias *.punxrezo.net
+      [...]
+    </VirtualHost>
+3. Backup then replace the .htaccess file in the your root Elgg directory by the htaccess-dist file of the plugin directory.
+   Edit this new .htaccess file and replace all occurrences of "example.com" by something like "yourdomain.com".
+4. Enable the profile_friendlyurl plugin from the Elgg administration.
+5. In the plugin settings form set the domain name to use.
diff --git a/mod/profile_friendlyurl/htaccess-dist b/mod/profile_friendlyurl/htaccess-dist
new file mode 100644
index 000000000..977d3ea71
--- /dev/null
+++ b/mod/profile_friendlyurl/htaccess-dist
@@ -0,0 +1,145 @@
+# Elgg htaccess directives

+# Copyright Curverider Ltd 2008-2009

+# License http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

+# Link http://elgg.org/

+

+<IfModule !mod_rewrite.c>

+    # ugly ugly hack to detect missing mod_rewrite

+    # RedirectMatch must be to an absolute destination, so forces 500 error...

+    ErrorDocument 500 "Elgg error: Apache does not have mod_rewrite loaded. Please check your Apache setup."

+    RedirectMatch 302 .* index.php

+</IfModule>

+

+<Files "htaccess_dist">

+    order allow,deny

+    deny from all

+</Files>

+

+# Don't listing directory

+Options -Indexes

+

+# Follow symbolic links

+Options +FollowSymLinks

+

+# Default handler

+DirectoryIndex index.php

+

+# Turn on expiry

+<IfModule mod_expires.c>

+	ExpiresActive On

+	ExpiresDefault "access plus 10 years"

+</IfModule>

+

+# php 4, apache 1.x

+<IfModule mod_php4.c>

+    ErrorDocument 500 "Elgg error: Elgg does not support PHP 4."

+    RedirectMatch 302 .* index.php

+</IfModule>

+

+# php 4, apache 2

+<IfModule sapi_apache2.c>

+    ErrorDocument 500 "Elgg error: Elgg does not support PHP 4."

+    RedirectMatch 302 .* index.php

+</IfModule>

+

+# php 5, apache 1 and 2

+<IfModule mod_php5.c>

+	# default memory limit to 64Mb

+	php_value memory_limit 64M

+	# to make sure register global is off

+	php_value register_globals 0

+	# max post size to 8Mb

+	php_value post_max_size 8388608

+	# upload size limit to 5Mb	

+	php_value upload_max_filesize 5242880

+	# hide errors, enable only if debug enabled

+	php_value display_errors 0

+</IfModule>

+

+# Turn on mod_gzip if available

+<IfModule mod_gzip.c>

+	mod_gzip_on yes

+    mod_gzip_dechunk yes

+    mod_gzip_keep_workfiles No

+    mod_gzip_minimum_file_size 1000

+    mod_gzip_maximum_file_size 1000000

+    mod_gzip_maximum_inmem_size 1000000

+    mod_gzip_item_include mime ^text/.* 

+    mod_gzip_item_include mime ^application/javascript$

+    mod_gzip_item_include mime ^application/x-javascript$

+    # Exclude old browsers and images since IE has trouble with this

+    mod_gzip_item_exclude reqheader "User-Agent: .*Mozilla/4\..*\["

+    mod_gzip_item_exclude mime ^image/.*

+</IfModule>

+

+## Apache2 deflate support if available

+##

+## Important note: mod_headers is required for correct functioning across proxies.

+##

+<IfModule mod_deflate.c>

+	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript

+	BrowserMatch ^Mozilla/4 gzip-only-text/html

+	BrowserMatch ^Mozilla/4\.[0678] no-gzip

+	BrowserMatch \bMSIE !no-gzip

+

+<IfModule mod_headers.c>	

+	Header append Vary User-Agent env=!dont-vary

+</IfModule>	

+	

+	# The following is to disable compression for actions. The reason being is that these

+	# may offer direct downloads which (since the initial request comes in as text/html and headers

+	# get changed in the script) get double compressed and become unusable when downloaded by IE.

+	SetEnvIfNoCase Request_URI action\/* no-gzip dont-vary

+	SetEnvIfNoCase Request_URI actions\/* no-gzip dont-vary

+	

+</IfModule>

+

+# Configure ETags

+<FilesMatch "\.(jpg|jpeg|gif|png|mp3|flv|mov|avi|3pg|html|htm|swf)$">

+	FileETag MTime Size

+</FilesMatch>

+

+<IfModule mod_rewrite.c>

+

+RewriteEngine on

+

+# If Elgg is in a subdirectory on your site, you might need to add a RewriteBase line

+# containing the path from your site root to elgg's root. e.g. If your site is

+# http://example.com/ and Elgg is in http://example.com/sites/elgg/, you might need 

+#

+#RewriteBase /sites/elgg/

+#

+# here, only without the # in front.

+#

+# If you're not running Elgg in a subdirectory on your site, but still getting lots

+# of 404 errors beyond the front page, you could instead try:

+#

+#RewriteBase /

+

+# Profile friendly URL using subdomain

+# Replace each "example.com" by "your-domain.com"

+RewriteCond %{HTTP_HOST} ([^.]+)\.example.com [NC]

+RewriteRule ^(.*) http://example.com/engine/handlers/pagehandler.php?handler=profile&page=%1 [P]

+

+RewriteRule ^action\/([A-Za-z0-9\_\-\/]+)$ engine/handlers/action_handler.php?action=$1

+

+RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)$ services/export/handler.php?view=$1&guid=$2

+RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)\/$ services/export/handler.php?view=$1&guid=$2

+RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)\/([A-Za-z]+)\/([A-Za-z0-9\_]+)\/$ services/export/handler.php?view=$1&guid=$2&type=$3&idname=$4

+

+RewriteRule ^\_css\/css\.css$ _css/css.php

+

+RewriteRule ^pg\/([A-Za-z0-9\_\-]+)\/(.*)$ engine/handlers/pagehandler.php?handler=$1&page=$2

+RewriteRule ^pg\/([A-Za-z0-9\_\-]+)$ engine/handlers/pagehandler.php?handler=$1

+

+RewriteRule xml-rpc.php engine/handlers/xml-rpc_handler.php

+RewriteRule mt/mt-xmlrpc.cgi engine/handlers/xml-rpc_handler.php

+

+RewriteRule ^tag/(.+)/?$ engine/handlers/pagehandler.php?handler=search&page=$1

+

+

+</IfModule>

+

+# Needed to be logged in in subdomains too

+# Replace ".example.com" by ".your-domain.com"

+php_value session.cookie_domain ".example.com"

diff --git a/mod/profile_friendlyurl/languages/en.php b/mod/profile_friendlyurl/languages/en.php
new file mode 100644
index 000000000..e82b026a6
--- /dev/null
+++ b/mod/profile_friendlyurl/languages/en.php
@@ -0,0 +1,22 @@
+<?php

+	/**

+	 * Elgg groups_bookmarkswidget plugin language pack

+	 * 

+	 * @package Elgggroups_bookmarkswidget

+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

+	 * @author Curverider Ltd

+	 * @copyright Curverider Ltd 2008-2009

+	 * @link http://elgg.com/

+	 */

+

+	$english = array(

+	

+		/**

+		 * Menu items and titles

+		 */

+			

+			'profile_friendlyurl:domain' => "Domain"
+  );

+					

+	add_translation("en",$english);

+?>
\ No newline at end of file
diff --git a/mod/profile_friendlyurl/start.php b/mod/profile_friendlyurl/start.php
new file mode 100755
index 000000000..d191c57be
--- /dev/null
+++ b/mod/profile_friendlyurl/start.php
@@ -0,0 +1,20 @@
+<?php

+/**

+ * Elgg profile_friendlyurl plugin

+ *

+ * @package Elggprofile_friendlyurl

+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

+ * @author Kévin Dunglas <dunglas@gmail.com>

+ * @copyright Kévin Dunglas - 2010

+ */
+
+function profile_friendly_url($user) {

+  return 'http://' . $user->username . '.' . get_plugin_setting('domain', 'profile_friendlyurl');
+}
+
+function profile_friendlyurl_init() {
+  register_entity_url_handler('profile_friendly_url','user','all');
+}
+
+register_elgg_event_handler('init','system','profile_friendlyurl_init');

+?>
\ No newline at end of file
diff --git a/mod/profile_friendlyurl/views/.DS_Store b/mod/profile_friendlyurl/views/.DS_Store
new file mode 100644
index 000000000..a8dd0a83b
--- /dev/null
+++ b/mod/profile_friendlyurl/views/.DS_Store
diff --git a/mod/profile_friendlyurl/views/default/.DS_Store b/mod/profile_friendlyurl/views/default/.DS_Store
new file mode 100644
index 000000000..69ad4896e
--- /dev/null
+++ b/mod/profile_friendlyurl/views/default/.DS_Store
diff --git a/mod/profile_friendlyurl/views/default/settings/.DS_Store b/mod/profile_friendlyurl/views/default/settings/.DS_Store
new file mode 100644
index 000000000..190e5d95b
--- /dev/null
+++ b/mod/profile_friendlyurl/views/default/settings/.DS_Store
diff --git a/mod/profile_friendlyurl/views/default/settings/profile_friendlyurl/edit.php b/mod/profile_friendlyurl/views/default/settings/profile_friendlyurl/edit.php
new file mode 100644
index 000000000..b15831580
--- /dev/null
+++ b/mod/profile_friendlyurl/views/default/settings/profile_friendlyurl/edit.php
@@ -0,0 +1,7 @@
+<?php
+?>
+<p>
+	<?php echo elgg_echo('profile_friendlyurl:domain'); ?>
+	
+	<input type="text" name="params[domain]" value="<?php echo $vars['entity']->domain ?>" />
+</p>