diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-22 19:25:27 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-22 19:25:27 -0700 |
| commit | 2d06663490c5fd63b0ebbae141d0b2bbd5a4a8ca (patch) | |
| tree | 92ee170c8b9fb036e09a7475b3984ecc5bd667ff /Zotlabs/Module | |
| parent | 5e0698ba8731e7e4659a24c0ab4fa9c4a1aef173 (diff) | |
| download | volse-hubzilla-2d06663490c5fd63b0ebbae141d0b2bbd5a4a8ca.tar.gz volse-hubzilla-2d06663490c5fd63b0ebbae141d0b2bbd5a4a8ca.tar.bz2 volse-hubzilla-2d06663490c5fd63b0ebbae141d0b2bbd5a4a8ca.zip | |
move apps to zlib
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Appman.php | 17 | ||||
| -rw-r--r-- | Zotlabs/Module/Apps.php | 17 |
2 files changed, 18 insertions, 16 deletions
diff --git a/Zotlabs/Module/Appman.php b/Zotlabs/Module/Appman.php index ba2a64f35..a200e986a 100644 --- a/Zotlabs/Module/Appman.php +++ b/Zotlabs/Module/Appman.php @@ -2,8 +2,9 @@ namespace Zotlabs\Module; -require_once('include/apps.php'); +//require_once('include/apps.php'); +use \Zotlabs\Lib as Zlib; class Appman extends \Zotlabs\Web\Controller { @@ -30,16 +31,16 @@ class Appman extends \Zotlabs\Web\Controller { 'categories' => escape_tags($_REQUEST['categories']) ); - $_REQUEST['appid'] = app_install(local_channel(),$arr); + $_REQUEST['appid'] = Zlib\Apps::app_install(local_channel(),$arr); - if(app_installed(local_channel(),$arr)) + if(Zlib\Apps::app_installed(local_channel(),$arr)) info( t('App installed.') . EOL); return; } - $papp = app_decode($_POST['papp']); + $papp = Zlib\Apps::app_decode($_POST['papp']); if(! is_array($papp)) { notice( t('Malformed app.') . EOL); @@ -47,13 +48,13 @@ class Appman extends \Zotlabs\Web\Controller { } if($_POST['install']) { - app_install(local_channel(),$papp); - if(app_installed(local_channel(),$papp)) + Zlib\Apps::app_install(local_channel(),$papp); + if(Zlib\Apps::app_installed(local_channel(),$papp)) info( t('App installed.') . EOL); } if($_POST['delete']) { - app_destroy(local_channel(),$papp); + Zlib\Apps::app_destroy(local_channel(),$papp); } if($_POST['edit']) { @@ -100,7 +101,7 @@ class Appman extends \Zotlabs\Web\Controller { } } - $embed = array('embed', t('Embed code'), app_encode($app,true),'', 'onclick="this.select();"'); + $embed = array('embed', t('Embed code'), Zlib\Apps::app_encode($app,true),'', 'onclick="this.select();"'); } diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php index 33259b319..d3e8b1504 100644 --- a/Zotlabs/Module/Apps.php +++ b/Zotlabs/Module/Apps.php @@ -1,8 +1,9 @@ <?php namespace Zotlabs\Module; -require_once('include/apps.php'); +//require_once('include/apps.php'); +use \Zotlabs\Lib as Zlib; class Apps extends \Zotlabs\Web\Controller { @@ -19,25 +20,25 @@ class Apps extends \Zotlabs\Web\Controller { if(local_channel()) { - import_system_apps(); + Zlib\Apps::import_system_apps(); $syslist = array(); - $list = app_list(local_channel(), false, $_GET['cat']); + $list = Zlib\Apps::app_list(local_channel(), false, $_GET['cat']); if($list) { foreach($list as $x) { - $syslist[] = app_encode($x); + $syslist[] = Zlib\Apps::app_encode($x); } } - translate_system_apps($syslist); + Zlib\Apps::translate_system_apps($syslist); } else - $syslist = get_system_apps(true); + $syslist = Zlib\Apps::get_system_apps(true); - usort($syslist,'app_name_compare'); + usort($syslist,'Zlib\\Apps::app_name_compare'); // logger('apps: ' . print_r($syslist,true)); foreach($syslist as $app) { - $apps[] = app_render($app,$mode); + $apps[] = Zlib\Apps::app_render($app,$mode); } return replace_macros(get_markup_template('myapps.tpl'), array( |