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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

Browse Source
This commit is contained in:
Mario Vavti 2016-12-30 13:35:59 +01:00
commit 74d69bdedc
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/api_zot.php
View File

@ -1,6 +1,8 @@
<?php <?php
function zot_api_init() { function zot_api_init() {
api_register_func('api/red/version','api_zot_version',false);
api_register_func('api/z/1.0/version','api_zot_version',false);
api_register_func('api/export/basic','api_export_basic', true); api_register_func('api/export/basic','api_export_basic', true);
api_register_func('api/red/channel/export/basic','api_export_basic', true); api_register_func('api/red/channel/export/basic','api_export_basic', true);
api_register_func('api/z/1.0/channel/export/basic','api_export_basic', true); api_register_func('api/z/1.0/channel/export/basic','api_export_basic', true);
@ -42,6 +44,22 @@
} }
function api_zot_version($type) {
if($type === 'xml') {
header('Content-type: application/xml');
echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>' . Zotlabs\Lib\System::get_project_version() . '</version>' . "\r\n";
killme();
}
elseif($type === 'json') {
header('Content-type: application/json');
echo '"' . Zotlabs\Lib\System::get_project_version() . '"';
killme();
}
}
/* /*
* Red basic channel export * Red basic channel export
*/ */

4
include/import.php
View File

@ -86,7 +86,7 @@ function import_channel($channel, $account_id, $seize) {
} }
if(! $r) { if(! $r) {
logger('mod_import: channel clone failed. ', print_r($channel,true)); logger('mod_import: channel clone failed. ' . print_r($channel,true));
notice( t('Channel clone failed. Import failed.') . EOL); notice( t('Channel clone failed. Import failed.') . EOL);
return false; return false;
} }
@ -96,7 +96,7 @@ function import_channel($channel, $account_id, $seize) {
$channel['channel_guid'] // Already dbesc'd $channel['channel_guid'] // Already dbesc'd
); );
if(! $r) { if(! $r) {
logger('mod_import: channel not found. ', print_r($channel,true)); logger('mod_import: channel not found. ' . print_r($channel,true));
notice( t('Cloned channel not found. Import failed.') . EOL); notice( t('Cloned channel not found. Import failed.') . EOL);
return false; return false;
} }