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

change app dropdown to point to apps module (changes nav template). Important: Plugins using the app-menu hook will no longer be accessible from there and may require re-writing to plug into the system apps page. Also filter apps in items from the language detector to avoid false triggers from the base64 content.

Browse Source
This commit is contained in:
friendica 2014-05-21 17:23:34 -07:00
parent a6602a9871
commit d17768d4e7
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/language.php
View File

@ -214,8 +214,10 @@ function detect_language($s) {
if($min_confidence === false) if($min_confidence === false)
$min_confidence = LANGUAGE_DETECT_MIN_CONFIDENCE; $min_confidence = LANGUAGE_DETECT_MIN_CONFIDENCE;
// embedded apps have long base64 strings which will trip up the detector.
$naked_body = preg_replace('/\[app\](.*?)\[\/app\]/','',$s);
// strip off bbcode // strip off bbcode
$naked_body = preg_replace('/\[(.+?)\]/', '', $s); $naked_body = preg_replace('/\[(.+?)\]/', '', $naked_body);
if(mb_strlen($naked_body) < intval($min_length)) { if(mb_strlen($naked_body) < intval($min_length)) {
logger('detect language: string length less than ' . intval($min_length), LOGGER_DATA); logger('detect language: string length less than ' . intval($min_length), LOGGER_DATA);
return ''; return '';

5
include/nav.php
View File

@ -138,8 +138,8 @@ EOT;
if(! get_config('system','hide_help')) if(! get_config('system','hide_help'))
$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation')); $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
if(count($a->get_apps()) > 0)
$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games')); $nav['apps'] = array('apps', t('Apps'), "", t('Applications, utilities, links, games'));
$nav['search'] = array('search', t('Search'), "", t('Search site content')); $nav['search'] = array('search', t('Search'), "", t('Search site content'));
@ -221,7 +221,6 @@ EOT;
'$userinfo' => $x['usermenu'], '$userinfo' => $x['usermenu'],
'$localuser' => local_user(), '$localuser' => local_user(),
'$sel' => $a->nav_sel, '$sel' => $a->nav_sel,
'$apps' => $a->get_apps(),
'$pleasewait' => t('Please wait...') '$pleasewait' => t('Please wait...')
)); ));

9
view/tpl/nav.tpl
View File

@ -157,13 +157,8 @@
{{/if}} {{/if}}
{{if $nav.apps}} {{if $nav.apps}}
<li class="{{$sel.apps}} hidden-xs"> <li class="{{$sel.apps}}">
<a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a>
<ul class="dropdown-menu">
{{foreach $apps as $ap}}
<li role="presentation">{{$ap}}</li>
{{/foreach}}
</ul>
</li> </li>
{{/if}} {{/if}}