Commit b8c00913 authored by Evan Prodromou's avatar Evan Prodromou

first step of phpcs-cleanup of index.php

darcs-hash:20081221002332-84dde-5834e12499fff0a23a8a6a76018f8beaa5ea8a96.gz
parent d18c621b
......@@ -19,4 +19,6 @@ Sarven Capadisli <csarven@controlyourself.ca>**20081218003302
]
[more information in subscription notices
Evan Prodromou <evan@prodromou.name>**20081212171135]
\ No newline at end of file
Evan Prodromou <evan@prodromou.name>**20081212171135]
[first step of phpcs-cleanup of index.php
Evan Prodromou <evan@prodromou.name>**20081221002332]
\ No newline at end of file
<?php
/*
/**
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc.
*
......@@ -20,13 +20,13 @@
define('INSTALLDIR', dirname(__FILE__));
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();
# initialize language env
// initialize language env
common_init_language();
......@@ -41,30 +41,34 @@ if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
if (!$user && common_config('site', 'private') &&
!in_array($action, array('login', 'openidlogin', 'finishopenidlogin',
'recoverpassword', 'api', 'doc', 'register')))
{
'recoverpassword', 'api', 'doc', 'register'))) {
common_redirect(common_local_url('login'));
}
$actionfile = INSTALLDIR."/actions/$action.php";
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();
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;
}
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 {
common_user_error(_('Unknown action'));
}
\ No newline at end of file
hunk ./lib/mail.php 115
- $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 ./lib/mail.php 120
- 'Faithfully yours,'."\n".'%4$s.'."\n"),
- $long_name,
- common_config('site', 'name'),
- $other->profileurl,
- common_config('site', 'name'));
-
+ '%4$s'.
+ '%5$s'.
+ '%6$s'.
+ "\n".'Faithfully yours,'."\n".'%7$s.'."\n\n".
+ "----\n".
+ "Change your email address or notification options at %8$s"),
+ $long_name,
+ common_config('site', 'name'),
+ $other->profileurl,
+ ($other->location) ? sprintf(_("Location: %s\n"), $other->location) : '',
+ ($other->homepage) ? sprintf(_("Homepage: %s\n"), $other->homepage) : '',
+ ($other->bio) ? sprintf(_("Bio: %s\n\n"), $other->bio) : '',
+ common_config('site', 'name'),
+ common_local_url('emailsettings'));
hunk ./index.php 2
-/*
+/**
hunk ./index.php 23
-require_once(INSTALLDIR . "/lib/common.php");
+require_once INSTALLDIR . '/lib/common.php';
hunk ./index.php 25
-# get and cache current user
+// get and cache current user
hunk ./index.php 29
-# initialize language env
+// initialize language env
hunk ./index.php 44
- 'recoverpassword', 'api', 'doc', 'register')))
-{
+ 'recoverpassword', 'api', 'doc', 'register'))) {
hunk ./index.php 51
- require_once($actionfile);
- $action_class = ucfirst($action)."Action";
+
+ include_once $actionfile;
+
+ $action_class = ucfirst($action).'Action';
+
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);
+ }
<?php
/*
/**
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc.
*
......@@ -20,13 +20,13 @@
define('INSTALLDIR', dirname(__FILE__));
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();
# initialize language env
// initialize language env
common_init_language();
......@@ -41,30 +41,34 @@ if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
if (!$user && common_config('site', 'private') &&
!in_array($action, array('login', 'openidlogin', 'finishopenidlogin',
'recoverpassword', 'api', 'doc', 'register')))
{
'recoverpassword', 'api', 'doc', 'register'))) {
common_redirect(common_local_url('login'));
}
$actionfile = INSTALLDIR."/actions/$action.php";
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();
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;
}
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 {
common_user_error(_('Unknown action'));
}
\ No newline at end of file
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