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

use only the std_version

Browse Source
This commit is contained in:
redmatrix 2016-05-01 19:29:30 -07:00
parent 23bb4e8e15
commit f284558007
7 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Admin.php
View File

@ -221,7 +221,7 @@ class Admin extends \Zotlabs\Web\Controller {
'$pending' => array( t('Pending registrations'), $pending), '$pending' => array( t('Pending registrations'), $pending),
'$channels' => array( t('Registered channels'), $channels), '$channels' => array( t('Registered channels'), $channels),
'$plugins' => array( t('Active plugins'), $plugins ), '$plugins' => array( t('Active plugins'), $plugins ),
'$version' => array( t('Version'), RED_VERSION), '$version' => array( t('Version'), STD_VERSION),
'$build' => get_config('system', 'db_version') '$build' => get_config('system', 'db_version')
)); ));
} }

23
Zotlabs/Project/System.php
View File

@ -4,56 +4,51 @@ namespace Zotlabs\Project;
class System { class System {
function get_platform_name() { static public function get_platform_name() {
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['platform_name']) if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['platform_name'])
return \App::$config['system']['platform_name']; return \App::$config['system']['platform_name'];
return PLATFORM_NAME; return PLATFORM_NAME;
} }
function get_site_name() { static public function get_site_name() {
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['sitename']) if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['sitename'])
return \App::$config['system']['sitename']; return \App::$config['system']['sitename'];
return ''; return '';
} }
function get_project_version() { static public function get_project_version() {
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version']) if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version'])
return ''; return '';
return RED_VERSION; return self::get_std_version();
} }
function get_update_version() { static public function get_update_version() {
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version']) if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version'])
return ''; return '';
return DB_UPDATE_VERSION; return DB_UPDATE_VERSION;
} }
function get_notify_icon() { static public function get_notify_icon() {
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['email_notify_icon_url']) if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['email_notify_icon_url'])
return \App::$config['system']['email_notify_icon_url']; return \App::$config['system']['email_notify_icon_url'];
return z_root() . '/images/hz-white-32.png'; return z_root() . '/images/hz-white-32.png';
} }
function get_site_icon() { static public function get_site_icon() {
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['site_icon_url']) if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['site_icon_url'])
return \App::$config['system']['site_icon_url']; return \App::$config['system']['site_icon_url'];
return z_root() . '/images/hz-32.png'; return z_root() . '/images/hz-32.png';
} }
function get_server_role() { static public function get_server_role() {
if(UNO) if(UNO)
return 'basic'; return 'basic';
return 'advanced'; return 'advanced';
} }
// return the standardised version. Since we can't easily compare static public function get_std_version() {
// before the STD_VERSION definition was applied, we have to treat
// all prior release versions the same. You can dig through them
// with other means (such as RED_VERSION) if necessary.
function get_std_version() {
if(defined('STD_VERSION')) if(defined('STD_VERSION'))
return STD_VERSION; return STD_VERSION;
return '0.0.0'; return '0.0.0';

1
boot.php
View File

@ -46,7 +46,6 @@ require_once('include/account.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')));
define ( 'STD_VERSION', '1.4.4' ); define ( 'STD_VERSION', '1.4.4' );
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );

2
include/api.php
View File

@ -2108,7 +2108,7 @@ require_once('include/api_auth.php');
'shorturllength' => '30', 'shorturllength' => '30',
'hubzilla' => array( 'hubzilla' => array(
'PLATFORM_NAME' => Zotlabs\Project\System::get_platform_name(), 'PLATFORM_NAME' => Zotlabs\Project\System::get_platform_name(),
'RED_VERSION' => Zotlabs\Project\System::get_project_version(), 'STD_VERSION' => Zotlabs\Project\System::get_project_version(),
'ZOT_REVISION' => ZOT_REVISION, 'ZOT_REVISION' => ZOT_REVISION,
'DB_UPDATE_VERSION' => Zotlabs\Project\System::get_update_version() 'DB_UPDATE_VERSION' => Zotlabs\Project\System::get_update_version()
) )

2
include/identity.php
View File

@ -491,7 +491,7 @@ function identity_basic_export($channel_id, $items = false) {
// use constants here as otherwise we will have no idea if we can import from a site // use constants here as otherwise we will have no idea if we can import from a site
// with a non-standard platform and version. // with a non-standard platform and version.
$ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => Zotlabs\Project\System::get_server_role()); $ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => STD_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => Zotlabs\Project\System::get_server_role());
$r = q("select * from channel where channel_id = %d limit 1", $r = q("select * from channel where channel_id = %d limit 1",
intval($channel_id) intval($channel_id)

2
include/zot.php
View File

@ -3914,7 +3914,7 @@ function zotinfo($arr) {
$ret['site']['channels'] = channel_total(); $ret['site']['channels'] = channel_total();
$ret['site']['version'] = Zotlabs\Project\System::get_platform_name() . ' ' . RED_VERSION . '[' . DB_UPDATE_VERSION . ']'; $ret['site']['version'] = Zotlabs\Project\System::get_platform_name() . ' ' . STD_VERSION . '[' . DB_UPDATE_VERSION . ']';
$ret['site']['admin'] = get_config('system','admin_email'); $ret['site']['admin'] = get_config('system','admin_email');

1
version.inc
View File

@ -1 +0,0 @@
2016-05-01.1383H