harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

one role.

Browse Source
This commit is contained in:
zotlabs
2017-03-09 18:54:10 -08:00
parent c93db2cd21
commit 1a49f0d164
4 changed files with 5 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
boot.php
View File

@@ -49,7 +49,7 @@ require_once('include/xchan.php');
require_once('include/hubloc.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'PLATFORM_NAME', 'red' );
define ( 'STD_VERSION', '2.3' );
define ( 'ZOT_REVISION', '1.2' );
@@ -165,14 +165,6 @@ define ( 'LOGGER_DATA', 3 );
define ( 'LOGGER_ALL', 4 );
/**
* Server roles
*/
define ( 'SERVER_ROLE_BASIC', 0x0001 );
define ( 'SERVER_ROLE_STANDARD', 0x0002 );
define ( 'SERVER_ROLE_PRO', 0x0004 );
/**
* registration policies
*/
@@ -620,15 +612,7 @@ function sys_boot() {
$a->convert();
if(defined('UNO')) {
if(UNO)
App::$config['system']['server_role'] = 'basic';
else
App::$config['system']['server_role'] = 'standard';
}
if(! (array_key_exists('server_role',App::$config['system']) && App::$config['system']['server_role']))
App::$config['system']['server_role'] = 'standard';
App::$config['system']['server_role'] = 'pro';
App::$timezone = ((App::$config['system']['timezone']) ? App::$config['system']['timezone'] : 'UTC');
date_default_timezone_set(App::$timezone);
@@ -755,7 +739,6 @@ class miniApp {
class App {
public static $install = false; // true if we are installing the software
public static $role = 0; // server role (constant, not the string)
public static $account = null; // account record of the logged-in account
public static $channel = null; // channel record of the current channel of the logged-in account
public static $observer = null; // xchan record of the page observer
@@ -1030,36 +1013,10 @@ class App {
}
}
public static function get_role() {
if(! self::$role)
return self::set_role();
return self::$role;
}
public static function set_role() {
$role_str = \Zotlabs\Lib\System::get_server_role();
switch($role_str) {
case 'basic':
$role = SERVER_ROLE_BASIC;
break;
case 'pro':
$role = SERVER_ROLE_PRO;
break;
case 'standard':
default:
$role = SERVER_ROLE_STANDARD;
break;
}
self::$role = $role;
return $role;
}
public static function get_scheme() {
return self::$scheme;
}
public static function get_hostname() {
return self::$hostname;
}