diff options
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 118 |
1 files changed, 54 insertions, 64 deletions
@@ -60,12 +60,14 @@ require_once('include/bbcode.php'); require_once('include/items.php'); require_once('include/conversation.php'); require_once('include/acl_selectors.php'); +require_once('include/selectors.php'); +require_once('include/activities.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '8.8.8'); +define('STD_VERSION', '9.0'); define('ZOT_REVISION', '6.0'); -define('DB_UPDATE_VERSION', 1259); +define('DB_UPDATE_VERSION', 1263); define('PROJECT_BASE', __DIR__); @@ -487,66 +489,59 @@ define('NAMESPACE_YMEDIA', 'http://search.yahoo.com/mrss/'); define('ACTIVITYSTREAMS_JSONLD_REV', 'https://www.w3.org/ns/activitystreams'); -define('ZOT_APSCHEMA_REV', '/apschema/v1.10'); +define('ZOT_APSCHEMA_REV', '/apschema/v1.11'); + /** * activity stream defines */ define('ACTIVITY_PUBLIC_INBOX', 'https://www.w3.org/ns/activitystreams#Public'); -define('ACTIVITY_REACT', NAMESPACE_ZOT . '/activity/react'); -define('ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like'); -define('ACTIVITY_DISLIKE', NAMESPACE_ZOT . '/activity/dislike'); -define('ACTIVITY_AGREE', NAMESPACE_ZOT . '/activity/agree'); -define('ACTIVITY_DISAGREE', NAMESPACE_ZOT . '/activity/disagree'); -define('ACTIVITY_ABSTAIN', NAMESPACE_ZOT . '/activity/abstain'); -define('ACTIVITY_ATTEND', NAMESPACE_ZOT . '/activity/attendyes'); -define('ACTIVITY_ATTENDNO', NAMESPACE_ZOT . '/activity/attendno'); -define('ACTIVITY_ATTENDMAYBE', NAMESPACE_ZOT . '/activity/attendmaybe'); -define('ACTIVITY_POLLRESPONSE', NAMESPACE_ZOT . '/activity/pollresponse'); - -define('ACTIVITY_OBJ_HEART', NAMESPACE_ZOT . '/activity/heart'); - -define('ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend'); -define('ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend'); -define('ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend'); -define('ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow'); -define('ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following'); -define('ACTIVITY_JOIN', NAMESPACE_ACTIVITY_SCHEMA . 'join'); - -define('ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post'); -define('ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update'); -define('ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag'); -define('ACTIVITY_SHARE', NAMESPACE_ACTIVITY_SCHEMA . 'share'); -define('ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite'); -define('ACTIVITY_CREATE', NAMESPACE_ACTIVITY_SCHEMA . 'create'); -define('ACTIVITY_DELETE', NAMESPACE_ACTIVITY_SCHEMA . 'delete'); -define('ACTIVITY_WIN', NAMESPACE_ACTIVITY_SCHEMA . 'win'); -define('ACTIVITY_LOSE', NAMESPACE_ACTIVITY_SCHEMA . 'lose'); -define('ACTIVITY_TIE', NAMESPACE_ACTIVITY_SCHEMA . 'tie'); -define('ACTIVITY_COMPLETE', NAMESPACE_ACTIVITY_SCHEMA . 'complete'); - -define('ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke'); -define('ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood'); - -define('ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment'); -define('ACTIVITY_OBJ_ACTIVITY', NAMESPACE_ACTIVITY_SCHEMA . 'activity'); -define('ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note'); -define('ACTIVITY_OBJ_ARTICLE', NAMESPACE_ACTIVITY_SCHEMA . 'article'); -define('ACTIVITY_OBJ_PERSON', NAMESPACE_ACTIVITY_SCHEMA . 'person'); -define('ACTIVITY_OBJ_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'photo'); -define('ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo'); -define('ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album'); -define('ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event'); -define('ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group'); -define('ACTIVITY_OBJ_GAME', NAMESPACE_ACTIVITY_SCHEMA . 'game'); -define('ACTIVITY_OBJ_WIKI', NAMESPACE_ACTIVITY_SCHEMA . 'wiki'); -define('ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm'); -define('ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile'); -define('ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing'); -define('ACTIVITY_OBJ_LOCATION', NAMESPACE_ZOT . '/activity/location'); -define('ACTIVITY_OBJ_FILE', NAMESPACE_ZOT . '/activity/file'); -define('ACTIVITY_OBJ_CARD', NAMESPACE_ZOT . '/activity/card'); +define('ACTIVITY_REACT', NAMESPACE_ZOT . '/activity/react'); // deprecated + +define('ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like'); // AS2 Like +define('ACTIVITY_DISLIKE', NAMESPACE_ZOT . '/activity/dislike'); // AS2 Dislike + +define('ACTIVITY_AGREE', NAMESPACE_ZOT . '/activity/agree'); // deprecated +define('ACTIVITY_DISAGREE', NAMESPACE_ZOT . '/activity/disagree'); // deprecated +define('ACTIVITY_ABSTAIN', NAMESPACE_ZOT . '/activity/abstain'); // deprecated + +define('ACTIVITY_ATTEND', NAMESPACE_ZOT . '/activity/attendyes'); // AS2 Accept +define('ACTIVITY_ATTENDNO', NAMESPACE_ZOT . '/activity/attendno'); // AS2 Reject +define('ACTIVITY_ATTENDMAYBE', NAMESPACE_ZOT . '/activity/attendmaybe'); // AS2 TentativeAccept + +define('ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend'); // deprecated + +define('ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow'); // AS2 Follow +define('ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following'); // AS2 Ignore + + +define('ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post'); // AS2 Create + +define('ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update'); // AS2 Update + +define('ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag'); // unused + +define('ACTIVITY_SHARE', 'Announce'); + +define('ACTIVITY_CREATE', NAMESPACE_ACTIVITY_SCHEMA . 'create'); // deprecated + +define('ACTIVITY_DELETE', NAMESPACE_ACTIVITY_SCHEMA . 'delete'); // AS2 Delete + +define('ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke'); // deprecated +define('ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood'); // deprecated + +define('ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment'); // AS2 Note +define('ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note'); // AS2 Note +define('ACTIVITY_OBJ_ARTICLE', NAMESPACE_ACTIVITY_SCHEMA . 'article'); // AS2 Article +define('ACTIVITY_OBJ_PERSON', NAMESPACE_ACTIVITY_SCHEMA . 'person'); // AS2 Person +define('ACTIVITY_OBJ_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'photo'); // AS2 Image +define('ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event'); // AS2 Event + +define('ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm'); // unused +define('ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile'); // AS2 Profile +define('ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing'); // AS2 Page + /** * Account Flags @@ -803,6 +798,7 @@ class App { public static $is_sys = false; public static $nav_sel; public static $comanche; + public static $cache = []; // general purpose cache public static $channel_links; @@ -2335,8 +2331,6 @@ function construct_page() { require_once(theme_include('theme_init.php')); - $installing = false; - $uid = ((App::$profile_uid) ? App::$profile_uid : local_channel()); $navbar = get_config('system', 'navbar', 'default'); @@ -2348,14 +2342,10 @@ function construct_page() { $navbar = App::$layout['navbar']; } - if (App::$module == 'setup') { - $installing = true; - } - else { + if (App::$module !== 'setup') { nav($navbar); } - $current_theme = Zotlabs\Render\Theme::current(); // logger('current_theme: ' . print_r($current_theme,true)); // Zotlabs\Render\Theme::debug(); @@ -2376,7 +2366,7 @@ function construct_page() { if (($p = theme_include('mod_' . App::$module . '.css')) != '') head_add_css('mod_' . App::$module . '.css'); - head_add_css(Zotlabs\Render\Theme::url($installing)); + head_add_css(Zotlabs\Render\Theme::url()); if (($p = theme_include('mod_' . App::$module . '.js')) != '') head_add_js('mod_' . App::$module . '.js'); |