aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php23
1 files changed, 14 insertions, 9 deletions
diff --git a/boot.php b/boot.php
index 602012c85..3a9f93d5e 100755
--- a/boot.php
+++ b/boot.php
@@ -47,13 +47,12 @@ define ( 'RED_PLATFORM', 'Red Matrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1107 );
+define ( 'DB_UPDATE_VERSION', 1113 );
define ( 'EOL', '<br />' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
-
define ( 'DIRECTORY_MODE_NORMAL', 0x0000); // This is technically DIRECTORY_MODE_TERTIARY, but it's the default, hence 0x0000
define ( 'DIRECTORY_MODE_PRIMARY', 0x0001);
define ( 'DIRECTORY_MODE_SECONDARY', 0x0002);
@@ -290,6 +289,7 @@ define ( 'PERMS_SITE' , 0x0004 );
define ( 'PERMS_CONTACTS' , 0x0008 );
define ( 'PERMS_SPECIFIC' , 0x0080 );
define ( 'PERMS_AUTHED' , 0x0100 );
+define ( 'PERMS_PENDING' , 0x0200 );
// Address book flags
@@ -347,7 +347,7 @@ define ( 'DROPITEM_PHASE2', 2);
* Maximum number of "people who like (or don't like) this" that we will list by name
*/
-define ( 'MAX_LIKERS', 75);
+define ( 'MAX_LIKERS', 10);
/**
* Communication timeout
@@ -384,6 +384,7 @@ define ( 'NOTIFY_SYSTEM', 0x8000 );
define ( 'HUBLOC_FLAGS_PRIMARY', 0x0001);
define ( 'HUBLOC_FLAGS_UNVERIFIED', 0x0002);
+define ( 'HUBLOC_FLAGS_ORPHANCHECK', 0x0004);
define ( 'HUBLOC_FLAGS_DELETED', 0x1000);
define ( 'XCHAN_FLAGS_NORMAL', 0x0000);
@@ -397,12 +398,11 @@ define ( 'XCHAN_FLAGS_DELETED', 0x1000);
* Traficlights for Administration of HubLoc
* to detect problems in inter server communication
*/
-define ('HUBLOC_NOTUSED', 0x0000);
-define ('HUBLOC_SEND_ERROR', 0x0001);
-define ('HUBLOC_RECEIVE_ERROR', 0x0002);
-define ('HUBLOC_WORKS', 0x0004);
-define ('HUBLOC_OFFLINE', 0x0008);
-
+define ('HUBLOC_NOTUSED', 0x0000);
+define ('HUBLOC_SEND_ERROR', 0x0001);
+define ('HUBLOC_RECEIVE_ERROR', 0x0002);
+define ('HUBLOC_WORKS', 0x0004);
+define ('HUBLOC_OFFLINE', 0x0008);
/**
* Tag/term types
@@ -424,6 +424,7 @@ define ( 'TERM_OBJ_PROFILE', 3 );
define ( 'TERM_OBJ_CHANNEL', 4 );
define ( 'TERM_OBJ_OBJECT', 5 );
define ( 'TERM_OBJ_THING', 6 );
+define ( 'TERM_OBJ_APP', 7 );
/**
@@ -986,6 +987,10 @@ class App {
'$js_strings' => js_strings(),
'$zid' => get_my_address(),
)) . $this->page['htmlhead'];
+
+ // always put main.js at the end
+ $this->page['htmlhead'] .= head_get_main_js();
+
}
/**