X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FWorker%2FCron.php;h=edd3e22ef41361d5295c3856ed8a9bc01c4073c7;hb=eaf81e5e66db1f722192005ff75bb5831c1912eb;hp=e425c03508330c88a78bfb5cde83bd360e6f4553;hpb=32c3762989dca09990edcd3ca15dca3eaddb45cd;p=friendica.git

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index e425c03508..edd3e22ef4 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -4,18 +4,21 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
-use dba;
 
 require_once 'include/dba.php';
 
-Class Cron {
-	public static function execute($parameter = '', $generation = 0) {
-		global $a;
+class Cron
+{
+	public static function execute($parameter = '', $generation = 0)
+	{
+		$a = BaseObject::getApp();
 
 		// Poll contacts with specific parameters
 		if (!empty($parameter)) {
@@ -99,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);
 
@@ -178,14 +188,14 @@ Class Cron {
 					AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s') $sql_extra
 					AND NOT `contact`.`self` AND NOT `contact`.`blocked`
 				WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql",
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_OSTATUS),
-			dbesc(NETWORK_DIASPORA),
-			dbesc(NETWORK_FEED),
-			dbesc(NETWORK_MAIL)
+			DBA::escape(NETWORK_DFRN),
+			DBA::escape(NETWORK_OSTATUS),
+			DBA::escape(NETWORK_DIASPORA),
+			DBA::escape(NETWORK_FEED),
+			DBA::escape(NETWORK_MAIL)
 		);
 
-		if (!DBM::is_result($contacts)) {
+		if (!DBA::isResult($contacts)) {
 			return;
 		}
 
@@ -212,7 +222,7 @@ Class Cron {
 			}
 
 			// Check Diaspora contacts or followers once a week
-			if (($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) {
+			if (($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == Contact::FOLLOWER)) {
 				$contact['priority'] = 4;
 			}