@@ -22,8 +22,7 @@ discard block |
||
| 22 | 22 | self::handleUpdates($updates); |
| 23 | 23 | lock::save('getUpdate',BPT::$update->update_id+1);
|
| 24 | 24 | $last_update_id = BPT::$update->update_id+1; |
| 25 | - } |
|
| 26 | - else {
|
|
| 25 | + } else {
|
|
| 27 | 26 | logger::write("There is some problem happened , telegram response : \n".json_encode($updates),loggerTypes::ERROR);
|
| 28 | 27 | BPT::exit(print_r($updates,true)); |
| 29 | 28 | } |
@@ -34,8 +33,7 @@ discard block |
||
| 34 | 33 | private static function loadData(): bool|int|string {
|
| 35 | 34 | if (lock::exist('getUpdate')) {
|
| 36 | 35 | $last_update_id = lock::read('getUpdate');
|
| 37 | - } |
|
| 38 | - else {
|
|
| 36 | + } else {
|
|
| 39 | 37 | self::deleteOldLocks(); |
| 40 | 38 | telegram::deleteWebhook(); |
| 41 | 39 | $last_update_id = 0; |
@@ -15,14 +15,12 @@ discard block |
||
| 15 | 15 | public static function init () {
|
| 16 | 16 | if (settings::$multi) {
|
| 17 | 17 | multi::init(); |
| 18 | - } |
|
| 19 | - else {
|
|
| 18 | + } else {
|
|
| 20 | 19 | if (lock::exist('BPT-HOOK')) {
|
| 21 | 20 | receiver::telegramVerify(); |
| 22 | 21 | receiver::processUpdate(); |
| 23 | 22 | logger::write('Update received , lets process it ;)');
|
| 24 | - } |
|
| 25 | - else {
|
|
| 23 | + } else {
|
|
| 26 | 24 | self::deleteOldLocks(); |
| 27 | 25 | self::checkURL(); |
| 28 | 26 | self::setCertificate(); |
@@ -50,8 +48,7 @@ discard block |
||
| 50 | 48 | $res = telegram::setWebhook($url, settings::$certificate, max_connections:settings::$max_connection, allowed_updates : settings::$allowed_updates); |
| 51 | 49 | if (telegram::$status) {
|
| 52 | 50 | logger::write('Webhook was set successfully',loggerTypes::INFO);
|
| 53 | - } |
|
| 54 | - else {
|
|
| 51 | + } else {
|
|
| 55 | 52 | logger::write("There is some problem happened , telegram response : \n".json_encode($res),loggerTypes::ERROR);
|
| 56 | 53 | BPT::exit(print_r($res,true)); |
| 57 | 54 | } |
@@ -73,8 +70,7 @@ discard block |
||
| 73 | 70 | if (is_string(settings::$certificate)) {
|
| 74 | 71 | if (file_exists(settings::$certificate)) {
|
| 75 | 72 | settings::$certificate = new CURLFile(settings::$certificate); |
| 76 | - } |
|
| 77 | - else {
|
|
| 73 | + } else {
|
|
| 78 | 74 | settings::$certificate = null; |
| 79 | 75 | } |
| 80 | 76 | } |
@@ -34,8 +34,7 @@ discard block |
||
| 34 | 34 | if (!$update) {
|
| 35 | 35 | BPT::exit(); |
| 36 | 36 | } |
| 37 | - } |
|
| 38 | - elseif (!is_a($update,'update')) {
|
|
| 37 | + } elseif (!is_a($update,'update')) {
|
|
| 39 | 38 | $update = new update($update); |
| 40 | 39 | } |
| 41 | 40 | |
@@ -72,26 +71,21 @@ discard block |
||
| 72 | 71 | if (self::handlerExist('message')) {
|
| 73 | 72 | BPT::$handler->message(BPT::$update->message); |
| 74 | 73 | } |
| 75 | - } |
|
| 76 | - elseif (isset(BPT::$update->callback_query)) {
|
|
| 74 | + } elseif (isset(BPT::$update->callback_query)) {
|
|
| 77 | 75 | if (self::handlerExist('callback_query')) {
|
| 78 | 76 | BPT::$handler->callback_query(BPT::$update->callback_query); |
| 79 | 77 | } |
| 80 | - } |
|
| 81 | - elseif (isset(BPT::$update->inline_query)) {
|
|
| 78 | + } elseif (isset(BPT::$update->inline_query)) {
|
|
| 82 | 79 | if (self::handlerExist('inline_query')) {
|
| 83 | 80 | BPT::$handler->inline_query(BPT::$update->inline_query); |
| 84 | 81 | } |
| 85 | - } |
|
| 86 | - elseif (isset(BPT::$update->edited_message)) {
|
|
| 82 | + } elseif (isset(BPT::$update->edited_message)) {
|
|
| 87 | 83 | if (self::handlerExist('edited_message')) {
|
| 88 | 84 | BPT::$handler->edited_message(BPT::$update->edited_message); |
| 89 | 85 | } |
| 90 | - } |
|
| 91 | - elseif (self::handlerExist('something_else')) {
|
|
| 86 | + } elseif (self::handlerExist('something_else')) {
|
|
| 92 | 87 | BPT::$handler->something_else(BPT::$update); |
| 93 | - } |
|
| 94 | - else {
|
|
| 88 | + } else {
|
|
| 95 | 89 | logger::write('Update received but handlers does not set',loggerTypes::WARNING);
|
| 96 | 90 | } |
| 97 | 91 | } |
@@ -706,12 +706,10 @@ discard block |
||
| 706 | 706 | self::setDefaults($action,$arguments); |
| 707 | 707 | if (isset($arguments['answer'])) {
|
| 708 | 708 | return answer::init($action,$arguments); |
| 709 | - } |
|
| 710 | - else {
|
|
| 709 | + } else {
|
|
| 711 | 710 | return self::processResponse($action,curl::init($action,$arguments)); |
| 712 | 711 | } |
| 713 | - } |
|
| 714 | - else {
|
|
| 712 | + } else {
|
|
| 715 | 713 | logger::write("$name method is not supported",loggerTypes::ERROR);
|
| 716 | 714 | throw new bptException('METHOD_NOT_FOUND');
|
| 717 | 715 | } |
@@ -737,8 +735,7 @@ discard block |
||
| 737 | 735 | $arguments['media'][$key]['media'] = new CURLFile($media['media']); |
| 738 | 736 | } |
| 739 | 737 | } |
| 740 | - } |
|
| 741 | - elseif ($file_params = self::methodFile($name)) {
|
|
| 738 | + } elseif ($file_params = self::methodFile($name)) {
|
|
| 742 | 739 | foreach ($file_params as $param) {
|
| 743 | 740 | if (isset($arguments[$param]) && file_exists($arguments[$param])) {
|
| 744 | 741 | $arguments[$param] = new CURLFile($arguments[$param]); |
@@ -760,12 +757,10 @@ discard block |
||
| 760 | 757 | $value = new ($return[0]) ($value); |
| 761 | 758 | } |
| 762 | 759 | return $response; |
| 763 | - } |
|
| 764 | - else {
|
|
| 760 | + } else {
|
|
| 765 | 761 | return new ($return) ($response->result); |
| 766 | 762 | } |
| 767 | - } |
|
| 768 | - else {
|
|
| 763 | + } else {
|
|
| 769 | 764 | return $response->result; |
| 770 | 765 | } |
| 771 | 766 | } |
@@ -777,8 +772,7 @@ discard block |
||
| 777 | 772 | if (!isset($arguments[$default])){
|
| 778 | 773 | $arguments[$default] = self::catchFields($default); |
| 779 | 774 | } |
| 780 | - } |
|
| 781 | - elseif (isset(BPT::$update->$key) || $key === 'other') {
|
|
| 775 | + } elseif (isset(BPT::$update->$key) || $key === 'other') {
|
|
| 782 | 776 | foreach ($default as $def) {
|
| 783 | 777 | if (!isset($arguments[$def])){
|
| 784 | 778 | $arguments[$def] = self::catchFields($def); |
@@ -794,8 +788,7 @@ discard block |
||
| 794 | 788 | self::$status = true; |
| 795 | 789 | self::$pure_response = $response; |
| 796 | 790 | return self::methodReturn($name,$response); |
| 797 | - } |
|
| 798 | - else {
|
|
| 791 | + } else {
|
|
| 799 | 792 | self::$status = false; |
| 800 | 793 | self::$pure_response = $response; |
| 801 | 794 | return new responseError($response); |
@@ -831,9 +824,13 @@ discard block |
||
| 831 | 824 | default => false |
| 832 | 825 | }; |
| 833 | 826 | case 'file_id' : |
| 834 | - if (isset(BPT::$update->message)) $type = 'message'; |
|
| 835 | - elseif (isset(BPT::$update->edited_message)) $type = 'edited_message'; |
|
| 836 | - else return false; |
|
| 827 | + if (isset(BPT::$update->message)) { |
|
| 828 | + $type = 'message'; |
|
| 829 | + } elseif (isset(BPT::$update->edited_message)) { |
|
| 830 | + $type = 'edited_message'; |
|
| 831 | + } else { |
|
| 832 | + return false; |
|
| 833 | + } |
|
| 837 | 834 | |
| 838 | 835 | return match(true) {
|
| 839 | 836 | isset(BPT::$update->$type->animation) => BPT::$update->$type->animation->file_id, |
@@ -17,21 +17,18 @@ discard block |
||
| 17 | 17 | foreach ($object as $key=>$value) { |
| 18 | 18 | if (isset($subs[$key])) { |
| 19 | 19 | $this->$key = new ($subs[$key]) ($value); |
| 20 | - } |
|
| 21 | - else { |
|
| 20 | + } else { |
|
| 22 | 21 | if (is_array($value)) { |
| 23 | 22 | foreach ($value as $sub_key=>$sub_value) { |
| 24 | 23 | if (is_array($sub_value)) { |
| 25 | 24 | foreach ($sub_value as $sub2_value) { |
| 26 | 25 | $this->$key[$sub_key][] = new ($subs['array']['array'][$key]) ($sub2_value); |
| 27 | 26 | } |
| 28 | - } |
|
| 29 | - else{ |
|
| 27 | + } else{ |
|
| 30 | 28 | $this->$key[] = new ($subs['array'][$key]) ($sub_value); |
| 31 | 29 | } |
| 32 | 30 | } |
| 33 | - } |
|
| 34 | - else{ |
|
| 31 | + } else{ |
|
| 35 | 32 | $this->$key = $value; |
| 36 | 33 | if (ucfirst($key) === basename(get_class($this)).'_id') { |
| 37 | 34 | $this->{'id'} = $value; |
@@ -48,8 +45,7 @@ discard block |
||
| 48 | 45 | $name = substr($name,3); |
| 49 | 46 | if (isset($arguments[0])) { |
| 50 | 47 | $this->$name = $arguments[0]; |
| 51 | - } |
|
| 52 | - elseif (isset($arguments['value'])) { |
|
| 48 | + } elseif (isset($arguments['value'])) { |
|
| 53 | 49 | $this->$name = $arguments['value']; |
| 54 | 50 | } |
| 55 | 51 | } |