We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 1618d515 authored by Evan Prodromou's avatar Evan Prodromou

dedupe evans

parent 6f531745
...@@ -15,19 +15,16 @@ ...@@ -15,19 +15,16 @@
* *
* You should have received a copy of the GNU Affero General Public License * 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/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* @category Actions * @category Actions
* @package Actions * @package Actions
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Evan Prodromou <evan@status.net>
* @author Mike Cochrane <mikec@mikenz.geek.nz> * @author Mike Cochrane <mikec@mikenz.geek.nz>
* @author Robin Millette <millette@controlyourself.ca> * @author Robin Millette <millette@controlyourself.ca>
* @author Adrian Lang <mail@adrianlang.de> * @author Adrian Lang <mail@adrianlang.de>
* @author Meitar Moscovitz <meitarm@gmail.com> * @author Meitar Moscovitz <meitarm@gmail.com>
* @author Sarven Capadisli <csarven@controlyourself.ca> * @author Sarven Capadisli <csarven@controlyourself.ca>
* @author Craig Andrews <candrews@integralblue.com> * @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 Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@controlyourself.ca> * @author Zach Copley <zach@controlyourself.ca>
* @author csarven <csarven@controlyourself.ca> * @author csarven <csarven@controlyourself.ca>
...@@ -35,8 +32,8 @@ ...@@ -35,8 +32,8 @@
* @link http://status.net * @link http://status.net
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR.'/lib/personalgroupnav.php'; require_once INSTALLDIR.'/lib/personalgroupnav.php';
......
...@@ -15,11 +15,10 @@ ...@@ -15,11 +15,10 @@
* *
* You should have received a copy of the GNU Affero General Public License * 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/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* @category Actions * @category Actions
* @package Actions * @package Actions
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Evan Prodromou <evan@status.net>
* @author Brenda Wallace <shiny@cpan.org> * @author Brenda Wallace <shiny@cpan.org>
* @author Jeffery To <jeffery.to@gmail.com> * @author Jeffery To <jeffery.to@gmail.com>
* @author Robin Millette <millette@controlyourself.ca> * @author Robin Millette <millette@controlyourself.ca>
...@@ -27,8 +26,6 @@ ...@@ -27,8 +26,6 @@
* @author Christopher Vollick <psycotica0@gmail.com> * @author Christopher Vollick <psycotica0@gmail.com>
* @author CiaranG <ciaran@ciarang.com> * @author CiaranG <ciaran@ciarang.com>
* @author Craig Andrews <candrews@integralblue.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 Gina Haeussge <osd@foosel.net>
* @author Mike Cochrane <mikec@mikenz.geek.nz> * @author Mike Cochrane <mikec@mikenz.geek.nz>
* @author Sarven Capadisli <csarven@controlyourself.ca> * @author Sarven Capadisli <csarven@controlyourself.ca>
...@@ -36,8 +33,8 @@ ...@@ -36,8 +33,8 @@
* @link http://status.net * @link http://status.net
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
class ApiAction extends Action class ApiAction extends Action
...@@ -205,9 +202,9 @@ class ApiAction extends Action ...@@ -205,9 +202,9 @@ class ApiAction extends Action
$user_id = $this->arg('user_id'); $user_id = $this->arg('user_id');
$screen_name = $this->arg('screen_name'); $screen_name = $this->arg('screen_name');
if (empty($this->api_arg) if (empty($this->api_arg)
&& empty($id) && empty($id)
&& empty($user_id) && empty($user_id)
&& empty($screen_name) && empty($screen_name)
) { ) {
return true; return true;
......
...@@ -15,23 +15,20 @@ ...@@ -15,23 +15,20 @@
* *
* You should have received a copy of the GNU Affero General Public License * 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/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* @category StatusNet * @category StatusNet
* @package StatusNet * @package StatusNet
* @license GNU Affero General Public License http://www.gnu.org/licenses/ * @license GNU Affero General Public License http://www.gnu.org/licenses/
* @author Brenda Wallace <shiny@cpan.org> * @author Brenda Wallace <shiny@cpan.org>
* @author Christopher Vollick <psycotica0@gmail.com> * @author Christopher Vollick <psycotica0@gmail.com>
* @author CiaranG <ciaran@ciarang.com> * @author CiaranG <ciaran@ciarang.com>
* @author Craig Andrews <candrews@integralblue.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 Evan Prodromou <evan@status.net> * @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 Jeffery To <jeffery.to@gmail.com>
* @author Mike Cochrane <mikec@mikenz.geek.nz> * @author Mike Cochrane <mikec@mikenz.geek.nz>
* @author Robin Millette <millette@controlyourself.ca> * @author Robin Millette <millette@controlyourself.ca>
* @author Sarven Capadisli <csarven@controlyourself.ca> * @author Sarven Capadisli <csarven@controlyourself.ca>
* @author Tom Adams <tom@holizz.com> * @author Tom Adams <tom@holizz.com>
*/ */
...@@ -74,7 +71,7 @@ function handleError($error) ...@@ -74,7 +71,7 @@ function handleError($error)
common_log(LOG_ERR, $line); common_log(LOG_ERR, $line);
} }
} }
if ($error instanceof DB_DataObject_Error if ($error instanceof DB_DataObject_Error
|| $error instanceof DB_Error || $error instanceof DB_Error
) { ) {
$msg = sprintf( $msg = sprintf(
...@@ -227,8 +224,8 @@ function main() ...@@ -227,8 +224,8 @@ function main()
// If the site is private, and they're not on one of the "public" // If the site is private, and they're not on one of the "public"
// parts of the site, redirect to login // parts of the site, redirect to login
if (!$user && common_config('site', 'private') if (!$user && common_config('site', 'private')
&& !isLoginAction($action) && !isLoginAction($action)
&& !preg_match('/rss$/', $action) && !preg_match('/rss$/', $action)
) { ) {
common_redirect(common_local_url('login')); common_redirect(common_local_url('login'));
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
* @author Craig Andrews <candrews@integralblue.com> * @author Craig Andrews <candrews@integralblue.com>
* @author Eric Helgeson <helfire@Erics-MBP.local> * @author Eric Helgeson <helfire@Erics-MBP.local>
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Evan Prodromou <evan@status.net>
* @author Robin Millette <millette@controlyourself.ca> * @author Robin Millette <millette@controlyourself.ca>
* @author Sarven Capadisli <csarven@controlyourself.ca> * @author Sarven Capadisli <csarven@controlyourself.ca>
* @author Tom Adams <tom@holizz.com> * @author Tom Adams <tom@holizz.com>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment