diff options
| -rw-r--r-- | actions/all.php | 9 | ||||
| -rw-r--r-- | actions/api.php | 15 | ||||
| -rw-r--r-- | index.php | 21 | ||||
| -rw-r--r-- | install.php | 1 |
4 files changed, 18 insertions, 28 deletions
diff --git a/actions/all.php b/actions/all.php index 5ffc7e9bd..22da3cd68 100644 --- a/actions/all.php +++ b/actions/all.php @@ -15,19 +15,16 @@ * * 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 Actions * @package Actions * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> * @author Mike Cochrane <mikec@mikenz.geek.nz> * @author Robin Millette <millette@controlyourself.ca> * @author Adrian Lang <mail@adrianlang.de> * @author Meitar Moscovitz <meitarm@gmail.com> * @author Sarven Capadisli <csarven@controlyourself.ca> * @author Craig Andrews <candrews@integralblue.com> - * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> * @author Jeffery To <jeffery.to@gmail.com> * @author Zach Copley <zach@controlyourself.ca> * @author csarven <csarven@controlyourself.ca> @@ -35,8 +32,8 @@ * @link http://status.net */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); } require_once INSTALLDIR.'/lib/personalgroupnav.php'; diff --git a/actions/api.php b/actions/api.php index 06fdbfb44..243ae4c62 100644 --- a/actions/api.php +++ b/actions/api.php @@ -15,11 +15,10 @@ * * 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 Actions * @package Actions * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> * @author Brenda Wallace <shiny@cpan.org> * @author Jeffery To <jeffery.to@gmail.com> * @author Robin Millette <millette@controlyourself.ca> @@ -27,8 +26,6 @@ * @author Christopher Vollick <psycotica0@gmail.com> * @author CiaranG <ciaran@ciarang.com> * @author Craig Andrews <candrews@integralblue.com> - * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> * @author Gina Haeussge <osd@foosel.net> * @author Mike Cochrane <mikec@mikenz.geek.nz> * @author Sarven Capadisli <csarven@controlyourself.ca> @@ -36,8 +33,8 @@ * @link http://status.net */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); } class ApiAction extends Action @@ -205,9 +202,9 @@ class ApiAction extends Action $user_id = $this->arg('user_id'); $screen_name = $this->arg('screen_name'); - if (empty($this->api_arg) - && empty($id) - && empty($user_id) + if (empty($this->api_arg) + && empty($id) + && empty($user_id) && empty($screen_name) ) { return true; @@ -15,23 +15,20 @@ * * 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 StatusNet * @package StatusNet * @license GNU Affero General Public License http://www.gnu.org/licenses/ - * @author Brenda Wallace <shiny@cpan.org> - * @author Christopher Vollick <psycotica0@gmail.com> + * @author Brenda Wallace <shiny@cpan.org> + * @author Christopher Vollick <psycotica0@gmail.com> * @author CiaranG <ciaran@ciarang.com> - * @author Craig Andrews <candrews@integralblue.com> - * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> + * @author Craig Andrews <candrews@integralblue.com> * @author Evan Prodromou <evan@status.net> - * @author Gina Haeussge <osd@foosel.net> + * @author Gina Haeussge <osd@foosel.net> * @author Jeffery To <jeffery.to@gmail.com> * @author Mike Cochrane <mikec@mikenz.geek.nz> * @author Robin Millette <millette@controlyourself.ca> - * @author Sarven Capadisli <csarven@controlyourself.ca> + * @author Sarven Capadisli <csarven@controlyourself.ca> * @author Tom Adams <tom@holizz.com> */ @@ -74,7 +71,7 @@ function handleError($error) common_log(LOG_ERR, $line); } } - if ($error instanceof DB_DataObject_Error + if ($error instanceof DB_DataObject_Error || $error instanceof DB_Error ) { $msg = sprintf( @@ -227,8 +224,8 @@ function main() // If the site is private, and they're not on one of the "public" // parts of the site, redirect to login - if (!$user && common_config('site', 'private') - && !isLoginAction($action) + if (!$user && common_config('site', 'private') + && !isLoginAction($action) && !preg_match('/rss$/', $action) ) { common_redirect(common_local_url('login')); diff --git a/install.php b/install.php index 24ad3eb24..4398757de 100644 --- a/install.php +++ b/install.php @@ -27,7 +27,6 @@ * @author Craig Andrews <candrews@integralblue.com> * @author Eric Helgeson <helfire@Erics-MBP.local> * @author Evan Prodromou <evan@status.net> - * @author Evan Prodromou <evan@status.net> * @author Robin Millette <millette@controlyourself.ca> * @author Sarven Capadisli <csarven@controlyourself.ca> * @author Tom Adams <tom@holizz.com> |