autoname calls

implement getRandomName function

diff --git a/mod/lostpass.php b/mod/lostpass.php
index f4ee91efa1f28d489426deba4847a9ec81448926..8fcdd9aae694e3e044529fe8f100f969b1bf24aa 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -31,7 +31,7 @@ function lostpass_post(App $a)
                $a->internalRedirect();
        }
 
-       $pwdreset_token = autoname(12) . mt_rand(1000, 9999);
+       $pwdreset_token = Strings::getRandomName(12) . mt_rand(1000, 9999);
 
        $fields = [
                'pwdreset' => $pwdreset_token,

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index d2b5c4f055ea370fa4a14c747cfa394c4878a18e..9dd338e2c5e88b6a0c50d814ada5cf4a6023c4ab 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -11,6 +11,7 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 /**
  * Contains methods for installation purpose of Friendica
@@ -264,7 +265,7 @@ class Installer
                }
 
                if ($passed2) {
-                       $str = autoname(8);
+                       $str = Strings::getRandomName(8);
                        $cmd = "$phppath util/testargs.php $str";
                        $result = trim(shell_exec($cmd));
                        $passed3 = $result == $str;

diff --git a/src/Model/Register.php b/src/Model/Register.php
index 5311c80c268ad7404e9b4d256dab443db1a380c6..66f19133b8681f84b14e49a3514f5f92bb4da89c 100644 (file)
--- a/src/Model/Register.php
+++ b/src/Model/Register.php
@@ -78,7 +78,7 @@ class Register
         */
        public static function createForInvitation()
        {
-               $code = autoname(8) . srand(1000, 9999);
+               $code = Strings::getRandomName(8) . srand(1000, 9999);
 
                $fields = [
                        'hash' => $code,

diff --git a/src/Model/User.php b/src/Model/User.php
index e52ff319dd25e38257484f778caa3a4a5ca209dc..187708eb79bf794b1f8551047fc846d2dc840b01 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -270,7 +270,7 @@ class User
         */
        public static function generateNewPassword()
        {
-               return autoname(6) . mt_rand(100, 9999);
+               return Strings::getRandomName(6) . mt_rand(100, 9999);
        }
 
        /**

diff --git a/src/Util/Strings.php b/src/Util/Strings.php
index bf31f62fa0af5921773b27093765aec0d3e4fcfd..07acb4586deabfe90c4c78edf73aa17fa31adc59 100644 (file)
--- a/src/Util/Strings.php
+++ b/src/Util/Strings.php
@@ -68,7 +68,7 @@ class Strings
      * 
      * @return string
      */
-    public static function getRandomName($len) // autoname()
+    public static function getRandomName($len)
     {
         if ($len <= 0) {
             return '';