diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/deletegroupform.php | 123 | ||||
| -rw-r--r-- | lib/installer.php | 6 | ||||
| -rw-r--r-- | lib/right.php | 1 | ||||
| -rw-r--r-- | lib/router.php | 2 | ||||
| -rw-r--r-- | lib/statusnet.php | 7 |
5 files changed, 135 insertions, 4 deletions
diff --git a/lib/deletegroupform.php b/lib/deletegroupform.php new file mode 100644 index 000000000..9d8012d33 --- /dev/null +++ b/lib/deletegroupform.php @@ -0,0 +1,123 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Form for joining a group + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @author Sarven Capadisli <csarven@status.net> + * @author Brion Vibber <brion@status.net> + * @copyright 2009, 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for deleting a group + * + * @category Form + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @author Sarven Capadisli <csarven@status.net> + * @author Brion Vibber <brion@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see UnsubscribeForm + * @fixme merge a bunch of this stuff with similar form types to reduce boilerplate + */ + +class DeleteGroupForm extends Form +{ + /** + * group for user to delete + */ + + var $group = null; + + /** + * Constructor + * + * @param HTMLOutputter $out output channel + * @param group $group group to join + */ + + function __construct($out=null, $group=null) + { + parent::__construct($out); + + $this->group = $group; + } + + /** + * ID of the form + * + * @return string ID of the form + */ + + function id() + { + return 'group-delete-' . $this->group->id; + } + + /** + * class of the form + * + * @return string of the form class + */ + + function formClass() + { + return 'form_group_delete'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url('deletegroup', + array('id' => $this->group->id)); + } + + function formData() + { + $this->out->hidden($this->id() . '-returnto-action', 'groupbyid', 'returnto-action'); + $this->out->hidden($this->id() . '-returnto-id', $this->group->id, 'returnto-id'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', _('Delete')); + } +} diff --git a/lib/installer.php b/lib/installer.php index 2eff2d85a..c046eadea 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -85,7 +85,11 @@ abstract class Installer $config = INSTALLDIR.'/config.php'; if (file_exists($config)) { if (!is_writable($config) || filesize($config) > 0) { - $this->warning('Config file "config.php" already exists.'); + if (filesize($config) == 0) { + $this->warning('Config file "config.php" already exists and is empty, but is not writable.'); + } else { + $this->warning('Config file "config.php" already exists.'); + } $pass = false; } } diff --git a/lib/right.php b/lib/right.php index deb451fde..bacbea5f2 100644 --- a/lib/right.php +++ b/lib/right.php @@ -60,5 +60,6 @@ class Right const MAKEGROUPADMIN = 'makegroupadmin'; const GRANTROLE = 'grantrole'; const REVOKEROLE = 'revokerole'; + const DELETEGROUP = 'deletegroup'; } diff --git a/lib/router.php b/lib/router.php index 3bbb4a044..eebe2beea 100644 --- a/lib/router.php +++ b/lib/router.php @@ -278,7 +278,7 @@ class Router $m->connect('group/new', array('action' => 'newgroup')); - foreach (array('edit', 'join', 'leave') as $v) { + foreach (array('edit', 'join', 'leave', 'delete') as $v) { $m->connect('group/:nickname/'.$v, array('action' => $v.'group'), array('nickname' => '[a-zA-Z0-9]+')); diff --git a/lib/statusnet.php b/lib/statusnet.php index ff0502915..39f90a506 100644 --- a/lib/statusnet.php +++ b/lib/statusnet.php @@ -341,8 +341,11 @@ class StatusNet foreach ($config_files as $_config_file) { if (@file_exists($_config_file)) { - include($_config_file); - self::$have_config = true; + // Ignore 0-byte config files + if (filesize($_config_file) > 0) { + include($_config_file); + self::$have_config = true; + } } } |