← All changes | hc3/request.php +5 -30 4.9.85 → 4.9.24 View file →

		@@ -17,13 +17,11 @@
17	17	}
18	18
19	19	class HC3_Request implements HC3_Request_
20	20	{
21		- protected $url = null;
	21	+ protected $url = NULL;
22	22	protected $initParams = array();
23	23	protected $setParams = array();
24		- public $realSlug = '';
25		- public $post, $uri;
26	24
27	25	public function __construct(
28	26	HC3_Uri $uri,
29	27	HC3_Post $post,
		@@ -81,14 +79,8 @@
81	79	$this->setParams[ $k ] = $v;
82	80	return $this;
83	81	}
84	82
85		- public function setSlug( $slug )
86		- {
87		- $this->uri->setSlug( $slug );
88		- return $this;
89		- }
90		-
91	83	public function getSlug()
92	84	{
93	85	$hca = $this->post->get('hca');
94	86	if( $hca ){
		@@ -96,27 +88,11 @@
96	88	}
97	89	else {
98	90	$slug = $this->uri->getSlug();
99	91	}
100		-
101		- if( null === $slug ){
102		- $slug = '';
103		- }
104		-
105	92	return $slug;
106	93	}
107	94
108		- public function setRealSlug( $slug )
109		- {
110		- $this->realSlug = $slug;
111		- return $this;
112		- }
113		-
114		- public function getRealSlug()
115		- {
116		- return $this->realSlug;
117		- }
118		-
119	95	public function getParams( $withoutDefault = FALSE )
120	96	{
121	97	$return = $this->uri->getParams();
122	98
		@@ -129,15 +105,14 @@
129	105	}
130	106
131	107	public function isPrintView()
132	108	{
133		- $ret = false;
	109	+ $return = FALSE;
134	110	$params = $this->getParams();
135	111	if( array_key_exists('print', $params) && ($params['print']) ){
136		- $ret = true;
	112	+ $return = TRUE;
137	113	}
138		-
139		- return $ret;
	114	+ return $return;
140	115	}
141	116
142	117	public function getMethod()
143	118	{
		@@ -194,9 +169,9 @@
194	169
195	170	protected function _cleanInputKeys( $str )
196	171	{
197	172	if ( ! preg_match("/^[a-z0-9:_\/\-\~]+$/i", $str)){
198		- exit('Disallowed Key Characters on: ' . '"' . esc_html($str) . '"' . '<br>');
	173	+ exit('Disallowed Key Characters on: ' . '"' . $str . '"' . '<br>');
199	174	}
200	175	return $str;
201	176	}
202	177