Moved getDB.php to mods/getdb.php

The script now no longer creates an sql file, but runs the update directly. It can also be run from /pokedex and from cron in the same way as overview_refresh etc.

commands/pokedex.php

@@ -77,6 +77,12 @@
                 'text'          => getTranslation('import') . SP . '(ccev pogoinfo)',
                 'callback_data' => '0:pogoinfo:0'
             ]
+        ],
+        [
+            [
+                'text'          => 'Update Pokemon table',
+                'callback_data' => '0:getdb:0'
+            ]
         ]
     ];
     // Set message.

core/bot/ddos.php

@@ -38,6 +38,9 @@
         }else if ($action == 'post_raid' && $update['skip_ddos'] == true) {
             $skip_ddos_check = 1;
             debug_log('Skipping DDOS check for posting raid directly...','!');
+        }else if ($action == 'getdb') {
+            $skip_ddos_check = 1;
+            debug_log('Skipping DDOS check for database update...','!');
         }
     } else if(isset($update['cleanup'])) {
             $skip_ddos_check = 1;

core/bot/logic/bot_upgrade_check.php

@@ -61,12 +61,7 @@ function bot_upgrade_check($current, $latest)
         }
         // If previous sql upgrades were successfull, update also pokemon table
         if(!$require_upgrade) {
-          if (run_sql_file(ROOT_PATH . '/sql/game-master-raid-boss-pokedex.sql')) {
-            upgrade_config_version($latest);
-          } else {
-            $require_upgrade = true;
-            info_log('AUTO UPGRADE FAILED: ' . ROOT_PATH . '/sql/game-master-raid-boss-pokedex.sql!');
-          }
+          require_once(ROOT_PATH . '/mods/getdb.php');
         }
         // Signal whether manual action is required or not.
         return $require_upgrade;

logic/curl_get_contents.php

@@ -11,7 +11,10 @@ function curl_get_contents($url)
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($ch, CURLOPT_URL, $url);
     curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" );
-    $content = curl_exec($ch);
+    if(!$content = curl_exec($ch)) {
+        info_log(curl_error($ch));
+        return false;
+    }
     curl_close($ch);
     return $content;
 }