GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

first step of phpcs-cleanup of index.php 

darcs-hash:20081221002332-84dde-5834e12499fff0a23a8a6a76018f8beaa5ea8a96.gz
This commit is contained in:
Evan Prodromou 2008-12-20 19:23:32 -05:00
parent d18c621bcf
commit b8c0091390
5 changed files with 103 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_darcs/inventory
View File

@ -19,4 +19,6 @@ Sarven Capadisli <csarven@controlyourself.ca>**20081218003302
] ]
[more information in subscription notices [more information in subscription notices
Evan Prodromou <evan@prodromou.name>**20081212171135] Evan Prodromou <evan@prodromou.name>**20081212171135]
[first step of phpcs-cleanup of index.php
Evan Prodromou <evan@prodromou.name>**20081221002332]

BIN
_darcs/patches/20081221002332-84dde-5834e12499fff0a23a8a6a76018f8beaa5ea8a96.gz Normal file
View File

Binary file not shown.

44
_darcs/pristine/index.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* /**
* Laconica - a distributed open-source microblogging tool * Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc. * Copyright (C) 2008, Controlez-Vous, Inc.
* *
@ -20,13 +20,13 @@
define('INSTALLDIR', dirname(__FILE__)); define('INSTALLDIR', dirname(__FILE__));
define('LACONICA', true); define('LACONICA', true);
require_once(INSTALLDIR . "/lib/common.php"); require_once INSTALLDIR . '/lib/common.php';
# get and cache current user // get and cache current user
$user = common_current_user(); $user = common_current_user();
# initialize language env // initialize language env
common_init_language(); common_init_language();
@ -41,30 +41,34 @@ if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
if (!$user && common_config('site', 'private') && if (!$user && common_config('site', 'private') &&
!in_array($action, array('login', 'openidlogin', 'finishopenidlogin', !in_array($action, array('login', 'openidlogin', 'finishopenidlogin',
'recoverpassword', 'api', 'doc', 'register'))) 'recoverpassword', 'api', 'doc', 'register'))) {
{
common_redirect(common_local_url('login')); common_redirect(common_local_url('login'));
} }
$actionfile = INSTALLDIR."/actions/$action.php"; $actionfile = INSTALLDIR."/actions/$action.php";
if (file_exists($actionfile)) { if (file_exists($actionfile)) {
require_once($actionfile);
$action_class = ucfirst($action)."Action"; include_once $actionfile;
$action_class = ucfirst($action).'Action';
$action_obj = new $action_class(); $action_obj = new $action_class();
if ($config['db']['mirror'] && $action_obj->is_readonly()) {
if (is_array($config['db']['mirror'])) { if ($config['db']['mirror'] && $action_obj->is_readonly()) {
# "load balancing", ha ha if (is_array($config['db']['mirror'])) {
$k = array_rand($config['db']['mirror']); // "load balancing", ha ha
$mirror = $config['db']['mirror'][$k]; $k = array_rand($config['db']['mirror']);
} else {
$mirror = $config['db']['mirror']; $mirror = $config['db']['mirror'][$k];
} } else {
$config['db']['database'] = $mirror; $mirror = $config['db']['mirror'];
} }
$config['db']['database'] = $mirror;
}
if (call_user_func(array($action_obj, 'prepare'), $_REQUEST)) { if (call_user_func(array($action_obj, 'prepare'), $_REQUEST)) {
call_user_func(array($action_obj, 'handle'), $_REQUEST); call_user_func(array($action_obj, 'handle'), $_REQUEST);
} }
} else { } else {
common_user_error(_('Unknown action')); common_user_error(_('Unknown action'));
} }

77
_darcs/tentative_pristine
View File

@ -1,25 +1,52 @@
hunk ./lib/mail.php 115 hunk ./index.php 2
- $headers['Subject'] = sprintf(_('%1$s is now listening to your notices on %2$s.'), $other->getBestName(), -/*
+ $headers['Subject'] = sprintf(_('%1$s is now listening to your notices on %2$s.'), +/**
+ $other->getBestName(), hunk ./index.php 23
hunk ./lib/mail.php 120 -require_once(INSTALLDIR . "/lib/common.php");
- 'Faithfully yours,'."\n".'%4$s.'."\n"), +require_once INSTALLDIR . '/lib/common.php';
- $long_name, hunk ./index.php 25
- common_config('site', 'name'), -# get and cache current user
- $other->profileurl, +// get and cache current user
- common_config('site', 'name')); hunk ./index.php 29
- -# initialize language env
+ '%4$s'. +// initialize language env
+ '%5$s'. hunk ./index.php 44
+ '%6$s'. - 'recoverpassword', 'api', 'doc', 'register')))
+ "\n".'Faithfully yours,'."\n".'%7$s.'."\n\n". -{
+ "----\n". + 'recoverpassword', 'api', 'doc', 'register'))) {
+ "Change your email address or notification options at %8$s"), hunk ./index.php 51
+ $long_name, - require_once($actionfile);
+ common_config('site', 'name'), - $action_class = ucfirst($action)."Action";
+ $other->profileurl, +
+ ($other->location) ? sprintf(_("Location: %s\n"), $other->location) : '', + include_once $actionfile;
+ ($other->homepage) ? sprintf(_("Homepage: %s\n"), $other->homepage) : '', +
+ ($other->bio) ? sprintf(_("Bio: %s\n\n"), $other->bio) : '', + $action_class = ucfirst($action).'Action';
+ common_config('site', 'name'), +
+ common_local_url('emailsettings')); hunk ./index.php 57
- if ($config['db']['mirror'] && $action_obj->is_readonly()) {
- if (is_array($config['db']['mirror'])) {
- # "load balancing", ha ha
- $k = array_rand($config['db']['mirror']);
- $mirror = $config['db']['mirror'][$k];
- } else {
- $mirror = $config['db']['mirror'];
- }
- $config['db']['database'] = $mirror;
- }
+
+ if ($config['db']['mirror'] && $action_obj->is_readonly()) {
+ if (is_array($config['db']['mirror'])) {
+ // "load balancing", ha ha
+ $k = array_rand($config['db']['mirror']);
+
+ $mirror = $config['db']['mirror'][$k];
+ } else {
+ $mirror = $config['db']['mirror'];
+ }
+ $config['db']['database'] = $mirror;
+ }
hunk ./index.php 70
- call_user_func(array($action_obj, 'handle'), $_REQUEST);
- }
+ call_user_func(array($action_obj, 'handle'), $_REQUEST);
+ }

44
index.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* /**
* Laconica - a distributed open-source microblogging tool * Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc. * Copyright (C) 2008, Controlez-Vous, Inc.
* *
@ -20,13 +20,13 @@
define('INSTALLDIR', dirname(__FILE__)); define('INSTALLDIR', dirname(__FILE__));
define('LACONICA', true); define('LACONICA', true);
require_once(INSTALLDIR . "/lib/common.php"); require_once INSTALLDIR . '/lib/common.php';
# get and cache current user // get and cache current user
$user = common_current_user(); $user = common_current_user();
# initialize language env // initialize language env
common_init_language(); common_init_language();
@ -41,30 +41,34 @@ if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
if (!$user && common_config('site', 'private') && if (!$user && common_config('site', 'private') &&
!in_array($action, array('login', 'openidlogin', 'finishopenidlogin', !in_array($action, array('login', 'openidlogin', 'finishopenidlogin',
'recoverpassword', 'api', 'doc', 'register'))) 'recoverpassword', 'api', 'doc', 'register'))) {
{
common_redirect(common_local_url('login')); common_redirect(common_local_url('login'));
} }
$actionfile = INSTALLDIR."/actions/$action.php"; $actionfile = INSTALLDIR."/actions/$action.php";
if (file_exists($actionfile)) { if (file_exists($actionfile)) {
require_once($actionfile);
$action_class = ucfirst($action)."Action"; include_once $actionfile;
$action_class = ucfirst($action).'Action';
$action_obj = new $action_class(); $action_obj = new $action_class();
if ($config['db']['mirror'] && $action_obj->is_readonly()) {
if (is_array($config['db']['mirror'])) { if ($config['db']['mirror'] && $action_obj->is_readonly()) {
# "load balancing", ha ha if (is_array($config['db']['mirror'])) {
$k = array_rand($config['db']['mirror']); // "load balancing", ha ha
$mirror = $config['db']['mirror'][$k]; $k = array_rand($config['db']['mirror']);
} else {
$mirror = $config['db']['mirror']; $mirror = $config['db']['mirror'][$k];
} } else {
$config['db']['database'] = $mirror; $mirror = $config['db']['mirror'];
} }
$config['db']['database'] = $mirror;
}
if (call_user_func(array($action_obj, 'prepare'), $_REQUEST)) { if (call_user_func(array($action_obj, 'prepare'), $_REQUEST)) {
call_user_func(array($action_obj, 'handle'), $_REQUEST); call_user_func(array($action_obj, 'handle'), $_REQUEST);
} }
} else { } else {
common_user_error(_('Unknown action')); common_user_error(_('Unknown action'));
} }