allow plugins to become cmd modules

This commit is contained in:
Friendika 2011-02-10 16:17:21 -08:00
parent 6da603fbb5
commit f217a557b8
2 changed files with 9 additions and 2 deletions

View File

@ -195,7 +195,7 @@ class App {
public $hooks; public $hooks;
public $timezone; public $timezone;
public $interactive = true; public $interactive = true;
public $plugins;
private $scheme; private $scheme;
private $hostname; private $hostname;
@ -478,6 +478,8 @@ function check_config(&$a) {
if($plugins) if($plugins)
$plugins_arr = explode(',',str_replace(' ', '',$plugins)); $plugins_arr = explode(',',str_replace(' ', '',$plugins));
$a->plugins = $plugins_arr;
$installed_arr = array(); $installed_arr = array();
if(count($installed)) { if(count($installed)) {

View File

@ -134,7 +134,12 @@ else
if(strlen($a->module)) { if(strlen($a->module)) {
if(file_exists("mod/{$a->module}.php")) { if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
include("addon/{$a->module}/{$a->module}.php");
if(function_exists($a->module . '_module'))
$a->module_loaded = true;
}
if((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {
include("mod/{$a->module}.php"); include("mod/{$a->module}.php");
$a->module_loaded = true; $a->module_loaded = true;
} }