Fixed E_NOTICE in boot.php and DBA class (#5430)

[friendica.git] / src / Worker / Cron.php

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index a0dfda3309987ceafb0d2e0a7fa549c696d14888..bf1b44f55d4e0c0530c0729a5f72c5c67cfa6a66 100644 (file)
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -4,12 +4,13 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Util\DateTimeFormat;
-use dba;
 
 require_once 'include/dba.php';
 
@@ -17,7 +18,7 @@ class Cron
 {
        public static function execute($parameter = '', $generation = 0)
        {
-               $a = \Friendica\BaseObject::getApp();
+               $a = BaseObject::getApp();
 
                // Poll contacts with specific parameters
                if (!empty($parameter)) {
@@ -101,16 +102,23 @@ class Cron
                if (Config::get('system', 'last_cron_hourly', 0) + 3600 < time()) {
 
                        // Delete all done workerqueue entries
-                       dba::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
+                       DBA::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
 
                        // Optimizing this table only last seconds
                        if (Config::get('system', 'optimize_workerqueue', false)) {
-                               dba::e("OPTIMIZE TABLE `workerqueue`");
+                               DBA::e("OPTIMIZE TABLE `workerqueue`");
                        }
 
                        Config::set('system', 'last_cron_hourly', time());
                }
 
+               // Ensure to have a .htaccess file.
+               // this is a precaution for systems that update automatically
+               $basepath = $a->get_basepath();
+               if (!file_exists($basepath . '/.htaccess')) {
+                       copy($basepath . '/.htaccess-dist', $basepath . '/.htaccess');
+               }
+
                // Poll contacts
                self::pollContacts($parameter, $generation);