X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Feditapplication.php;h=00ed3971935ed520bc132c470e832620894e1d06;hb=8912cdc7a4acaeaea3b2b323efc86333ffd5ef63;hp=2ba5f6b313f6ef46c55aaa95e6dc418b5e8b6f22;hpb=8884a5255fb90fda67b63fa0d4252d77176337e5;p=quix0rs-gnu-social.git

diff --git a/actions/editapplication.php b/actions/editapplication.php
index 2ba5f6b313..00ed397193 100644
--- a/actions/editapplication.php
+++ b/actions/editapplication.php
@@ -69,8 +69,8 @@ class EditApplicationAction extends Action
 
         $id = (int)$this->arg('id');
 
-        $this->app   = Oauth_application::staticGet($id);
-        $this->owner = User::staticGet($this->app->owner);
+        $this->app   = Oauth_application::getKV($id);
+        $this->owner = User::getKV($this->app->owner);
         $cur         = common_current_user();
 
         if ($cur->id != $this->owner->id) {
@@ -210,12 +210,10 @@ class EditApplicationAction extends Action
             $this->showForm(_('Source URL is too long.'));
             return;
         } elseif ((mb_strlen($source_url) > 0)
-                  && !Validate::uri($source_url,
-                                    array('allowed_schemes' => array('http', 'https'))))
-            {
-                // TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
-                $this->showForm(_('Source URL is not valid.'));
-                return;
+                  && !common_valid_http_url($source_url)) {
+            // TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+            $this->showForm(_('Source URL is not valid.'));
+            return;
         } elseif (empty($organization)) {
             // TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
             $this->showForm(_('Organization is required.'));
@@ -229,25 +227,20 @@ class EditApplicationAction extends Action
             $this->showForm(_('Organization homepage is required.'));
             return;
         } elseif ((mb_strlen($homepage) > 0)
-                  && !Validate::uri($homepage,
-                                    array('allowed_schemes' => array('http', 'https'))))
-            {
-                // TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
-                $this->showForm(_('Homepage is not a valid URL.'));
-                return;
-            } elseif (mb_strlen($callback_url) > 255) {
-                // TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
-                $this->showForm(_('Callback is too long.'));
-                return;
-            } elseif (mb_strlen($callback_url) > 0
-                      && !Validate::uri($source_url,
-                                        array('allowed_schemes' => array('http', 'https'))
-                                        ))
-                {
-                    // TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
-                    $this->showForm(_('Callback URL is not valid.'));
-                    return;
-                }
+                && !common_valid_http_url($homepage)) {
+            // TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+            $this->showForm(_('Homepage is not a valid URL.'));
+            return;
+        } elseif (mb_strlen($callback_url) > 255) {
+            // TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+            $this->showForm(_('Callback is too long.'));
+            return;
+        } elseif (mb_strlen($callback_url) > 0
+                && !common_valid_http_url($callback_url)) {
+            // TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+            $this->showForm(_('Callback URL is not valid.'));
+            return;
+        }
 
         $cur = common_current_user();
 
@@ -302,7 +295,7 @@ class EditApplicationAction extends Action
      */
     function nameExists($name)
     {
-        $newapp = Oauth_application::staticGet('name', $name);
+        $newapp = Oauth_application::getKV('name', $name);
         if (empty($newapp)) {
             return false;
         } else {