diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action.php | 14 | ||||
| -rw-r--r-- | lib/common.php | 11 | ||||
| -rw-r--r-- | lib/settingsaction.php | 14 | ||||
| -rw-r--r-- | lib/stream.php | 14 | ||||
| -rw-r--r-- | lib/util.php | 24 |
5 files changed, 38 insertions, 39 deletions
diff --git a/lib/action.php b/lib/action.php index c3eacf44e..8d4a0b7ab 100644 --- a/lib/action.php +++ b/lib/action.php @@ -1,18 +1,18 @@ <?php -/* +/* * Laconica - a distributed open-source microblogging tool * Copyright (C) 2008, Controlez-Vous, Inc. - * + * * 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/>. */ @@ -22,10 +22,10 @@ if (!defined('LACONICA')) { exit(1); } class Action { // lawsuit var $args; - + function Action() { } - + function arg($key) { if (array_key_exists($key, $this->args)) { return $this->args[$key]; @@ -33,7 +33,7 @@ class Action { // lawsuit return NULL; } } - + function handle($argarray) { $this->args = array(); foreach ($argarray as $k => $v) { diff --git a/lib/common.php b/lib/common.php index 4bdfcb3f8..66de209d6 100644 --- a/lib/common.php +++ b/lib/common.php @@ -1,25 +1,24 @@ <?php -/* +/* * Laconica - a distributed open-source microblogging tool * Copyright (C) 2008, Controlez-Vous, Inc. - * + * * 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/>. */ /* XXX: break up into separate modules (HTTP, HTML, user, files) */ - if (!defined('LACONICA')) { exit(1); } define('AVATAR_PROFILE_SIZE', 96); @@ -51,7 +50,7 @@ $config = $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options'); -$config['db'] = +$config['db'] = array('database' => 'YOU HAVE TO SET THIS IN config.php', 'schema_location' => INSTALLDIR . '/classes', 'class_location' => INSTALLDIR . '/classes', diff --git a/lib/settingsaction.php b/lib/settingsaction.php index 3e38db8e0..2977c3cb1 100644 --- a/lib/settingsaction.php +++ b/lib/settingsaction.php @@ -1,22 +1,22 @@ <?php -/* +/* * Laconica - a distributed open-source microblogging tool * Copyright (C) 2008, Controlez-Vous, Inc. - * + * * 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/>. */ - + if (!defined('LACONICA')) { exit(1); } class SettingsAction extends Action { @@ -37,7 +37,7 @@ class SettingsAction extends Action { function handle_post() { return false; } - + function show_form($msg=NULL, $success=false) { return false; } @@ -48,7 +48,7 @@ class SettingsAction extends Action { $msg); } } - + function settings_menu() { common_element_start('ul', 'headmenu'); common_menu_item(common_local_url('profilesettings'), diff --git a/lib/stream.php b/lib/stream.php index 79544a073..e16769118 100644 --- a/lib/stream.php +++ b/lib/stream.php @@ -1,22 +1,22 @@ <?php -/* +/* * Laconica - a distributed open-source microblogging tool * Copyright (C) 2008, Controlez-Vous, Inc. - * + * * 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/>. */ - + if (!defined('LACONICA')) { exit(1); } define('NOTICES_PER_PAGE', 20); @@ -39,8 +39,8 @@ class StreamAction extends Action { 'class' => 'avatar stream', 'width' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE, - 'alt' => - ($profile->fullname) ? $profile->fullname : + 'alt' => + ($profile->fullname) ? $profile->fullname : $profile->nickname)); common_element_end('a'); common_element('a', array('href' => $profile->profileurl, diff --git a/lib/util.php b/lib/util.php index 8a05a346f..cd0a6260b 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1,18 +1,18 @@ <?php -/* +/* * Laconica - a distributed open-source microblogging tool * Copyright (C) 2008, Controlez-Vous, Inc. - * + * * 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/>. */ @@ -69,7 +69,7 @@ function common_show_header($pagetitle) { global $config, $xw; header('Content-Type: application/xhtml+xml'); - + $xw = new XMLWriter(); $xw->openURI('php://output'); $xw->setIndent(true); @@ -78,13 +78,13 @@ function common_show_header($pagetitle) { 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'); # FIXME: correct language for interface - + common_element_start('html', array('xmlns' => 'http://www.w3.org/1999/xhtml', 'xml:lang' => 'en', 'lang' => 'en')); - + common_element_start('head'); - common_element('title', NULL, + common_element('title', NULL, $pagetitle . " - " . $config['site']['name']); common_element('link', array('rel' => 'stylesheet', 'type' => 'text/css', @@ -102,7 +102,7 @@ function common_show_header($pagetitle) { common_element_start('body'); common_element_start('div', array('id' => 'wrapper')); common_element_start('div', array('id' => 'content')); - common_element_start('div', array('id' => 'header')); + common_element_start('div', array('id' => 'header')); common_element('h1', 'title', $pagetitle); common_element('h2', 'subtitle', $config['site']['name']); common_element_end('div'); @@ -155,7 +155,7 @@ function common_head_menu() { common_menu_item(common_local_url('doc', array('title' => 'help')), _t('Help')); if ($user) { - common_menu_item(common_local_url('all', array('nickname' => + common_menu_item(common_local_url('all', array('nickname' => $user->nickname)), _t('Home')); common_menu_item(common_local_url('showstream', array('nickname' => @@ -243,7 +243,7 @@ function common_check_user($nickname, $password) { if (is_null($user)) { return false; } else { - return (0 == strcmp(common_munge_password($password, $user->id), + return (0 == strcmp(common_munge_password($password, $user->id), $user->password)); } } @@ -379,6 +379,6 @@ function common_profile_url($nickname) { // XXX: set up gettext -function _t($str) { +function _t($str) { return $str; } |