Commit 919e842

committed

cleaned

1 parent 5c9d863 commit 919e842Copy full SHA for 919e842

File tree

1 file changed

-39

lines changed

src
- router.class.php

1 file changed

-39

lines changed

`‎src/router.class.php‎`

Lines changed: 4 additions & 39 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,6 @@ private function init()`
`87`	`87`	`$this->request_uri = \filter_input(\INPUT_SERVER, 'REQUEST_URI', \FILTER_SANITIZE_ENCODED);`
`88`	`88`	`$this->request_uri = $this->format_unix(urldecode($this->request_uri));`
`89`	`89`
`90`		`- //$_SERVER['PHP_SELF'] = $this->format_path_dir($this->URI_no_query());`
`91`		`-`
`92`		`- /*echo '<pre>';`
`93`		`- print_r($_SERVER);`
`94`		`- die();*/`
`95`	`90`	`$this->physical_file = $this->format_unix($_SERVER['SCRIPT_FILENAME']);`
`96`	`91`	`$this->extension = strrev(strstr(strrev($this->physical_file), '.', TRUE));`
`97`	`92`
`@@ -405,12 +400,8 @@ function console_output()`
`405`	`400`
`406`	`401`	`$this->favicon();`
`407`	`402`
`408`		`- //echo $this->script_filename.'<br />'.$_SERVER['SCRIPT_FILENAME'];`
`409`		`- //die();`
`410`		`-`
`411`	`403`	`if (in_array($this->getExt($this->script_filename), array("", "php"))) {`
`412`	`404`
`413`		`- //return include($_SERVER['SCRIPT_FILENAME']);`
`414`	`405`	`return include($_SERVER['DOCUMENT_ROOT'] . '/' . $this->indexPath);`
`415`	`406`
`416`	`407`	`} else {`
`@@ -419,13 +410,6 @@ function console_output()`
`419`	`410`
`420`	`411`	`}`
`421`	`412`
`422`		`- //$_SERVER['PHP_SELF'] = rtrim($this->format_unix($_SERVER['PHP_SELF']),'/') ;`
`423`		`- //$_SERVER['PATH_INFO'] = $this->format_unix($uri_path);`
`424`		`-`
`425`		`- //echo '<pre>';`
`426`		`- //print_r($_SERVER);`
`427`		`-`
`428`		`-`
`429`	`413`	`}`
`430`	`414`
`431`	`415`	`}`
`@@ -494,6 +478,9 @@ private function URIhasPHP()`
`494`	`478`
`495`	`479`	`}`
`496`	`480`
	`481`	`+ /**`
	`482`	`+ * Adjust some $_SERVER variables`
	`483`	`+ */`
`497`	`484`	`function fix_path_info()`
`498`	`485`	`{`
`499`	`486`
`@@ -502,38 +489,25 @@ function fix_path_info()`
`502`	`489`	`if (($url_no_q = strstr($url, '?', true)) !== FALSE) {`
`503`	`490`	`$url = $url_no_q;`
`504`	`491`	`}`
`505`		`-`
`506`		`-`
	`492`	`+`
`507`	`493`	`$path_info = isset($_SERVER['PHP_INFO']) ? $_SERVER['PHP_INFO'] : '/';`
`508`		`- $script_name = $_SERVER['SCRIPT_NAME'];`
`509`		`- $php_self = $_SERVER['PHP_SELF'];`
`510`	`494`
`511`	`495`	`if (($dot = strstr($url, '.')) !== FALSE) {`
`512`	`496`
`513`	`497`	`if (($ext = strstr($dot, '/', TRUE)) !== FALSE) {`
`514`	`498`
`515`	`499`	`$explode = explode('/', $dot);`
`516`	`500`	`$path_info = '/' . $explode[1];`
`517`		`- $script_name = strstr($url, '.', TRUE) . rtrim($ext, '/');`
`518`		`- $php_self = substr($php_self, strlen($script_name)) . $script_name;`
`519`		`- $script_name = $php_self;`
`520`	`501`
`521`	`502`	`}`
`522`	`503`
`523`	`504`	`}`
`524`	`505`
`525`		`- /* echo 'url:       ' . $url . '<br />';`
`526`		`- echo 'path info:       ' . $path_info . '<br />';`
`527`		`- echo 'php self:        ' . $php_self . '<br />';`
`528`		`- echo 'script name   ' . $script_name;*/`
`529`		`-`
`530`	`506`	`if (isset($_SERVER['HTTP_L'])) {`
`531`	`507`	`$_SERVER['HTTP_CACHE_CONTROL'] = $_SERVER['HTTP_L'];`
`532`	`508`	`unset($_SERVER['HTTP_L']);`
`533`	`509`	`}`
`534`	`510`
`535`		`- //$_SERVER['PHP_SELF'] = $php_self;`
`536`		`-`
`537`	`511`	`if (!isset($_SERVER['PHP_INFO']) && substr($_SERVER['REQUEST_URI'], -1, 1) !== '/' && $this->getExt($_SERVER['REQUEST_URI']) == "") {`
`538`	`512`
`539`	`513`	`$_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] . '/';`
`@@ -544,12 +518,7 @@ function fix_path_info()`
`544`	`518`	`$_SERVER['ORIG_PHP_SELF'] = $_SERVER['PHP_SELF'];`
`545`	`519`	`$_SERVER['ORIG_PATH_INFO'] = isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : "";`
`546`	`520`
`547`		`- //echo $_SERVER['SCRIPT_NAME'].'<br />';`
`548`		`- //echo '<pre>';`
`549`		`- //print_r($_SERVER);`
`550`		`- //$_SERVER['SCRIPT_NAME'] = $script_name; // drupal themes won't work with this on`
`551`	`521`	`$_SERVER['PATH_INFO'] = $path_info;`
`552`		`- //echo $_SERVER['SCRIPT_NAME'].'<br />';`
`553`	`522`
`554`	`523`	`$_SERVER['PHP_SELF'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];`
`555`	`524`
`@@ -604,9 +573,6 @@ function listen()`
`604`	`573`
`605`	`574`	`if (strlen(trim($falsy_ext))) {`
`606`	`575`
`607`		`- /**`
`608`		`- * Check for PHP`
`609`		`- */`
`610`	`576`	`if (($e = strstr($falsy_ext, '/', TRUE)) !== FALSE) {`
`611`	`577`	`$falsy_ext = $e;`
`612`	`578`	`}`
`@@ -623,7 +589,6 @@ function listen()`
`623`	`589`
`624`	`590`	`return $this->bootstrap();`
`625`	`591`
`626`		`-`
`627`	`592`	`}`
`628`	`593`
`629`	`594`	`/**`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 919e842

File tree

1 file changed

1 file changed

`‎src/router.class.php‎`

0 commit comments