BPTproto / BPT-Multi

types/replyKeyboardMarkup.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     public bool $selective;
 
 
-    public function __construct(stdClass|null $object = null) {
+    public function __construct(stdClass | null $object = null) {
         if ($object != null) {
             parent::__construct($object, self::subs);
         }

types/chatMemberUpdated.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     public chatInviteLink $invite_link;
 
 
-    public function __construct(stdClass|null $object = null) {
+    public function __construct(stdClass | null $object = null) {
         if ($object != null) {
             parent::__construct($object, self::subs);
         }

database/database.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     /**
      * @method Json_init
      */
-    public function json_init () {
+    public function json_init() {
         (new jsondb())->init(handler::$dbname);
     }
 }
\ No newline at end of file

database/handler.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
     /**
      *
      */
-    public function __construct (array $settings) {
+    public function __construct(array $settings) {
         if (in_array($settings['type'], self::TYPES)) {
             if ($settings['type'] === 'Mysqli') {
                 if (self::CheckParam($settings)) {
@@ -88,7 +88,7 @@ 
         }
     }
 
-    private static function CheckParam (array $array) {
+    private static function CheckParam(array $array) {
         if (isset($array['username']) && isset($array['dbname']) && isset($array['password'])) {
             self::$host = $array['host'] ?? 'localhost';
             self::$username = $array['username'];

Braces +5 added lines, -10 removed lines

@@ -62,13 +62,11 @@ 
                     if ($db) {
                         self::$connect = $db;
                         print_r($db);
-                    }
-                    else {
+                    } else {
                         print self::$username;
                         throw new \exception('a problem to connecting');
                     }
-                }
-                else {
+                } else {
                     throw new \exception('required parameters not found');
                 }
             }
@@ -77,13 +75,11 @@ 
                     self::$type = $settings['type'];
                     self::$dbname = $settings['dbname'];
                     (new database())->json_init();
-                }
-                else {
+                } else {
                     throw new \exception('parameter dbanme not found');
                 }
             }
-        }
-        else {
+        } else {
             throw new \exception('parameter type not found');
         }
     }
@@ -96,8 +92,7 @@ 
             self::$password = $array['password'];
             self::$charset = $array['charset'] ?? 'utf8';
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }

exception/bptException.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
 /**

  * Exceptions created by BPT and subclasses

  */

-class bptException extends Exception{}
\ No newline at end of file
+class bptException extends Exception {}
\ No newline at end of file

tools.php

Spacing +2 added lines, -2 removed lines

@@ -2,9 +2,9 @@
 
 namespace BPT;
 
-use BPT\tools\{is,file,convert,generator,encrypt};
+use BPT\tools\{is, file, convert, generator, encrypt};
 
-class tools{
+class tools {
     use is;
     use file;
     use convert;

tools/is.php

Spacing +11 added lines, -11 removed lines

@@ -20,7 +20,7 @@ 
      *
      * @return bool
      */
-    public static function isUsername (string $username): bool {
+    public static function isUsername(string $username): bool {
         $length = strlen($username);
         return !str_contains($username, '__') && $length >= 5 && $length <= 33 && preg_match('/^@?([a-zA-Z])(\w{4,31})$/', $username);
     }
@@ -37,7 +37,7 @@ 
      *
      * @return bool
      */
-    public static function ipInRange (string $ip, string $range): bool {
+    public static function ipInRange(string $ip, string $range): bool {
         if (!str_contains($range, '/')) {
             $range .= '/32';
         }
@@ -57,7 +57,7 @@ 
      *
      * @return bool
      */
-    public static function isTelegram (string $ip): bool {
+    public static function isTelegram(string $ip): bool {
         return tools::ipInRange($ip, '149.154.160.0/20') || tools::ipInRange($ip, '91.108.4.0/22');
     }
 
@@ -72,10 +72,10 @@ 
      *
      * @return bool
      */
-    public static function isCloudFlare (string $ip): bool {
+    public static function isCloudFlare(string $ip): bool {
         $cf_ips = ['173.245.48.0/20', '103.21.244.0/22', '103.22.200.0/22', '103.31.4.0/22', '141.101.64.0/18', '108.162.192.0/18', '190.93.240.0/20', '188.114.96.0/20', '197.234.240.0/22', '198.41.128.0/17', '162.158.0.0/15', '104.16.0.0/12', '172.64.0.0/13', '131.0.72.0/22'];
         foreach ($cf_ips as $cf_ip) {
-            if (self::ipInRange($ip,$cf_ip)) {
+            if (self::ipInRange($ip, $cf_ip)) {
                 return true;
             }
         }
@@ -95,9 +95,9 @@ 
      *
      * @return bool|user return array when verify is active and token is true array of telegram getMe result
      */
-    public static function isToken (string $token, bool $verify = false): bool|user {
+    public static function isToken(string $token, bool $verify = false): bool | user {
         if (preg_match('/^(\d{8,10}):[\w\-]{35}$/', $token)) {
-            if ($verify){
+            if ($verify) {
                 $res = telegram::me($token);
                 if (telegram::$status) {
                     return $res;
@@ -129,14 +129,14 @@ 
      *
      * @return bool
      */
-    public static function isJoined (array|string|int $ids , int|null $user_id = null): bool {
+    public static function isJoined(array | string | int $ids, int | null $user_id = null): bool {
         if (!is_array($ids)) {
             $ids = [$ids];
         }
         $user_id = $user_id ?? request::catchFields('user_id');
 
         foreach ($ids as $id) {
-            $check = telegram::getChatMember($id,$user_id);
+            $check = telegram::getChatMember($id, $user_id);
             if (telegram::$status) {
                 $check = $check->status;
                 if ($check === chatMemberStatus::LEFT || $check === chatMemberStatus::KICKED) {
@@ -163,7 +163,7 @@ 
      *
      * @return array keys will be id and values will be bool(null for not founded ids)
      */
-    public static function joinChecker (array|string|int $ids , int|null $user_id = null): array {
+    public static function joinChecker(array | string | int $ids, int | null $user_id = null): array {
         if (!is_array($ids)) {
             $ids = [$ids];
         }
@@ -171,7 +171,7 @@ 
 
         $result = [];
         foreach ($ids as $id) {
-            $check = telegram::getChatMember($id,$user_id);
+            $check = telegram::getChatMember($id, $user_id);
             if (telegram::$status) {
                 $check = $check->status;
                 $result[$id] = $check !== chatMemberStatus::LEFT && $check !== chatMemberStatus::KICKED;

Braces +2 added lines, -1 removed lines

@@ -175,8 +175,9 @@
             if (telegram::$status) {
                 $check = $check->status;
                 $result[$id] = $check !== chatMemberStatus::LEFT && $check !== chatMemberStatus::KICKED;
+            } else {
+                $result[$id] = null;
             }
-            else $result[$id] = null;
         }
         return $result;
     }

tools/encrypt.php

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
      * @return string|bool|array{hash:string, key:string, iv:string}
      * @throws bptException
      */
-    public static function crypto (string $action, string $text, string $key = null, string $iv = null): bool|array|string {
+    public static function crypto(string $action, string $text, string $key = null, string $iv = null): bool | array | string {
         if (extension_loaded('openssl')) {
             if ($action === cryptoAction::ENCRYPT) {
                 $key = self::randomString(64);
@@ -39,22 +39,22 @@ 
             }
             elseif ($action === cryptoAction::DECRYPT) {
                 if (empty($key)) {
-                    logger::write("tools::crypto function used\nkey parameter is not set",loggerTypes::ERROR);
+                    logger::write("tools::crypto function used\nkey parameter is not set", loggerTypes::ERROR);
                     throw new bptException('ARGUMENT_NOT_FOUND_KEY');
                 }
                 elseif (empty($iv)) {
-                    logger::write("tools::crypto function used\niv parameter is not set",loggerTypes::ERROR);
+                    logger::write("tools::crypto function used\niv parameter is not set", loggerTypes::ERROR);
                     throw new bptException('ARGUMENT_NOT_FOUND_IV');
                 }
                 return openssl_decrypt(base64_decode($text), 'AES-256-CBC', $key, 1, $iv);
             }
             else {
-                logger::write("tools::crypto function used\naction is not right, its must be `encode` or `decode`",loggerTypes::WARNING);
+                logger::write("tools::crypto function used\naction is not right, its must be `encode` or `decode`", loggerTypes::WARNING);
                 return false;
             }
         }
         else {
-            logger::write("tools::crypto function used\nopenssl extension is not found , It may not be installed or enabled",loggerTypes::ERROR);
+            logger::write("tools::crypto function used\nopenssl extension is not found , It may not be installed or enabled", loggerTypes::ERROR);
             throw new bptException('OPENSSL_EXTENSION_MISSING');
         }
     }

Braces +4 added lines, -8 removed lines

@@ -36,24 +36,20 @@
                 $iv = self::randomString();
                 $output = base64_encode(openssl_encrypt($text, 'AES-256-CBC', $key, 1, $iv));
                 return ['hash' => $output, 'key' => $key, 'iv' => $iv];
-            }
-            elseif ($action === cryptoAction::DECRYPT) {
+            } elseif ($action === cryptoAction::DECRYPT) {
                 if (empty($key)) {
                     logger::write("tools::crypto function used\nkey parameter is not set",loggerTypes::ERROR);
                     throw new bptException('ARGUMENT_NOT_FOUND_KEY');
-                }
-                elseif (empty($iv)) {
+                } elseif (empty($iv)) {
                     logger::write("tools::crypto function used\niv parameter is not set",loggerTypes::ERROR);
                     throw new bptException('ARGUMENT_NOT_FOUND_IV');
                 }
                 return openssl_decrypt(base64_decode($text), 'AES-256-CBC', $key, 1, $iv);
-            }
-            else {
+            } else {
                 logger::write("tools::crypto function used\naction is not right, its must be `encode` or `decode`",loggerTypes::WARNING);
                 return false;
             }
-        }
-        else {
+        } else {
             logger::write("tools::crypto function used\nopenssl extension is not found , It may not be installed or enabled",loggerTypes::ERROR);
             throw new bptException('OPENSSL_EXTENSION_MISSING');
         }

tools/convert.php

Spacing +8 added lines, -8 removed lines

@@ -21,10 +21,10 @@ 
      *
      * @return string
      */
-    public static function byteFormat (int $byte, int $precision = 2): string {
+    public static function byteFormat(int $byte, int $precision = 2): string {
         $rate_counter = 0;
 
-        while ($byte > 1024){
+        while ($byte > 1024) {
             $byte /= 1024;
             $rate_counter++;
         }
@@ -33,7 +33,7 @@ 
             $byte = round($byte, $precision);
         }
 
-        return $byte . ' ' . ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB'][$rate_counter];
+        return $byte.' '.['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB'][$rate_counter];
     }
 
     /**
@@ -50,10 +50,10 @@ 
      *
      * @return string|false return false when mode is incorrect
      */
-    public static function modeEscape (string $text, string $mode = parseMode::HTML): string|false {
+    public static function modeEscape(string $text, string $mode = parseMode::HTML): string | false {
         return match ($mode) {
-            parseMode::HTML => str_replace(['&', '<', '>',], ["&amp;", "&lt;", "&gt;",], $text),
-            parseMode::MARKDOWN => str_replace(['\\', '_', '*', '`', '['], ['\\\\', '\_', '\*', '\`', '\[',], $text),
+            parseMode::HTML => str_replace(['&', '<', '>', ], ["&amp;", "&lt;", "&gt;", ], $text),
+            parseMode::MARKDOWN => str_replace(['\\', '_', '*', '`', '['], ['\\\\', '\_', '\*', '\`', '\[', ], $text),
             parseMode::MARKDOWNV2 => str_replace(
                 ['_', '*', '[', ']', '(', ')', '~', '`', '>', '#', '+', '-', '=', '|', '{', '}', '.', '!', '\\'],
                 ['\_', '\*', '\[', '\]', '\(', '\)', '\~', '\`', '\>', '\#', '\+', '\-', '\=', '\|', '\{', '\}', '\.', '\!', '\\\\'],
@@ -92,12 +92,12 @@ 
      * @return array{status: string,year: string,month: string,day: string,hour: string,minute: string,second: string}
      * @throws Exception
      */
-    public static function timeDiff (int|string $target_time, int|string|null $base_time = null): array {
+    public static function timeDiff(int | string $target_time, int | string | null $base_time = null): array {
         if (!isset($base_time)) {
             $base_time = '@'.time();
         }
         $base_time = new DateTime($base_time);
-        $target_time = new DateTime(is_numeric($target_time) ? '@' . $target_time : $target_time . ' +00:00');
+        $target_time = new DateTime(is_numeric($target_time) ? '@'.$target_time : $target_time.' +00:00');
 
         $diff = $base_time->diff($target_time);
 

Braces +2 added lines, -1 removed lines

@@ -105,8 +105,9 @@
         foreach ($string as $k => &$v) {
             if ($diff->$v) {
                 $v = $diff->$v;
+            } else {
+                unset($string[$k]);
             }
-            else unset($string[$k]);
         }
         $string['status'] = $base_time < $target_time ? 'later' : 'ago';