friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #747 from zered/solve_741

Browse source 
Solving the "Disallow public access to addons listed in the apps menu" h...
This commit is contained in:
fabrixxm 2013-08-02 09:57:17 -07:00
commit f1090b6d8c
2 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/plugin.php
View file

@ -185,6 +185,21 @@ function call_hooks($name, &$data = null) {
}
}}
//check if an app_menu hook exist for plugin $name.
//Return true if the plugin is an app
if(! function_exists('plugin_is_app')) {
function plugin_is_app($name) {
$a = get_app();
if(is_array($a->hooks) && (array_key_exists('app_menu',$a->hooks))) {
foreach($a->hooks['app_menu'] as $hook) {
if($hook[0] == 'addon/'.$name.'/'.$name.'.php')
return true;
}
}
return false;
}}
/*
* parse plugin comment in search of plugin infos.

25
index.php
View file

@ -149,11 +149,16 @@ else {
nav_set_selected('nothing');
$arr = array('app_menu' => $a->apps);
//Don't populate apps_menu if apps are private
$privateapps = get_config('config','private_addons');
if((local_user()) || (! $privateapps === "1"))
{
$arr = array('app_menu' => $a->apps);
call_hooks('app_menu', $arr);
call_hooks('app_menu', $arr);
$a->apps = $arr['app_menu'];
$a->apps = $arr['app_menu'];
}
/**
*
@ -187,10 +192,18 @@ if(strlen($a->module)) {
if ($a->module == "stream")
$a->module = "network";
$privateapps = get_config('config','private_addons');
if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
include_once("addon/{$a->module}/{$a->module}.php");
if(function_exists($a->module . '_module'))
$a->module_loaded = true;
//Check if module is an app and if public access to apps is allowed or not
if((!local_user()) && plugin_is_app($a->module) && $privateapps === "1") {
info( t("You must be logged in to use addons. "));
}
else {
include_once("addon/{$a->module}/{$a->module}.php");
if(function_exists($a->module . '_module'))
$a->module_loaded = true;
}
}
/**