*
* @throws ServerException if plugin can't be found
*/
- public static function addPlugin($name, $attrs = null)
+ public static function addPlugin($name, array $attrs=array())
{
$name = ucfirst($name);
}
}
+ // Doesn't this $inst risk being garbage collected or something?
+ // TODO: put into a static array that makes sure $inst isn't lost.
$inst = new $pluginclass();
- if (!empty($attrs)) {
- foreach ($attrs as $aname => $avalue) {
- $inst->$aname = $avalue;
- }
+ foreach ($attrs as $aname => $avalue) {
+ $inst->$aname = $avalue;
}
// Record activated plugins for later display/config dump
return true;
}
+ public static function delPlugin($name)
+ {
+ // Remove our plugin if it was previously loaded
+ $name = ucfirst($name);
+ if (isset(self::$plugins[$name])) {
+ unset(self::$plugins[$name]);
+ }
+
+ // make sure initPlugins will avoid this
+ common_config_set('plugins', 'disable-'.$name, true);
+
+ return true;
+ }
+
/**
* Get a list of activated plugins in this process.
* @return array of (string $name, array $args) pairs
continue;
}
+ // TODO: We should be able to avoid this is_null and assume $params
+ // is an array, since that's how it is typed in addPlugin
if (is_null($params)) {
self::addPlugin($name);
} else if (is_array($params)) {
{
global $config;
$settings = SiteProfile::getSettings($name);
- $config = array_merge($config, $settings);
+ $config = array_replace_recursive($config, $settings);
}
protected static function _sn_to_path($sn)
static function isHTTPS()
{
// There are some exceptions to this; add them here!
- if(empty($_SERVER['HTTPS'])) {
+ if (empty($_SERVER['HTTPS'])) {
return false;
- } else {
- return $_SERVER['HTTPS'] !== 'off';
}
+
+ // If it is _not_ "off", it is on, so "true".
+ return strtolower($_SERVER['HTTPS']) !== 'off';
+ }
+
+ /**
+ * Can we use HTTPS? Then do! Only return false if it's not configured ("never").
+ */
+ static function useHTTPS()
+ {
+ return self::isHTTPS() || common_config('site', 'ssl') != 'never';
}
}