* @package Installation
*
* @author Brion Vibber <brion@status.net>
+ * @author Mikael Nordfeldth <mmn@hethane.se>
* @license GNU Affero General Public License http://www.gnu.org/licenses/
- * @version 0.9.x
+ * @version 1.1.x
* @link http://status.net
*/
'--path' => 'path',
'--sitename' => 'sitename',
'--fancy' => 'fancy',
+ '--ssl' => 'ssl',
'--dbtype' => 'dbtype',
'--host' => 'host',
'--admin-nick' => 'adminNick',
'--admin-pass' => 'adminPass',
'--admin-email' => 'adminEmail',
- '--admin-updates' => 'adminUpdates'
+
+ '--site-profile' => 'siteProfile'
);
foreach ($map as $arg => $target) {
if (substr($arg, 0, 2) == '--') {
// defaults
$this->dbtype = 'mysql';
- $this->adminUpdates = true;
$this->verbose = true;
+ // ssl is defaulted in lib/installer.php
foreach ($options as $option) {
$arg = $option[0];
if (isset($map[$arg])) {
$var = $map[$arg];
$this->$var = $option[1];
- if ($var == 'adminUpdates' || $arg == '--fancy') {
+ if ($arg == '--fancy') {
$this->$var = ($option[1] != 'false') && ($option[1] != 'no');
}
} else if ($arg == '--skip-config') {
-p --path=<path> Use <path> as path name
--sitename User-friendly site name (required)
--fancy Whether to use fancy URLs (default no)
+ --ssl Server SSL enabled (default never),
+ [never | always]
--dbtype 'mysql' (default) or 'pgsql'
--host Database hostname (required)
--admin-updates 'yes' (default) or 'no', whether to subscribe
admin to update@status.net (default yes)
+ --site-profile site profile ['public', 'private' (default), 'community', 'singleuser']
+
--skip-config Don't write a config.php -- use with caution,
requires a global configuration file.
$breakout = preg_replace('/<a[^>+]\bhref="(.*)"[^>]*>(.*)<\/a>/',
'\2 <\1>',
$html);
- return html_entity_decode(strip_tags($breakout));
+ return html_entity_decode(strip_tags($breakout), ENT_QUOTES, 'UTF-8');
}
}