From: Michael Vogel <icarus@dabo.de>
Date: Mon, 5 Feb 2018 17:11:29 +0000 (+0100)
Subject: Merge pull request #4393 from MrPetovan/task/3878-move-include-tags-to-src
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fa95911fdb2209907572381c62b1fa70088af634;hp=-c;p=friendica.git

Merge pull request #4393 from MrPetovan/task/3878-move-include-tags-to-src

Move include/tags to src/
---

fa95911fdb2209907572381c62b1fa70088af634
diff --combined include/items.php
index 0ed444da28,793e639ecd..56c834e44d
--- a/include/items.php
+++ b/include/items.php
@@@ -17,10 -17,8 +17,9 @@@ use Friendica\Protocol\OStatus
  use Friendica\Util\DateTimeFormat;
  use Friendica\Util\Network;
  use Friendica\Util\ParseUrl;
 +use Friendica\Util\Temporal;
  
  require_once 'include/bbcode.php';
- require_once 'include/tags.php';
  require_once 'include/text.php';
  require_once 'include/threads.php';
  require_once 'mod/share.php';
@@@ -429,7 -427,7 +428,7 @@@ function list_post_dates($uid, $wall) 
  	while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) {
  		$dyear = intval(substr($dnow, 0, 4));
  		$dstart = substr($dnow, 0, 8) . '01';
 -		$dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5)));
 +		$dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
  		$start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
  		$end_month = DateTimeFormat::utc($dend, 'Y-m-d');
  		$str = day_translate(DateTimeFormat::utc($dnow, 'F'));
diff --combined include/text.php
index 26b153549f,6c6927a78b..05575887a1
--- a/include/text.php
+++ b/include/text.php
@@@ -737,16 -737,12 +737,16 @@@ function dlogger($msg, $level = 0) 
  		return;
  	}
  
 -	$logfile = Config::get('system','dlogfile');
 -
 +	$logfile = Config::get('system', 'dlogfile');
  	if (! $logfile) {
  		return;
  	}
  
 +	$dlogip = Config::get('system', 'dlogip');
 +	if (!is_null($dlogip) && $_SERVER['REMOTE_ADDR'] != $dlogip) {
 +		return;
 +	}
 +
  	if (count($LOGGER_LEVELS) == 0) {
  		foreach (get_defined_constants() as $k => $v) {
  			if (substr($k, 0, 7) == "LOGGER_") {
@@@ -1905,7 -1901,7 +1905,7 @@@ function file_tag_save_file($uid, $item
  			);
  		}
  
- 		Term::createFromItem($item);
+ 		Term::insertFromFileFieldByItemId($item);
  
  		$saved = PConfig::get($uid, 'system', 'filetags');
  		if (!strlen($saved) || !stristr($saved, '[' . file_tag_encode($file) . ']')) {
@@@ -1944,7 -1940,7 +1944,7 @@@ function file_tag_unsave_file($uid, $it
  		intval($uid)
  	);
  
- 	Term::createFromItem($item);
+ 	Term::insertFromFileFieldByItemId($item);
  
  	$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
  		dbesc($file),
diff --combined mod/photos.php
index 56c5690d95,e86c7271a0..6742497ac3
--- a/mod/photos.php
+++ b/mod/photos.php
@@@ -17,18 -17,17 +17,18 @@@ use Friendica\Model\Group
  use Friendica\Model\Item;
  use Friendica\Model\Photo;
  use Friendica\Model\Profile;
+ use Friendica\Model\Term;
  use Friendica\Network\Probe;
  use Friendica\Object\Image;
  use Friendica\Protocol\DFRN;
  use Friendica\Util\DateTimeFormat;
  use Friendica\Util\Map;
 +use Friendica\Util\Temporal;
  
  require_once 'include/items.php';
  require_once 'include/acl_selectors.php';
  require_once 'include/bbcode.php';
  require_once 'include/security.php';
- require_once 'include/tags.php';
  require_once 'include/threads.php';
  
  function photos_init(App $a) {
@@@ -296,7 -295,7 +296,7 @@@ function photos_post(App $a
  						dbesc($rr['parent-uri']),
  						intval($page_owner_uid)
  					);
- 					create_tags_from_itemuri($rr['parent-uri'], $page_owner_uid);
+ 					Term::insertFromTagFieldByItemUri($rr['parent-uri'], $page_owner_uid);
  					delete_thread_uri($rr['parent-uri'], $page_owner_uid);
  
  					$drop_id = intval($rr['id']);
@@@ -370,7 -369,7 +370,7 @@@
  					dbesc($i[0]['uri']),
  					intval($page_owner_uid)
  				);
- 				create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
+ 				Term::insertFromTagFieldByItemUri($i[0]['uri'], $page_owner_uid);
  				delete_thread_uri($i[0]['uri'], $page_owner_uid);
  
  				$url = System::baseUrl();
@@@ -655,7 -654,7 +655,7 @@@
  				intval($item_id),
  				intval($page_owner_uid)
  			);
- 			create_tags_from_item($item_id);
+ 			Term::insertFromTagFieldByItemId($item_id);
  			update_thread($item_id);
  
  			$best = 0;
@@@ -1623,7 -1622,7 +1623,7 @@@ function photos_content(App $a
  						'$sparkle' => $sparkle,
  						'$title' => $title_e,
  						'$body' => $body_e,
 -						'$ago' => relative_date($item['created']),
 +						'$ago' => Temporal::getRelativeDate($item['created']),
  						'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
  						'$drop' => $drop,
  						'$comment' => $comment