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

Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds but this prevents it from rendering

Browse Source
This commit is contained in:
zotlabs 2017-05-14 18:02:22 -07:00
parent cbe600369c
commit ef51c1c2b2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Lib/Apps.php
View File

@ -34,7 +34,7 @@ class Apps {
if($files) { if($files) {
foreach($files as $f) { foreach($files as $f) {
$path = explode('/',$f); $path = explode('/',$f);
$plugin = $path[1]; $plugin = trim($path[1]);
if(plugin_is_installed($plugin)) { if(plugin_is_installed($plugin)) {
$x = self::parse_app_description($f,$translate); $x = self::parse_app_description($f,$translate);
if($x) { if($x) {
@ -285,7 +285,7 @@ class Apps {
self::translate_system_apps($papp); self::translate_system_apps($papp);
if(($papp['plugin']) && (! plugin_is_installed($papp['plugin']))) if(trim($papp['plugin']) && (! plugin_is_installed(trim($papp['plugin']))))
return ''; return '';
$papp['papp'] = self::papp_encode($papp); $papp['papp'] = self::papp_encode($papp);
@ -575,7 +575,7 @@ class Apps {
$darray['app_addr'] = ((x($arr,'addr')) ? escape_tags($arr['addr']) : ''); $darray['app_addr'] = ((x($arr,'addr')) ? escape_tags($arr['addr']) : '');
$darray['app_price'] = ((x($arr,'price')) ? escape_tags($arr['price']) : ''); $darray['app_price'] = ((x($arr,'price')) ? escape_tags($arr['price']) : '');
$darray['app_page'] = ((x($arr,'page')) ? escape_tags($arr['page']) : ''); $darray['app_page'] = ((x($arr,'page')) ? escape_tags($arr['page']) : '');
$darray['app_plugin'] = ((x($arr,'plugin')) ? escape_tags($arr['plugin']) : ''); $darray['app_plugin'] = ((x($arr,'plugin')) ? escape_tags(trim($arr['plugin'])) : '');
$darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : ''); $darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : '');
$darray['app_system'] = ((x($arr,'system')) ? intval($arr['system']) : 0); $darray['app_system'] = ((x($arr,'system')) ? intval($arr['system']) : 0);
$darray['app_deleted'] = ((x($arr,'deleted')) ? intval($arr['deleted']) : 0); $darray['app_deleted'] = ((x($arr,'deleted')) ? intval($arr['deleted']) : 0);
@ -653,7 +653,7 @@ class Apps {
$darray['app_addr'] = ((x($arr,'addr')) ? escape_tags($arr['addr']) : ''); $darray['app_addr'] = ((x($arr,'addr')) ? escape_tags($arr['addr']) : '');
$darray['app_price'] = ((x($arr,'price')) ? escape_tags($arr['price']) : ''); $darray['app_price'] = ((x($arr,'price')) ? escape_tags($arr['price']) : '');
$darray['app_page'] = ((x($arr,'page')) ? escape_tags($arr['page']) : ''); $darray['app_page'] = ((x($arr,'page')) ? escape_tags($arr['page']) : '');
$darray['app_plugin'] = ((x($arr,'plugin')) ? escape_tags($arr['plugin']) : ''); $darray['app_plugin'] = ((x($arr,'plugin')) ? escape_tags(trim($arr['plugin'])) : '');
$darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : ''); $darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : '');
$darray['app_system'] = ((x($arr,'system')) ? intval($arr['system']) : 0); $darray['app_system'] = ((x($arr,'system')) ? intval($arr['system']) : 0);
$darray['app_deleted'] = ((x($arr,'deleted')) ? intval($arr['deleted']) : 0); $darray['app_deleted'] = ((x($arr,'deleted')) ? intval($arr['deleted']) : 0);
@ -763,7 +763,7 @@ class Apps {
$ret['system'] = $app['app_system']; $ret['system'] = $app['app_system'];
if($app['app_plugin']) if($app['app_plugin'])
$ret['plugin'] = $app['app_plugin']; $ret['plugin'] = trim($app['app_plugin']);
if($app['app_deleted']) if($app['app_deleted'])
$ret['deleted'] = $app['app_deleted']; $ret['deleted'] = $app['app_deleted'];