BPTproto / BPT-Multi

src/tools.php

Braces +34 added lines, -32 removed lines

@@ -217,8 +217,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;
     }
@@ -259,8 +260,7 @@ 
             curl_exec($ch);
             $size = curl_getinfo($ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD);
             curl_close($ch);
-        }
-        else {
+        } else {
             $path = realpath($path);
             $size = file_exists($path) ? filesize($path) : false;
         }
@@ -331,8 +331,7 @@ 
                     $zip->addFile($filePath, substr($filePath, $root_len));
                 }
             }
-        }
-        else {
+        } else {
             $zip->addFile($path, basename($path));
         }
         return $zip->close();
@@ -351,9 +350,13 @@ 
      */
     public static function downloadFile (string $url, string $path,int $chunk_size = 512): bool {
         $file = fopen($url, 'rb');
-        if (!$file) return false;
+        if (!$file) {
+            return false;
+        }
         $path = fopen($path, 'wb');
-        if (!$path) return false;
+        if (!$path) {
+            return false;
+        }
 
         $length = $chunk_size * 1024;
         while (!feof($file)){
@@ -462,8 +465,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';
 
@@ -529,8 +533,7 @@ 
             if ($last === "\0") {
                 $new .= str_repeat($last, ord($char));
                 $last = '';
-            }
-            else {
+            } else {
                 $new .= $last;
                 $last = $char;
             }
@@ -614,7 +617,9 @@ 
             }
             $rows = [];
             foreach ($keyboard as $row) {
-                if (!is_array($row)) continue;
+                if (!is_array($row)) {
+                    continue;
+                }
                 $buttons = [];
                 foreach ($row as $base_button) {
                     $button_info = explode('||', $base_button);
@@ -623,15 +628,12 @@ 
                     if (count($button_info) > 1) {
                         if ($button_info[1] === 'con') {
                             $button->setRequest_contact(true);
-                        }
-                        elseif ($button_info[1] === 'loc') {
+                        } elseif ($button_info[1] === 'loc') {
                             $button->setRequest_location(true);
-                        }
-                        elseif ($button_info[1] === 'poll') {
+                        } elseif ($button_info[1] === 'poll') {
                             $type = $button_info[2] === pollType::QUIZ ? pollType::QUIZ : pollType::REGULAR;
                             $button->setRequest_poll((new keyboardButtonPollType())->setType($type));
-                        }
-                        elseif ($button_info[1] === 'web' && isset($button_info[2])) {
+                        } elseif ($button_info[1] === 'web' && isset($button_info[2])) {
                             $url = $button_info[2];
                             $button->setWeb_app((new webAppInfo())->setUrl($url));
                         }
@@ -642,8 +644,7 @@ 
             }
             $keyboard_object->setKeyboard($rows);
             return $keyboard_object;
-        }
-        elseif (!empty($inline)) {
+        } elseif (!empty($inline)) {
             $keyboard_object = new inlineKeyboardMarkup();
             $rows = [];
             foreach ($inline as $row) {
@@ -653,12 +654,10 @@ 
                     if (isset($button_info[1])) {
                         if (filter_var($button_info[1], FILTER_VALIDATE_URL) && str_starts_with($button_info[1], 'http')) {
                             $button->setText($button_info[0])->setUrl($button_info[1]);
-                        }
-                        else {
+                        } else {
                             $button->setText($button_info[0])->setCallback_data($button_info[1]);
                         }
-                    }
-                    else {
+                    } else {
                         $button->setText($button_info[0])->setUrl('https://t.me/BPT_CH');
                     }
                     $buttons[] = $button;
@@ -667,8 +666,7 @@ 
             }
             $keyboard_object->setInline_keyboard($rows);
             return $keyboard_object;
-        }
-        else {
+        } else {
             logger::write("tools::eKey function used\nkeyboard or inline parameter must be set",loggerTypes::ERROR);
             throw new bptException('ARGUMENT_NOT_FOUND_KEYBOARD_INLINE');
         }
@@ -687,8 +685,12 @@ 
      * @return string
      */
     public static function inviteLink (int $user_id = null, string $bot_username = null): string {
-        if (empty($user_id)) $user_id = telegram::catchFields(fields::USER_ID);
-        if (empty($bot_username)) $bot_username = telegram::getMe()->username;
+        if (empty($user_id)) {
+            $user_id = telegram::catchFields(fields::USER_ID);
+        }
+        if (empty($bot_username)) {
+            $bot_username = telegram::getMe()->username;
+        }
         return 'https://t.me/' . str_replace('@', '', $bot_username) . '?start=ref_' . tools::shortEncode($user_id);
     }
 
@@ -723,8 +725,7 @@ 
             $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');
@@ -734,8 +735,7 @@ 
                 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;
         }
@@ -757,7 +757,9 @@ 
             $array[] = $num % 62;
             $num = floor($num / 62);
         }
-        if (count($array) < 1) $array = [0];
+        if (count($array) < 1) {
+            $array = [0];
+        }
         foreach ($array as &$value) {
             $value = $codes[$value];
         }

src/database/mysql.php

Braces +16 added lines, -19 removed lines

@@ -69,17 +69,13 @@ 
         if (self::$auto_process) {
             if (isset(BPT::$update->message)) {
                 self::processMessage(BPT::$update->message);
-            }
-            elseif (isset(BPT::$update->edited_message)) {
+            } elseif (isset(BPT::$update->edited_message)) {
                 self::processMessage(BPT::$update->edited_message);
-            }
-            elseif (isset(BPT::$update->callback_query)) {
+            } elseif (isset(BPT::$update->callback_query)) {
                 self::processCallbackQuery(BPT::$update->callback_query);
-            }
-            elseif (isset(BPT::$update->inline_query)) {
+            } elseif (isset(BPT::$update->inline_query)) {
                 self::processInlineQuery(BPT::$update->inline_query);
-            }
-            elseif (isset(BPT::$update->my_chat_member)) {
+            } elseif (isset(BPT::$update->my_chat_member)) {
                 self::processMyChatMember(BPT::$update->my_chat_member);
             }
         }
@@ -136,8 +132,7 @@ 
         if ($type === chatType::PRIVATE) {
             if ($update->new_chat_member->status === chatMemberStatus::MEMBER) {
                 self::update('users', ['blocked' => false], ['id' => $update->from->id], 1);
-            }
-            else {
+            } else {
                 self::update('users', ['blocked' => true], ['id' => $update->from->id], 1);
             }
         }
@@ -226,8 +221,7 @@ 
         foreach ($array as $name => $value) {
             if ($first) {
                 $first = false;
-            }
-            else {
+            } else {
                 $query .= $operator;
             }
             $query .= " `$name` = ?";
@@ -244,8 +238,7 @@ 
         }
         if (!empty($count)) {
             $query .= !empty($offset) ? " LIMIT $offset,$count" : " LIMIT $count";
-        }
-        elseif (!empty($offset)) {
+        } elseif (!empty($offset)) {
             $query .= " OFFSET $offset";
         }
         return $values;
@@ -303,7 +296,9 @@ 
     public static function insert (string $table, string|array $columns, array|string $values): mysqli_result|bool {
         $query = "INSERT INTO `$table`(";
         $query .= '`' . (is_string($columns) ? $columns : implode('`,`', $columns)) . '`) VALUES (';
-        if (is_string($values)) $values = [$values];
+        if (is_string($values)) {
+            $values = [$values];
+        }
         $query .= '?' . str_repeat(',?', count($values) - 1) . ')';
         return self::query($query, $values, false);
     }
@@ -327,8 +322,7 @@ 
         $query = "SELECT ";
         if ($columns == '*') {
             $query .= "* ";
-        }
-        else {
+        } else {
             $query .= '`' . (is_string($columns) ? $columns : implode('`,`', $columns)) . '` ';
         }
         $query .= "FROM `$table`";
@@ -389,8 +383,11 @@ 
     public static function selectEach (string $table, array|string $columns = '*', array $where = null, int $count = null, int $offset = null): bool|Generator {
         $res = self::select($table, $columns, $where, $count, $offset);
         if ($res) {
-            while ($row = $res->fetch_assoc()) yield $row;
+            while ($row = $res->fetch_assoc()) {
+                yield $row;
+            }
+        } else {
+            return $res;
         }
-        else return $res;
     }
 }
\ No newline at end of file

src/database/json.php

Braces +43 added lines, -56 removed lines

@@ -195,17 +195,13 @@ 
     public static function process (): void {
         if (isset(BPT::$update->message)) {
             self::processMessage(BPT::$update->message);
-        }
-        elseif (isset(BPT::$update->edited_message)) {
+        } elseif (isset(BPT::$update->edited_message)) {
             self::processMessage(BPT::$update->edited_message);
-        }
-        elseif (isset(BPT::$update->callback_query)) {
+        } elseif (isset(BPT::$update->callback_query)) {
             self::processCallbackQuery(BPT::$update->callback_query);
-        }
-        elseif (isset(BPT::$update->inline_query)) {
+        } elseif (isset(BPT::$update->inline_query)) {
             self::processInlineQuery(BPT::$update->inline_query);
-        }
-        elseif (isset(BPT::$update->chat_member)) {
+        } elseif (isset(BPT::$update->chat_member)) {
             self::processChatMember(BPT::$update->chat_member);
         }
     }
@@ -230,8 +226,7 @@ 
             if (empty(self::$group)) {
                 $category = 'supergroups';
                 $group_id = self::$supergroup_id;
-            }
-            else {
+            } else {
                 $category = 'groups';
                 $group_id = self::$group_id;
             }
@@ -247,8 +242,7 @@ 
             if (empty(self::$group)) {
                 $category = 'supergroups';
                 $group_id = self::$supergroup_id;
-            }
-            else {
+            } else {
                 $category = 'groups';
                 $group_id = self::$group_id;
             }
@@ -265,8 +259,7 @@ 
                 self::$user = self::read($category . '/' . self::$user_id);
                 self::$old_user = clone self::$user;
                 self::$user->last_active = time();
-            }
-            else {
+            } else {
                 self::$ids[$category][] = self::$user_id;
                 self::$user = (object) self::$user_default_data;
                 self::$user->first_active = self::$user->last_active = time();
@@ -279,19 +272,16 @@ 
                     }
                 }
             }
-        }
-        elseif ($type === chatType::CHANNEL) {
+        } elseif ($type === chatType::CHANNEL) {
             self::$channel_id = $update->chat->id;
             if (in_array(self::$channel_id,self::$ids[$category])) {
                 self::$channel = self::read($category . '/' . self::$channel_id);
                 self::$old_channel = clone self::$channel;
-            }
-            else {
+            } else {
                 self::$ids[$category][] = self::$channel_id;
                 self::$channel = (object) self::$channel_default_data;
             }
-        }
-        else {
+        } else {
             self::$user_id = $update->from->id;
             self::$group_user_id = self::$user_id;
             $chat_id = $update->chat->id;
@@ -302,22 +292,19 @@ 
                     self::$old_supergroup = clone self::$supergroup;
                     self::$group_ids = self::read($category . '/' . $chat_id . '/users');
                     self::$old_group_ids = clone self::$group_ids;
-                }
-                else {
+                } else {
                     self::$ids[$category][] = $chat_id;
                     self::$supergroup = (object) self::$supergroup_default_data;
                     self::$group_ids = [];
                 }
-            }
-            else {
+            } else {
                 self::$group_id = $update->chat->id;
                 if (in_array($chat_id,self::$ids[$category])) {
                     self::$group = self::read($category . '/' . $chat_id);
                     self::$old_group = clone self::$group;
                     self::$group_ids = self::read($category . '/' . $chat_id . '/users');
                     self::$old_group_ids = clone self::$group_ids;
-                }
-                else {
+                } else {
                     self::$ids[$category][] = $chat_id;
                     self::$group = (object) self::$group_default_data;
                     self::$group_ids = [];
@@ -327,15 +314,16 @@ 
             if (in_array(self::$user_id,self::$group_ids)) {
                 self::$group_user = self::read($category . '/' . $chat_id . '/' . self::$user_id);
                 self::$old_group_user = clone self::$group_user;
-            }
-            else {
+            } else {
                 self::$group_ids[] = self::$user_id;
                 self::$group_user = (object) self::$group_user_default_data;
             }
 
             self::$user = self::read($category.'/'.self::$user_id);
             self::$old_user = clone self::$user;
-            if (!empty(self::$user)) self::$user->last_active = time();
+            if (!empty(self::$user)) {
+                self::$user->last_active = time();
+            }
         }
     }
 
@@ -349,15 +337,13 @@ 
                 self::$old_user = clone self::$user;
                 self::$user->last_active = time();
             }
-        }
-        elseif ($type === chatType::CHANNEL) {
+        } elseif ($type === chatType::CHANNEL) {
             self::$channel_id = $update->message->chat->id;
             if (in_array(self::$channel_id,self::$ids[$category])) {
                 self::$channel = self::read($category . '/' . self::$channel_id);
                 self::$old_channel = clone self::$channel;
             }
-        }
-        else {
+        } else {
             self::$user_id = $update->from->id;
             $chat_id = $update->message->chat->id;
             if (in_array($chat_id,self::$ids[$category])) {
@@ -365,8 +351,7 @@ 
                     self::$supergroup_id = $update->message->chat->id;
                     self::$supergroup = self::read($category . '/' . $chat_id);
                     self::$old_supergroup = clone self::$supergroup;
-                }
-                else {
+                } else {
                     self::$group_id = $update->message->chat->id;
                     self::$group = self::read($category . '/' . $chat_id);
                     self::$old_group = clone self::$group;
@@ -383,7 +368,9 @@ 
 
             self::$user = self::read($category.'/'.self::$user_id);
             self::$old_user = clone self::$user;
-            if (!empty(self::$user)) self::$user->last_active = time();
+            if (!empty(self::$user)) {
+                self::$user->last_active = time();
+            }
         }
     }
 
@@ -409,13 +396,11 @@ 
             if (in_array(self::$channel_id,self::$ids[$category])) {
                 self::$channel = self::read($category . '/' . self::$channel_id);
                 self::$old_channel = clone self::$channel;
-            }
-            else {
+            } else {
                 self::$ids[$category][] = self::$channel_id;
                 self::$channel = (object) self::$channel_default_data;
             }
-        }
-        else {
+        } else {
             $chat_id = $update->chat->id;
             $by_id = $update->from->id;
             $old_user = $update->old_chat_member;
@@ -431,22 +416,19 @@ 
                     self::$old_supergroup = clone self::$supergroup;
                     self::$group_ids = self::read($category . '/' . $chat_id . '/users');
                     self::$old_group_ids = clone self::$group_ids;
-                }
-                else {
+                } else {
                     self::$ids[$category][] = $chat_id;
                     self::$supergroup = (object) self::$supergroup_default_data;
                     self::$group_ids = [];
                 }
-            }
-            elseif ($type === chatType::GROUP) {
+            } elseif ($type === chatType::GROUP) {
                 self::$group_id = $chat_id;
                 if (in_array($chat_id,self::$ids[$category])) {
                     self::$group = self::read($category . '/' . $chat_id);
                     self::$old_group = clone self::$group;
                     self::$group_ids = self::read($category . '/' . $chat_id . '/users');
                     self::$old_group_ids = clone self::$group_ids;
-                }
-                else {
+                } else {
                     self::$ids[$category][] = $chat_id;
                     self::$group = (object) self::$group_default_data;
                     self::$group_ids = [];
@@ -456,8 +438,7 @@ 
             if (!in_array($user_id,self::$group_ids)) {
                 self::$group_ids[] = $user_id;
                 self::$group_user = (object) self::$group_user_default_data;
-            }
-            else {
+            } else {
                 self::$group_user_id = $by_id == $user_id ? $user_id : $by_id;
                 self::$group_user = self::read($category . '/' . $chat_id . '/' . self::$group_user_id);
             }
@@ -470,8 +451,7 @@ 
                         self::$group_user->removed_by = $by_id;
                     }
                 }
-            }
-            else {
+            } else {
                 if ($old_user->status === chatMemberStatus::LEFT || $old_user->status === chatMemberStatus::KICKED) {
                     self::$group_user->presence = true;
                     self::$group_user->removed = false;
@@ -481,8 +461,7 @@ 
                         if (!empty($invite_link)) {
                             self::$group_user->accepted_by = $by_id;
                             self::$group_user->invited_by = null;
-                        }
-                        else {
+                        } else {
                             self::$group_user->invited_by = $by_id;
                             self::$group_user->accepted_by = null;
                         }
@@ -501,7 +480,9 @@ 
      * @throws bptException
      */
     public static function deleteUser (int $user_id = null): bool {
-        if (empty($user_id)) $user_id = telegram::catchFields(fields::USER_ID);
+        if (empty($user_id)) {
+            $user_id = telegram::catchFields(fields::USER_ID);
+        }
         if (!file_exists(realpath(self::$folder . '/privates/' . $user_id . '.json'))) {
             return false;
         }
@@ -522,7 +503,9 @@ 
      * @throws bptException
      */
     public static function deleteGroup (int $group_id = null): bool {
-        if (empty($group_id)) $group_id = telegram::catchFields(fields::CHAT_ID);
+        if (empty($group_id)) {
+            $group_id = telegram::catchFields(fields::CHAT_ID);
+        }
         if (!file_exists(realpath(self::$folder . '/groups/' . $group_id . '.json'))) {
             return false;
         }
@@ -544,7 +527,9 @@ 
      * @throws bptException
      */
     public static function deleteSuperGroup (int $group_id = null): bool {
-        if (empty($group_id)) $group_id = telegram::catchFields(fields::CHAT_ID);
+        if (empty($group_id)) {
+            $group_id = telegram::catchFields(fields::CHAT_ID);
+        }
         if (!file_exists(realpath(self::$folder . '/supergroups/' . $group_id . '.json'))) {
             return false;
         }
@@ -566,7 +551,9 @@ 
      * @throws bptException
      */
     public static function deleteChannel (int $channel_id = null): bool {
-        if (empty($channel_id)) $channel_id = telegram::catchFields(fields::CHAT_ID);
+        if (empty($channel_id)) {
+            $channel_id = telegram::catchFields(fields::CHAT_ID);
+        }
         if (!file_exists(realpath(self::$folder . '/channels/' . $channel_id . '.json'))) {
             return false;
         }

src/logger.php

Braces +2 added lines, -4 removed lines

@@ -23,8 +23,7 @@ 
         if (file_exists($log_file) && !(filesize($log_file) > self::$log_size * 1024 * 1024)) {
             $mode = 'a';
             $write = false;
-        }
-        else {
+        } else {
             $mode = 'w';
             $write = true;
         }
@@ -55,8 +54,7 @@ 
         $text = date('Y/m/d H:i:s') . ( $type === loggerTypes::NONE ? " : $data\n\n" : " : ⤵\n$type : $data\n\n" );
         if (!is_null(self::$handler)) {
             fwrite(self::$handler, $text);
-        }
-        else {
+        } else {
             self::$waited_logs[] = $text;
         }
     }