Solving the "Disallow public access to addons listed in the apps menu" has no effect bug
Adding plugin_is_app function in include/plugin.php for checking if a plugin is an app or not (checking the existence of an 'app_menu' hook) Populating the app menu conditionaly ( is the user logged or not, are apps private ) and dissalowing apps running if apps are private and the user not logged
This commit is contained in:
parent
7f36a6fcbd
commit
a6fae9a0db
|
@ -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.
|
* parse plugin comment in search of plugin infos.
|
||||||
|
|
25
index.php
25
index.php
|
@ -149,11 +149,16 @@ else {
|
||||||
|
|
||||||
nav_set_selected('nothing');
|
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")
|
if ($a->module == "stream")
|
||||||
$a->module = "network";
|
$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")) {
|
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");
|
//Check if module is an app and if public access to apps is allowed or not
|
||||||
if(function_exists($a->module . '_module'))
|
if((!local_user()) && plugin_is_app($a->module) && $privateapps === "1") {
|
||||||
$a->module_loaded = true;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue
Block a user