Commit 22eee0e

committed

refactor: Changed request_scheme to use https var key

1 parent 0e8031e commit 22eee0eCopy full SHA for 22eee0e

File tree

1 file changed

+11

-3

lines changed

DbClass.php

1 file changed

+11

-3

lines changed

`‎DbClass.php`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,11 @@ private static function getCurrentPage($object = false)`
`404`	`404`	`}`
`405`	`405`	`}`
`406`	`406`	`} else {`
`407`		`- $url = $_SERVER['REQUEST_SCHEME'] . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];`
	`407`	`+ $request_scheme = "https";`
	`408`	`+ if (!isset($_SERVER['HTTPS']) \|\| $_SERVER['HTTPS'] != 'on') {`
	`409`	`+ $request_scheme = "http";`
	`410`	`+ }`
	`411`	`+ $url = $request_scheme . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];`
`408`	`412`	`if (preg_match("/\?{1,}/", $url)) {`
`409`	`413`	`$url = explode("?", $url)[0];`
`410`	`414`	`if (isset($_GET[$words['url']])) {`
`@@ -430,14 +434,18 @@ public static function page($echo = true, $class = "")`
`430`	`434`	`if (!isset(self::$pageObject->extra['words'])) {`
`431`	`435`	`self::setPaginationWords(self::$pageObject);`
`432`	`436`	`}`
	`437`	`+ $request_scheme = "https";`
	`438`	`+ if (!isset($_SERVER['HTTPS']) \|\| $_SERVER['HTTPS'] != 'on') {`
	`439`	`+ $request_scheme = "http";`
	`440`	`+ }`
`433`	`441`	`$words = self::$pageObject->extra['words'];`
`434`	`442`	`$totalPages = ceil($totalRows / $limit);`
`435`	`443`	`$pageNow = self::getCurrentPage(self::$pageObject);`
`436`	`444`	`if ($class) {`
`437`	`445`	`$words['class'] . "" . $class . "";`
`438`	`446`	`}`
`439`	`447`	`if (self::$friendlyURL !== false) {`
`440`		`- $url = $_SERVER['REQUEST_SCHEME'] . "://" . self::$friendlyURL->getSite();`
	`448`	`+ $url = $request_scheme . "://" . self::$friendlyURL->getSite();`
`441`	`449`	`$parts = self::$friendlyURL->getParts();`
`442`	`450`	`$keyPart = null;`
`443`	`451`	`foreach ($parts as $key => $part) {`
`@@ -447,7 +455,7 @@ public static function page($echo = true, $class = "")`
`447`	`455`	`}`
`448`	`456`	`}`
`449`	`457`	`} else {`
`450`		`- $url = $_SERVER['REQUEST_SCHEME'] . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];`
	`458`	`+ $url = $request_scheme . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];`
`451`	`459`	`if (preg_match("/\?{1,}/", $url)) {`
`452`	`460`	`$url = explode("?", $url)[0];`
`453`	`461`	`}`

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 22eee0e

File tree

1 file changed

1 file changed

`‎DbClass.php`

0 commit comments