friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

added spaces 

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-03-25 21:19:52 +01:00
parent 9ddb032bf2
commit b97561e0c4
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
boot.php
View File

@ -694,7 +694,7 @@ class App {
} }
if ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 9) === "pagename=") { if ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 9) === "pagename=") {
$this->query_string = substr($_SERVER['QUERY_STRING'],9); $this->query_string = substr($_SERVER['QUERY_STRING'], 9);
// removing trailing / - maybe a nginx problem // removing trailing / - maybe a nginx problem
/// @TODO can be shortened by trim($str, '/') ! /// @TODO can be shortened by trim($str, '/') !
if (substr($this->query_string, 0, 1) == "/") { if (substr($this->query_string, 0, 1) == "/") {
@ -717,7 +717,7 @@ class App {
// fix query_string // fix query_string
$this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string); $this->query_string = str_replace($this->cmd . "&", $this->cmd . "?", $this->query_string);
// unix style "homedir" // unix style "homedir"
if (substr($this->cmd, 0, 1) === '~') { if (substr($this->cmd, 0, 1) === '~') {
@ -725,14 +725,12 @@ class App {
} }
// Diaspora style profile url // Diaspora style profile url
if (substr($this->cmd,0,2) === 'u/') { if (substr($this->cmd,0,2) === 'u/') {
$this->cmd = 'profile/' . substr($this->cmd,2); $this->cmd = 'profile/' . substr($this->cmd,2);
} }
/* /*
*
* Break the URL path into C style argc/argv style arguments for our * Break the URL path into C style argc/argv style arguments for our
* modules. Given "http://example.com/module/arg1/arg2", $this->argc * modules. Given "http://example.com/module/arg1/arg2", $this->argc
* will be 3 (integer) and $this->argv will contain: * will be 3 (integer) and $this->argv will contain:
@ -743,12 +741,11 @@ class App {
* *
* There will always be one argument. If provided a naked domain * There will always be one argument. If provided a naked domain
* URL, $this->argv[0] is set to "home". * URL, $this->argv[0] is set to "home".
*
*/ */
$this->argv = explode('/',$this->cmd); $this->argv = explode('/', $this->cmd);
$this->argc = count($this->argv); $this->argc = count($this->argv);
if ((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) { if ((array_key_exists('0', $this->argv)) && strlen($this->argv[0])) {
$this->module = str_replace(".", "_", $this->argv[0]); $this->module = str_replace(".", "_", $this->argv[0]);
$this->module = str_replace("-", "_", $this->module); $this->module = str_replace("-", "_", $this->module);
} else { } else {
@ -762,9 +759,10 @@ class App {
* pagination * pagination
*/ */
$this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1); $this->pager['page'] = ((x($_GET, 'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
$this->pager['itemspage'] = 50; $this->pager['itemspage'] = 50;
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage']; $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
if ($this->pager['start'] < 0) { if ($this->pager['start'] < 0) {
$this->pager['start'] = 0; $this->pager['start'] = 0;
} }