X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=73f83e978a836c78e5ec6efaf154f2f53295a230;hb=97c120d8f22a6fa3dc2e20c3a9666d3050200c80;hp=9d72863cc83a3b98392f4de5f8c902a2acb5c228;hpb=458981f75cff2427976c9abc787eadf8e9e6267f;p=friendica.git

diff --git a/boot.php b/boot.php
index 9d72863cc8..73f83e978a 100644
--- a/boot.php
+++ b/boot.php
@@ -17,8 +17,6 @@
  * easily as email does today.
  */
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
-
 use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Core\Addon;
@@ -35,11 +33,9 @@ use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/text.php';
-
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2018.12-dev');
+define('FRIENDICA_VERSION',      '2019.01-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
@@ -168,21 +164,21 @@ define('MAX_LIKERS',    75);
  * Email notification options
  * @{
  */
-define('NOTIFY_INTRO',    0x0001);
-define('NOTIFY_CONFIRM',  0x0002);
-define('NOTIFY_WALL',     0x0004);
-define('NOTIFY_COMMENT',  0x0008);
-define('NOTIFY_MAIL',     0x0010);
-define('NOTIFY_SUGGEST',  0x0020);
-define('NOTIFY_PROFILE',  0x0040);
-define('NOTIFY_TAGSELF',  0x0080);
-define('NOTIFY_TAGSHARE', 0x0100);
-define('NOTIFY_POKE',     0x0200);
-define('NOTIFY_SHARE',    0x0400);
-
-define('SYSTEM_EMAIL',    0x4000);
-
-define('NOTIFY_SYSTEM',   0x8000);
+define('NOTIFY_INTRO',        1);
+define('NOTIFY_CONFIRM',      2);
+define('NOTIFY_WALL',         4);
+define('NOTIFY_COMMENT',      8);
+define('NOTIFY_MAIL',        16);
+define('NOTIFY_SUGGEST',     32);
+define('NOTIFY_PROFILE',     64);
+define('NOTIFY_TAGSELF',    128);
+define('NOTIFY_TAGSHARE',   256);
+define('NOTIFY_POKE',       512);
+define('NOTIFY_SHARE',     1024);
+
+define('SYSTEM_EMAIL',    16384);
+
+define('NOTIFY_SYSTEM',   32768);
 /* @}*/
 
 
@@ -331,6 +327,8 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) {
  *
  * Useful in functions which require it but don't get it passed to them
  *
+ * @deprecated since version 2018.09
+ * @see BaseObject::getApp()
  * @return App
  */
 function get_app()
@@ -338,42 +336,6 @@ function get_app()
 	return BaseObject::getApp();
 }
 
-/**
- * @brief Multi-purpose function to check variable state.
- *
- * Usage: x($var) or x($array, 'key')
- *
- * returns false if variable/key is not set
- * if variable is set, returns 1 if has 'non-zero' value, otherwise returns 0.
- * e.g. x('') or x(0) returns 0;
- *
- * @deprecated since version 2018.12
- * @param string|array $s variable to check
- * @param string       $k key inside the array to check
- *
- * @return bool|int
- */
-function x($s, $k = null)
-{
-	if ($k != null) {
-		if ((is_array($s)) && (array_key_exists($k, $s))) {
-			if ($s[$k]) {
-				return (int) 1;
-			}
-			return (int) 0;
-		}
-		return false;
-	} else {
-		if (isset($s)) {
-			if ($s) {
-				return (int) 1;
-			}
-			return (int) 0;
-		}
-		return false;
-	}
-}
-
 /**
  * Return the provided variable value if it exists and is truthy or the provided
  * default value instead.
@@ -497,7 +459,7 @@ function notice($s)
 		return;
 	}
 
-	$a = get_app();
+	$a = \get_app();
 	if (empty($_SESSION['sysmsg'])) {
 		$_SESSION['sysmsg'] = [];
 	}
@@ -515,7 +477,7 @@ function notice($s)
  */
 function info($s)
 {
-	$a = get_app();
+	$a = \get_app();
 
 	if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) {
 		return;
@@ -578,7 +540,7 @@ function feed_birthday($uid, $tz)
  */
 function is_site_admin()
 {
-	$a = get_app();
+	$a = \get_app();
 
 	$admin_email = Config::get('config', 'admin_email');
 
@@ -687,7 +649,7 @@ function get_server()
 
 function get_temppath()
 {
-	$a = get_app();
+	$a = \get_app();
 
 	$temppath = Config::get("system", "temppath");
 
@@ -890,3 +852,22 @@ function validate_include(&$file)
 	// Simply return flag
 	return $valid;
 }
+
+/**
+ * PHP 5 compatible dirname() with count parameter
+ *
+ * @see http://php.net/manual/en/function.dirname.php#113193
+ *
+ * @deprecated with PHP 7
+ * @param string $path
+ * @param int    $levels
+ * @return string
+ */
+function rdirname($path, $levels = 1)
+{
+	if ($levels > 1) {
+		return dirname(rdirname($path, --$levels));
+	} else {
+		return dirname($path);
+	}
+}