X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=b5edc0f947b4e2c0ddb9d1e92a282e64db8db00d;hb=5c021620801d4e06dd7eebcbacfbf040397297a8;hp=a1d983dce7723ddc35d905df654699a6c05eff49;hpb=5ca90e2c8cbc76693cf0f2278d14f2a35da7e34e;p=quix0rs-gnu-social.git
diff --git a/index.php b/index.php
index a1d983dce7..b5edc0f947 100644
--- a/index.php
+++ b/index.php
@@ -15,24 +15,22 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
* @category StatusNet
* @package StatusNet
+ * @author Brenda Wallace
+ * @author Christopher Vollick
+ * @author CiaranG
+ * @author Craig Andrews
+ * @author Evan Prodromou
+ * @author Gina Haeussge
+ * @author Jeffery To
+ * @author Mike Cochrane
+ * @author Robin Millette
+ * @author Sarven Capadisli
+ * @author Tom Adams
+ *
* @license GNU Affero General Public License http://www.gnu.org/licenses/
- * @author Brenda Wallace
- * @author Christopher Vollick
- * @author CiaranG
- * @author Craig Andrews
- * @author Evan Prodromou
- * @author Evan Prodromou
- * @author Evan Prodromou
- * @author Evan Prodromou
- * @author Gina Haeussge
- * @author Jeffery To
- * @author Mike Cochrane
- * @author Robin Millette
- * @author Sarven Capadisli
- * @author Tom Adams
*/
define('INSTALLDIR', dirname(__FILE__));
@@ -51,12 +49,23 @@ function getPath($req)
) {
return $req['p'];
} else if (array_key_exists('PATH_INFO', $_SERVER)) {
- return $_SERVER['PATH_INFO'];
+ $path = $_SERVER['PATH_INFO'];
+ $script = $_SERVER['SCRIPT_NAME'];
+ if (substr($path, 0, mb_strlen($script)) == $script) {
+ return substr($path, mb_strlen($script));
+ } else {
+ return $path;
+ }
} else {
return null;
}
}
+/**
+ * logs and then displays error messages
+ *
+ * @return void
+ */
function handleError($error)
{
if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
@@ -67,14 +76,19 @@ function handleError($error)
if (common_config('site', 'logdebug')) {
$logmsg .= " : ". $error->getDebugInfo();
}
+ // DB queries often end up with a lot of newlines; merge to a single line
+ // for easier grepability...
+ $logmsg = str_replace("\n", " ", $logmsg);
common_log(LOG_ERR, $logmsg);
+
+ // @fixme backtrace output should be consistent with exception handling
if (common_config('site', 'logdebug')) {
$bt = $error->getBacktrace();
- foreach ($bt as $line) {
- common_log(LOG_ERR, $line);
+ foreach ($bt as $n => $line) {
+ common_log(LOG_ERR, formatBacktraceLine($n, $line));
}
}
- if ($error instanceof DB_DataObject_Error
+ if ($error instanceof DB_DataObject_Error
|| $error instanceof DB_Error
) {
$msg = sprintf(
@@ -100,6 +114,38 @@ function handleError($error)
exit(-1);
}
+/**
+ * Format a backtrace line for debug output roughly like debug_print_backtrace() does.
+ * Exceptions already have this built in, but PEAR error objects just give us the array.
+ *
+ * @param int $n line number
+ * @param array $line per-frame array item from debug_backtrace()
+ * @return string
+ */
+function formatBacktraceLine($n, $line)
+{
+ $out = "#$n ";
+ if (isset($line['class'])) $out .= $line['class'];
+ if (isset($line['type'])) $out .= $line['type'];
+ if (isset($line['function'])) $out .= $line['function'];
+ $out .= '(';
+ if (isset($line['args'])) {
+ $args = array();
+ foreach ($line['args'] as $arg) {
+ // debug_print_backtrace seems to use var_export
+ // but this gets *very* verbose!
+ $args[] = gettype($arg);
+ }
+ $out .= implode(',', $args);
+ }
+ $out .= ')';
+ $out .= ' called at [';
+ if (isset($line['file'])) $out .= $line['file'];
+ if (isset($line['line'])) $out .= ':' . $line['line'];
+ $out .= ']';
+ return $out;
+}
+
function checkMirror($action_obj, $args)
{
global $config;
@@ -134,7 +180,7 @@ function checkMirror($action_obj, $args)
function isLoginAction($action)
{
- static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register');
+ static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds');
$login = null;
@@ -227,10 +273,25 @@ 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)
+ && !preg_match('/^Api/', $action)
) {
+ // set returnto
+ $rargs =& common_copy_args($args);
+ unset($rargs['action']);
+ if (common_config('site', 'fancy')) {
+ unset($rargs['p']);
+ }
+ if (array_key_exists('submit', $rargs)) {
+ unset($rargs['submit']);
+ }
+ foreach (array_keys($_COOKIE) as $cookie) {
+ unset($rargs[$cookie]);
+ }
+ common_set_returnto(common_local_url($action, $rargs));
+
common_redirect(common_local_url('login'));
return;
}