X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=ebd8ed33f1be431f130f50443ac6b7389ee4e394;hb=c48fcd4a8f329946cdf09d214596ecf29e859cff;hp=767f4eae6105dfa95534598d7b5e1dae0ad30f8f;hpb=ecea7425f8ad11ace4af39d476919e3203bff44f;p=friendica.git

diff --git a/boot.php b/boot.php
index 767f4eae61..ebd8ed33f1 100644
--- a/boot.php
+++ b/boot.php
@@ -39,9 +39,9 @@ require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2018.08-dev');
+define('FRIENDICA_VERSION',      '2018.09');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1279);
+define('DB_UPDATE_VERSION',      1283);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -152,19 +152,6 @@ define('REGISTER_OPEN',          2);
  * @}
 */
 
-/**
- * @name Contact_is
- *
- * Relationship types
- * @{
- */
-define('CONTACT_IS_FOLLOWER', 1);
-define('CONTACT_IS_SHARING',  2);
-define('CONTACT_IS_FRIEND',   3);
-/**
- *  @}
- */
-
 /**
  * @name Update
  *
@@ -177,55 +164,6 @@ define('UPDATE_FAILED',  1);
  * @}
  */
 
-/**
- * @name page/profile types
- *
- * PAGE_NORMAL is a typical personal profile account
- * PAGE_SOAPBOX automatically approves all friend requests as CONTACT_IS_SHARING, (readonly)
- * PAGE_COMMUNITY automatically approves all friend requests as CONTACT_IS_SHARING, but with
- *      write access to wall and comments (no email and not included in page owner's ACL lists)
- * PAGE_FREELOVE automatically approves all friend requests as full friends (CONTACT_IS_FRIEND).
- *
- * @{
- */
-define('PAGE_NORMAL',            0);
-define('PAGE_SOAPBOX',           1);
-define('PAGE_COMMUNITY',         2);
-define('PAGE_FREELOVE',          3);
-define('PAGE_BLOG',              4);
-define('PAGE_PRVGROUP',          5);
-/**
- * @}
- */
-
-/**
- * @name account types
- *
- * ACCOUNT_TYPE_PERSON - the account belongs to a person
- *	Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE
- *
- * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
- *	Associated page type: PAGE_SOAPBOX
- *
- * ACCOUNT_TYPE_NEWS - the account is a news reflector
- *	Associated page type: PAGE_SOAPBOX
- *
- * ACCOUNT_TYPE_COMMUNITY - the account is community forum
- *	Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
- *
- * ACCOUNT_TYPE_RELAY - the account is a relay
- *      This will only be assigned to contacts, not to user accounts
- * @{
- */
-define('ACCOUNT_TYPE_PERSON',      0);
-define('ACCOUNT_TYPE_ORGANISATION', 1);
-define('ACCOUNT_TYPE_NEWS',        2);
-define('ACCOUNT_TYPE_COMMUNITY',   3);
-define('ACCOUNT_TYPE_RELAY',       4);
-/**
- * @}
- */
-
 /**
  * @name CP
  *
@@ -241,84 +179,32 @@ define('CP_USERS_AND_GLOBAL',       2);
  * @}
  */
 
-/**
- * @name Protocols
- * @deprecated since version 3.6
- * @see Conversation
- *
- * Different protocols that we are storing
- * @{
- */
-define('PROTOCOL_UNKNOWN'        , Conversation::PROTOCOL_UNKNOWN);
-define('PROTOCOL_DFRN'           , Conversation::PROTOCOL_DFRN);
-define('PROTOCOL_DIASPORA'       , Conversation::PROTOCOL_DIASPORA);
-define('PROTOCOL_OSTATUS_SALMON' , Conversation::PROTOCOL_OSTATUS_SALMON);
-define('PROTOCOL_OSTATUS_FEED'   , Conversation::PROTOCOL_OSTATUS_FEED);    // Deprecated
-define('PROTOCOL_GS_CONVERSATION', Conversation::PROTOCOL_GS_CONVERSATION); // Deprecated
-define('PROTOCOL_SPLITTED_CONV'  , Conversation::PROTOCOL_SPLITTED_CONV);
-/**
- * @}
- */
-
-/**
- * @name Network constants
- * @deprecated since version 3.6
- * @see Protocol
- *
- * Network and protocol family types
- * @{
- */
-define('NETWORK_DFRN'     , Protocol::DFRN);      // Friendica, Mistpark, other DFRN implementations
-define('NETWORK_ZOT'      , Protocol::ZOT);       // Zot! - Currently unsupported
-define('NETWORK_OSTATUS'  , Protocol::OSTATUS);   // GNU-social, Pleroma, Mastodon, other OStatus implementations
-define('NETWORK_FEED'     , Protocol::FEED);      // RSS/Atom feeds with no known "post/notify" protocol
-define('NETWORK_DIASPORA' , Protocol::DIASPORA);  // Diaspora
-define('NETWORK_MAIL'     , Protocol::MAIL);      // IMAP/POP
-define('NETWORK_FACEBOOK' , Protocol::FACEBOOK);  // Facebook API
-define('NETWORK_LINKEDIN' , Protocol::LINKEDIN);  // LinkedIn
-define('NETWORK_XMPP'     , Protocol::XMPP);      // XMPP - Currently unsupported
-define('NETWORK_MYSPACE'  , Protocol::MYSPACE);   // MySpace - Currently unsupported
-define('NETWORK_GPLUS'    , Protocol::GPLUS);     // Google+
-define('NETWORK_PUMPIO'   , Protocol::PUMPIO);    // pump.io
-define('NETWORK_TWITTER'  , Protocol::TWITTER);   // Twitter
-define('NETWORK_DIASPORA2', Protocol::DIASPORA2); // Diaspora connector
-define('NETWORK_STATUSNET', Protocol::STATUSNET); // Statusnet connector
-define('NETWORK_APPNET'   , Protocol::APPNET);    // app.net - Dead protocol
-define('NETWORK_NEWS'     , Protocol::NEWS);      // Network News Transfer Protocol - Currently unsupported
-define('NETWORK_ICALENDAR', Protocol::ICALENDAR); // iCalendar - Currently unsupported
-define('NETWORK_PNUT'     , Protocol::PNUT);      // pnut.io - Currently unsupported
-define('NETWORK_PHANTOM'  , Protocol::PHANTOM);   // Place holder
-/**
- * @}
- */
-
 /**
  * These numbers are used in stored permissions
  * and existing allocations MUST NEVER BE CHANGED
  * OR RE-ASSIGNED! You may only add to them.
  */
 $netgroup_ids = [
-	NETWORK_DFRN     => (-1),
-	NETWORK_ZOT      => (-2),
-	NETWORK_OSTATUS  => (-3),
-	NETWORK_FEED     => (-4),
-	NETWORK_DIASPORA => (-5),
-	NETWORK_MAIL     => (-6),
-	NETWORK_FACEBOOK => (-8),
-	NETWORK_LINKEDIN => (-9),
-	NETWORK_XMPP     => (-10),
-	NETWORK_MYSPACE  => (-11),
-	NETWORK_GPLUS    => (-12),
-	NETWORK_PUMPIO   => (-13),
-	NETWORK_TWITTER  => (-14),
-	NETWORK_DIASPORA2 => (-15),
-	NETWORK_STATUSNET => (-16),
-	NETWORK_APPNET    => (-17),
-	NETWORK_NEWS      => (-18),
-	NETWORK_ICALENDAR => (-19),
-	NETWORK_PNUT      => (-20),
-
-	NETWORK_PHANTOM  => (-127),
+	Protocol::DFRN     => (-1),
+	Protocol::ZOT      => (-2),
+	Protocol::OSTATUS  => (-3),
+	Protocol::FEED     => (-4),
+	Protocol::DIASPORA => (-5),
+	Protocol::MAIL     => (-6),
+	Protocol::FACEBOOK => (-8),
+	Protocol::LINKEDIN => (-9),
+	Protocol::XMPP     => (-10),
+	Protocol::MYSPACE  => (-11),
+	Protocol::GPLUS    => (-12),
+	Protocol::PUMPIO   => (-13),
+	Protocol::TWITTER  => (-14),
+	Protocol::DIASPORA2 => (-15),
+	Protocol::STATUSNET => (-16),
+	Protocol::NEWS      => (-18),
+	Protocol::ICALENDAR => (-19),
+	Protocol::PNUT      => (-20),
+
+	Protocol::PHANTOM  => (-127),
 ];
 
 /**
@@ -997,13 +883,9 @@ function feed_birthday($uid, $tz)
 		$tz = 'UTC';
 	}
 
-	$p = q(
-		"SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
-		intval($uid)
-	);
-
-	if (DBA::isResult($p)) {
-		$tmp_dob = substr($p[0]['dob'], 5);
+	$profile = DBA::selectFirst('profile', ['dob'], ['is-default' => true, 'uid' => $uid]);
+	if (DBA::isResult($profile)) {
+		$tmp_dob = substr($profile['dob'], 5);
 		if (intval($tmp_dob)) {
 			$y = DateTimeFormat::timezoneNow($tz, 'Y');
 			$bd = $y . '-' . $tmp_dob . ' 00:00';