Use subdomain URLs on Settings and Edit view pages (bug #1006634)

When user subdomains are enabled, display the Profile url field on the
Settings page where it belongs: between the scheme part of the url and
the rest of the wwwroot.

On Edit Title & Description for profile pages, ensure the correct form
of the clean url is used by calling the appropriate function instead
of building the url.

Change-Id: Id4924165e7bf803fce46cf877a980d0c235176eb
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

htdocs/account/index.php

@@ -89,11 +89,21 @@ if (get_config('cleanurls') && get_config('cleanurlusereditable')) {
     $elements['changeprofileurl'] = array(
         'value' => '<tr><td colspan="2"><h3>' . get_string('changeprofileurl', 'account') . '</h3></td></tr>'
     );
+    if (get_config('cleanurlusersubdomains')) {
+        list($proto, $rest) = explode('://', get_config('wwwroot'));
+        $prehtml = $proto . ':// ';
+        $posthtml = ' .' . $rest;
+    }
+    else {
+        $prehtml = get_config('wwwroot') . get_config('cleanurluserdefault') . '/ ';
+        $posthtml = '';
+    }
     $elements['urlid'] = array(
         'type'         => 'text',
         'defaultvalue' => $USER->get('urlid'),
         'title'        => get_string('profileurl', 'account'),
-        'prehtml'      => '<span class="description">' . get_config('wwwroot') . get_config('cleanurluserdefault') . '/</span> ',
+        'prehtml'      => '<span class="description">' . $prehtml . '</span>',
+        'posthtml'     => '<span class="description">' . $posthtml . '</span>',
         'description'  => get_string('profileurldescription', 'account') . ' ' . get_string('cleanurlallowedcharacters'),
         'rules'        => array('maxlength' => 30, 'regex' => get_config('cleanurlvalidate')),
     );

htdocs/view/edit.php

@@ -90,13 +90,14 @@ if ($studentid !== '') {
 if ($urlallowed = get_config('cleanurls') && $view->get('type') == 'portfolio' && !$institution) {
     if ($group) {
         $groupdata = get_record('group', 'id', $group);
-        $urlallowed = $urlallowed && strlen($groupdata->urlid);
-        $cleanurlbase = get_config('wwwroot') . get_config('cleanurlgroupdefault') . '/' . $groupdata->urlid . '/';
+        if ($urlallowed = !is_null($groupdata->urlid) && strlen($groupdata->urlid)) {
+            $cleanurlbase = group_homepage_url($groupdata) . '/';
+        }
     }
     else {
         $userurlid = $USER->get('urlid');
-        if ($urlallowed = ($urlallowed && !is_null($userurlid) && strlen($userurlid))) {
-            $cleanurlbase = get_config('wwwroot') . get_config('cleanurluserdefault') . '/' . $userurlid . '/';
+        if ($urlallowed = !is_null($userurlid) && strlen($userurlid)) {
+            $cleanurlbase = profile_url($USER) . '/';
         }
     }
 }