Merge pull request #414 from dpalou/MOBILE-1454

MOBILE-1454 login: Allow URLs without domain in new site

Author: jleyva

www/core/components/contentlinks/services/helper.js

@@ -174,7 +174,7 @@ angular.module('mm.core.contentlinks')
                 // Get the site URL.
                 var siteUrl = $mmContentLinksDelegate.getSiteUrl(url),
                     formatted = $mmUtil.formatURL(siteUrl);
-                if (!siteUrl || !$mmUtil.isValidURL(formatted)) {
+                if (!siteUrl) {
                     $mmUtil.showErrorModal('mm.login.invalidsite', true);
                     return;
                 }

www/core/components/login/controllers/site.js

@@ -25,23 +25,6 @@ angular.module('mm.core.login')
         $ionicModal, $mmLoginHelper) {
 
     $scope.siteurl = '';
-    $scope.isInvalidUrl = true;
-
-    $scope.validate = function(url) {
-        if (!url) {
-            $scope.isInvalidUrl = true;
-            return;
-        }
-
-        if ($mmSitesManager.getDemoSiteData(url)) {
-            // Is demo site.
-            $scope.isInvalidUrl = false;
-        } else {
-            // formatURL adds the protocol if is missing.
-            var formattedurl = $mmUtil.formatURL(url);
-            $scope.isInvalidUrl = formattedurl.indexOf('://localhost') == -1 && !$mmUtil.isValidURL(formattedurl);
-        }
-    };
 
     $scope.connect = function(url) {
 

www/core/components/login/templates/site.html

@@ -8,10 +8,10 @@
         <form>
           <label class="item item-input item-stacked-label">
             <span class="input-label">{{ 'mm.login.siteaddress' | translate }}</span>
-            <input type="url" placeholder="moodle.org" ng-model="siteurl" mm-no-input-validation ng-change="validate(siteurl)" mm-auto-focus >
+            <input type="url" placeholder="moodle.org" ng-model="siteurl" mm-no-input-validation mm-auto-focus >
           </label>
           <div class="item">
-              <button class="button button-block" ng-click="connect(siteurl)" ng-disabled="isInvalidUrl">{{ 'mm.login.connect' | translate }}</button>
+              <button class="button button-block" ng-click="connect(siteurl)" ng-disabled="!siteurl">{{ 'mm.login.connect' | translate }}</button>
               <!-- <input type="submit" class="button button-block" value="{{ 'mm.login.connect' | translate }}" > -->
           </div>
         </form>

www/core/lib/sitesmanager.js

@@ -86,7 +86,7 @@ angular.module('mm.core')
         // formatURL adds the protocol if is missing.
         siteurl = $mmUtil.formatURL(siteurl);
 
-        if (siteurl.indexOf('://localhost') == -1 && !$mmUtil.isValidURL(siteurl)) {
+        if (!$mmUtil.isValidURL(siteurl)) {
             return $mmLang.translateAndReject('mm.login.invalidsite');
         } else if (!$mmApp.isOnline()) {
             return $mmLang.translateAndReject('mm.core.networkerrormsg');

www/core/lib/util.js

@@ -214,7 +214,7 @@ angular.module('mm.core')
          *                     FALSE otherwise.
          */
         self.isValidURL = function(url) {
-            return /^http(s)?\:\/\/([\da-zA-Z\.-]+)\.([\da-zA-Z\.]{2,6})([\/\w \.-]*)*\/?/i.test(url);
+            return /^http(s)?\:\/\/.+/i.test(url);
         };
 
         /**