@@ -429,7 +429,7 @@ |
||
| 429 | 429 | * |
| 430 | 430 | * @access public |
| 431 | 431 | * @param array an associative array of key/values |
| 432 | - * @return array |
|
| 432 | + * @return string |
|
| 433 | 433 | * |
| 434 | 434 | */ |
| 435 | 435 | function assoc_to_uri($array) { |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | * @access public |
| 11 | 11 | * |
| 12 | 12 | */ |
| 13 | - var $keyval=array (); |
|
| 13 | + var $keyval=array(); |
|
| 14 | 14 | /** |
| 15 | 15 | * Current uri string |
| 16 | 16 | * |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * @access public |
| 27 | 27 | * |
| 28 | 28 | */ |
| 29 | - var $segments=array (); |
|
| 29 | + var $segments=array(); |
|
| 30 | 30 | /** |
| 31 | 31 | * Re-indexed list of uri segments |
| 32 | 32 | * Starts at 1 instead of 0 |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | * @access public |
| 36 | 36 | * |
| 37 | 37 | */ |
| 38 | - var $rsegments=array (); |
|
| 38 | + var $rsegments=array(); |
|
| 39 | 39 | var $permitted_uri_chars="a-z 0-9~%.:_\-"; |
| 40 | 40 | var $enable_query_strings=false; |
| 41 | 41 | |
@@ -75,9 +75,9 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | function _fetch_uri_string() { |
| 77 | 77 | $uri=""; |
| 78 | - if ($this->uri_protocol == 'AUTO') { |
|
| 78 | + if ($this->uri_protocol=='AUTO') { |
|
| 79 | 79 | // Is the request coming from the command line? |
| 80 | - if (php_sapi_name() == 'cli' or defined('STDIN')) { |
|
| 80 | + if (php_sapi_name()=='cli' or defined('STDIN')) { |
|
| 81 | 81 | $this->_set_uri_string($this->_parse_cli_args()); |
| 82 | 82 | return; |
| 83 | 83 | } |
@@ -91,20 +91,20 @@ discard block |
||
| 91 | 91 | // Is there a PATH_INFO variable? |
| 92 | 92 | // Note: some servers seem to have trouble with getenv() so we'll test it two ways |
| 93 | 93 | $path=(isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO'); |
| 94 | - if (trim($path, '/') != '' && $path != "/" . SELF) { |
|
| 94 | + if (trim($path, '/')!='' && $path!="/".SELF) { |
|
| 95 | 95 | $this->_set_uri_string($path); |
| 96 | 96 | return; |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | // No PATH_INFO?... What about QUERY_STRING? |
| 100 | 100 | $path=(isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING'); |
| 101 | - if (trim($path, '/') != '') { |
|
| 101 | + if (trim($path, '/')!='') { |
|
| 102 | 102 | $this->_set_uri_string($path); |
| 103 | 103 | return; |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | // As a last ditch effort lets try using the $_GET array |
| 107 | - if (is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '') { |
|
| 107 | + if (is_array($_GET) && count($_GET)==1 && trim(key($_GET), '/')!='') { |
|
| 108 | 108 | $this->_set_uri_string(key($_GET)); |
| 109 | 109 | return; |
| 110 | 110 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | return; |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - if ($uri == 'REQUEST_URI') { |
|
| 117 | + if ($uri=='REQUEST_URI') { |
|
| 118 | 118 | $this->_set_uri_string($this->_detect_uri()); |
| 119 | 119 | return; |
| 120 | 120 | } |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | // $str = remove_invisible_characters($str, FALSE); |
| 139 | 139 | |
| 140 | 140 | // If the URI contains only a slash we'll kill it |
| 141 | - $this->uri_string=($str == '/') ? '' : $str; |
|
| 141 | + $this->uri_string=($str=='/') ? '' : $str; |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | // -------------------------------------------------------------------- |
@@ -159,15 +159,15 @@ discard block |
||
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | $uri=$_SERVER['REQUEST_URI']; |
| 162 | - if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0) { |
|
| 162 | + if (strpos($uri, $_SERVER['SCRIPT_NAME'])===0) { |
|
| 163 | 163 | $uri=substr($uri, strlen($_SERVER['SCRIPT_NAME'])); |
| 164 | - } elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0) { |
|
| 164 | + } elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME']))===0) { |
|
| 165 | 165 | $uri=substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME']))); |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | // This section ensures that even on servers that require the URI to be in the query string (Nginx) a correct |
| 169 | 169 | // URI is found, and also fixes the QUERY_STRING server var and $_GET array. |
| 170 | - if (strncmp($uri, '?/', 2) === 0) { |
|
| 170 | + if (strncmp($uri, '?/', 2)===0) { |
|
| 171 | 171 | $uri=substr($uri, 2); |
| 172 | 172 | } |
| 173 | 173 | $parts=preg_split('#\?#i', $uri, 2); |
@@ -175,19 +175,19 @@ discard block |
||
| 175 | 175 | if (isset($parts[1])) { |
| 176 | 176 | $_SERVER['QUERY_STRING']=$parts[1]; |
| 177 | 177 | parse_str($_SERVER['QUERY_STRING'], $_GET); |
| 178 | - } else { |
|
| 178 | + }else { |
|
| 179 | 179 | $_SERVER['QUERY_STRING']=''; |
| 180 | - $_GET=array (); |
|
| 180 | + $_GET=array(); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | - if ($uri == '/' || empty($uri)) { |
|
| 183 | + if ($uri=='/' || empty($uri)) { |
|
| 184 | 184 | return '/'; |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | $uri=parse_url($uri, PHP_URL_PATH); |
| 188 | 188 | |
| 189 | 189 | // Do some final cleaning of the URI and return it |
| 190 | - return str_replace(array ('//','../' ), '/', trim($uri, '/')); |
|
| 190 | + return str_replace(array('//', '../'), '/', trim($uri, '/')); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | // -------------------------------------------------------------------- |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | private function _parse_cli_args() { |
| 205 | 205 | $args=array_slice($_SERVER['argv'], 1); |
| 206 | 206 | |
| 207 | - return $args ? '/' . implode('/', $args) : ''; |
|
| 207 | + return $args ? '/'.implode('/', $args) : ''; |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | // -------------------------------------------------------------------- |
@@ -218,17 +218,17 @@ discard block |
||
| 218 | 218 | * |
| 219 | 219 | */ |
| 220 | 220 | function _filter_uri($str) { |
| 221 | - if ($str != '' && $this->permitted_uri_chars != '' && $this->enable_query_strings == FALSE) { |
|
| 221 | + if ($str!='' && $this->permitted_uri_chars!='' && $this->enable_query_strings==FALSE) { |
|
| 222 | 222 | // preg_quote() in PHP 5.3 escapes -, so the str_replace() and addition of - to preg_quote() is to maintain backwards |
| 223 | 223 | // compatibility as many are unaware of how characters in the permitted_uri_chars will be parsed as a regex pattern |
| 224 | - if (!preg_match("|^[" . str_replace(array ('\\-','\-' ), '-', preg_quote($this->permitted_uri_chars, '-')) . "]+$|i", $str)) { |
|
| 224 | + if (!preg_match("|^[".str_replace(array('\\-', '\-'), '-', preg_quote($this->permitted_uri_chars, '-'))."]+$|i", $str)) { |
|
| 225 | 225 | show_error('The URI you submitted has disallowed characters.', 400); |
| 226 | 226 | } |
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | // Convert programatic characters to entities |
| 230 | - $bad=array ('$','(',')','%28','%29' ); |
|
| 231 | - $good=array ('$','(',')','(',')' ); |
|
| 230 | + $bad=array('$', '(', ')', '%28', '%29'); |
|
| 231 | + $good=array('$', '(', ')', '(', ')'); |
|
| 232 | 232 | |
| 233 | 233 | return str_replace($bad, $good, $str); |
| 234 | 234 | } |
@@ -243,11 +243,11 @@ discard block |
||
| 243 | 243 | * |
| 244 | 244 | */ |
| 245 | 245 | function _explode_segments() { |
| 246 | - foreach ( explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val ) { |
|
| 246 | + foreach (explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) { |
|
| 247 | 247 | // Filter segments for security |
| 248 | 248 | $val=trim($this->_filter_uri($val)); |
| 249 | 249 | |
| 250 | - if ($val != '') { |
|
| 250 | + if ($val!='') { |
|
| 251 | 251 | $this->segments[]=$val; |
| 252 | 252 | } |
| 253 | 253 | } |
@@ -364,10 +364,10 @@ discard block |
||
| 364 | 364 | * |
| 365 | 365 | */ |
| 366 | 366 | function _uri_to_assoc($n=3, $default=array(), $which='segment') { |
| 367 | - if ($which == 'segment') { |
|
| 367 | + if ($which=='segment') { |
|
| 368 | 368 | $total_segments='total_segments'; |
| 369 | 369 | $segment_array='segment_array'; |
| 370 | - } else { |
|
| 370 | + }else { |
|
| 371 | 371 | $total_segments='total_rsegments'; |
| 372 | 372 | $segment_array='rsegment_array'; |
| 373 | 373 | } |
@@ -380,27 +380,27 @@ discard block |
||
| 380 | 380 | return $this->keyval[$n]; |
| 381 | 381 | } |
| 382 | 382 | |
| 383 | - if ($this->$total_segments() < $n) { |
|
| 384 | - if (count($default) == 0) { |
|
| 385 | - return array (); |
|
| 383 | + if ($this->$total_segments()<$n) { |
|
| 384 | + if (count($default)==0) { |
|
| 385 | + return array(); |
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | - $retval=array (); |
|
| 389 | - foreach ( $default as $val ) { |
|
| 388 | + $retval=array(); |
|
| 389 | + foreach ($default as $val) { |
|
| 390 | 390 | $retval[$val]=FALSE; |
| 391 | 391 | } |
| 392 | 392 | return $retval; |
| 393 | 393 | } |
| 394 | 394 | |
| 395 | - $segments=array_slice($this->$segment_array(), ($n - 1)); |
|
| 395 | + $segments=array_slice($this->$segment_array(), ($n-1)); |
|
| 396 | 396 | |
| 397 | 397 | $i=0; |
| 398 | 398 | $lastval=''; |
| 399 | - $retval=array (); |
|
| 400 | - foreach ( $segments as $seg ) { |
|
| 399 | + $retval=array(); |
|
| 400 | + foreach ($segments as $seg) { |
|
| 401 | 401 | if ($i % 2) { |
| 402 | 402 | $retval[$lastval]=$seg; |
| 403 | - } else { |
|
| 403 | + }else { |
|
| 404 | 404 | $retval[$seg]=FALSE; |
| 405 | 405 | $lastval=$seg; |
| 406 | 406 | } |
@@ -408,8 +408,8 @@ discard block |
||
| 408 | 408 | $i++; |
| 409 | 409 | } |
| 410 | 410 | |
| 411 | - if (count($default) > 0) { |
|
| 412 | - foreach ( $default as $val ) { |
|
| 411 | + if (count($default)>0) { |
|
| 412 | + foreach ($default as $val) { |
|
| 413 | 413 | if (!array_key_exists($val, $retval)) { |
| 414 | 414 | $retval[$val]=FALSE; |
| 415 | 415 | } |
@@ -433,8 +433,8 @@ discard block |
||
| 433 | 433 | * |
| 434 | 434 | */ |
| 435 | 435 | function assoc_to_uri($array) { |
| 436 | - $temp=array (); |
|
| 437 | - foreach ( ( array ) $array as $key => $val ) { |
|
| 436 | + $temp=array(); |
|
| 437 | + foreach ((array) $array as $key => $val) { |
|
| 438 | 438 | $temp[]=$key; |
| 439 | 439 | $temp[]=$val; |
| 440 | 440 | } |
@@ -488,13 +488,13 @@ discard block |
||
| 488 | 488 | $leading='/'; |
| 489 | 489 | $trailing='/'; |
| 490 | 490 | |
| 491 | - if ($where == 'trailing') { |
|
| 491 | + if ($where=='trailing') { |
|
| 492 | 492 | $leading=''; |
| 493 | - } elseif ($where == 'leading') { |
|
| 493 | + } elseif ($where=='leading') { |
|
| 494 | 494 | $trailing=''; |
| 495 | 495 | } |
| 496 | 496 | |
| 497 | - return $leading . $this->$which($n) . $trailing; |
|
| 497 | + return $leading.$this->$which($n).$trailing; |
|
| 498 | 498 | } |
| 499 | 499 | |
| 500 | 500 | // -------------------------------------------------------------------- |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | * |
| 573 | 573 | */ |
| 574 | 574 | function ruri_string() { |
| 575 | - return '/' . implode('/', $this->rsegment_array()); |
|
| 575 | + return '/'.implode('/', $this->rsegment_array()); |
|
| 576 | 576 | } |
| 577 | 577 | } |
| 578 | 578 | // END URI Class |
| 579 | 579 | \ No newline at end of file |
@@ -6,8 +6,9 @@ |
||
| 6 | 6 | |
| 7 | 7 | class JsUtils extends \Ajax\JsUtils{ |
| 8 | 8 | public function getUrl($url){ |
| 9 | - if($url==="") |
|
| 10 | - $url="/"; |
|
| 9 | + if($url==="") { |
|
| 10 | + $url="/"; |
|
| 11 | + } |
|
| 11 | 12 | return Url::toRoute($url); |
| 12 | 13 | } |
| 13 | 14 | |
@@ -4,14 +4,14 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | use yii\helpers\Url; |
| 6 | 6 | |
| 7 | -class JsUtils extends \Ajax\JsUtils{ |
|
| 8 | - public function getUrl($url){ |
|
| 9 | - if($url==="") |
|
| 7 | +class JsUtils extends \Ajax\JsUtils { |
|
| 8 | + public function getUrl($url) { |
|
| 9 | + if ($url==="") |
|
| 10 | 10 | $url="/"; |
| 11 | 11 | return Url::toRoute($url); |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - public function addViewElement($identifier,$content,&$view){ |
|
| 14 | + public function addViewElement($identifier, $content, &$view) { |
|
| 15 | 15 | $params=$view->params; |
| 16 | 16 | if (\array_key_exists("q", $params)==false) { |
| 17 | 17 | $view->params["q"]=array(); |
@@ -19,11 +19,11 @@ discard block |
||
| 19 | 19 | $view->params["q"][$identifier]=$content; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
| 22 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
| 23 | 23 | $view->params[$view_var]=$output; |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){ |
|
| 26 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) { |
|
| 27 | 27 | \ob_start(); |
| 28 | 28 | $ctrInfo=\yii::$app->createController($controllerName."/".$actionName); |
| 29 | 29 | $ctrInfo[0]->{$ctrInfo[1]}($params); |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | return $result; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
| 36 | - return \yii::$app->view->render($viewName,$params); |
|
| 35 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
| 36 | + return \yii::$app->view->render($viewName, $params); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - public function fromDispatcher($dispatcher){ |
|
| 39 | + public function fromDispatcher($dispatcher) { |
|
| 40 | 40 | $uri=new \Ajax\php\yii\URI(); |
| 41 | 41 | return $uri->segment_array(); |
| 42 | 42 | } |
@@ -14,6 +14,9 @@ discard block |
||
| 14 | 14 | protected $_params=array(); |
| 15 | 15 | protected $_paramParts=array(); |
| 16 | 16 | |
| 17 | + /** |
|
| 18 | + * @param string $identifier |
|
| 19 | + */ |
|
| 17 | 20 | public function __construct($identifier, $header="", $content="", $actions=array()) { |
| 18 | 21 | parent::__construct($identifier, "div","ui modal"); |
| 19 | 22 | if(isset($header)){ |
@@ -27,6 +30,9 @@ discard block |
||
| 27 | 30 | } |
| 28 | 31 | } |
| 29 | 32 | |
| 33 | + /** |
|
| 34 | + * @param string $value |
|
| 35 | + */ |
|
| 30 | 36 | public function setHeader($value) { |
| 31 | 37 | $this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value); |
| 32 | 38 | return $this; |
@@ -103,6 +109,9 @@ discard block |
||
| 103 | 109 | return $this->addElementInPart(new HtmlSemDoubleElement($part."-" . $this->identifier, "div", $uiClass, $content), $part); |
| 104 | 110 | } |
| 105 | 111 | |
| 112 | + /** |
|
| 113 | + * @param BaseHtml $element |
|
| 114 | + */ |
|
| 106 | 115 | private function addElementInPart($element,$part) { |
| 107 | 116 | $this->content[$part]->addContent($element); |
| 108 | 117 | return $element; |
@@ -141,7 +150,6 @@ discard block |
||
| 141 | 150 | /** |
| 142 | 151 | * render the content of $controller::$action and set the response to the modal content |
| 143 | 152 | * @param JsUtils $js |
| 144 | - * @param string $title The panel title |
|
| 145 | 153 | * @param Controller $initialControllerInstance |
| 146 | 154 | * @param string $controllerName the controller name |
| 147 | 155 | * @param string $actionName the action name |
@@ -43,8 +43,7 @@ discard block |
||
| 43 | 43 | foreach ($actions as $action){ |
| 44 | 44 | $this->addAction($action); |
| 45 | 45 | } |
| 46 | - } |
|
| 47 | - else{ |
|
| 46 | + } else{ |
|
| 48 | 47 | $this->addAction($actions); |
| 49 | 48 | } |
| 50 | 49 | return $this; |
@@ -60,8 +59,9 @@ discard block |
||
| 60 | 59 | $class="cancel"; |
| 61 | 60 | } |
| 62 | 61 | $action=new HtmlButton("action-".$this->identifier,$action); |
| 63 | - if($class!=="") |
|
| 64 | - $action->addToProperty("class", $class); |
|
| 62 | + if($class!=="") { |
|
| 63 | + $action->addToProperty("class", $class); |
|
| 64 | + } |
|
| 65 | 65 | } |
| 66 | 66 | return $this->addElementInPart($action, "actions"); |
| 67 | 67 | } |
@@ -165,8 +165,9 @@ discard block |
||
| 165 | 165 | * @see BaseHtml::run() |
| 166 | 166 | */ |
| 167 | 167 | public function run(JsUtils $js) { |
| 168 | - if(isset($this->_bsComponent)===false) |
|
| 169 | - $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
| 168 | + if(isset($this->_bsComponent)===false) { |
|
| 169 | + $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
| 170 | + } |
|
| 170 | 171 | $this->addEventsOnRun($js); |
| 171 | 172 | return $this->_bsComponent; |
| 172 | 173 | } |
@@ -15,120 +15,120 @@ discard block |
||
| 15 | 15 | protected $_paramParts=array(); |
| 16 | 16 | |
| 17 | 17 | public function __construct($identifier, $header="", $content="", $actions=array()) { |
| 18 | - parent::__construct($identifier, "div","ui modal"); |
|
| 19 | - if(isset($header)){ |
|
| 18 | + parent::__construct($identifier, "div", "ui modal"); |
|
| 19 | + if (isset($header)) { |
|
| 20 | 20 | $this->setHeader($header); |
| 21 | 21 | } |
| 22 | - if(isset($content)){ |
|
| 22 | + if (isset($content)) { |
|
| 23 | 23 | $this->setContent($content); |
| 24 | 24 | } |
| 25 | - if(isset($actions)){ |
|
| 25 | + if (isset($actions)) { |
|
| 26 | 26 | $this->setActions($actions); |
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | public function setHeader($value) { |
| 31 | - $this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value); |
|
| 31 | + $this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value); |
|
| 32 | 32 | return $this; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function setContent($value) { |
| 36 | - $this->content["content"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", $value); |
|
| 36 | + $this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", $value); |
|
| 37 | 37 | return $this; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public function setActions($actions) { |
| 41 | - $this->content["actions"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "actions"); |
|
| 42 | - if(\is_array($actions)){ |
|
| 43 | - foreach ($actions as $action){ |
|
| 41 | + $this->content["actions"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "actions"); |
|
| 42 | + if (\is_array($actions)) { |
|
| 43 | + foreach ($actions as $action) { |
|
| 44 | 44 | $this->addAction($action); |
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | - else{ |
|
| 47 | + else { |
|
| 48 | 48 | $this->addAction($actions); |
| 49 | 49 | } |
| 50 | 50 | return $this; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - public function addAction($action){ |
|
| 54 | - if(!$action instanceof BaseHtml){ |
|
| 53 | + public function addAction($action) { |
|
| 54 | + if (!$action instanceof BaseHtml) { |
|
| 55 | 55 | $class=""; |
| 56 | - if(\array_search($action, ["Okay","Yes"])!==false){ |
|
| 56 | + if (\array_search($action, ["Okay", "Yes"])!==false) { |
|
| 57 | 57 | $class="approve"; |
| 58 | 58 | } |
| 59 | - if(\array_search($action, ["Cancel","No"])!==false){ |
|
| 59 | + if (\array_search($action, ["Cancel", "No"])!==false) { |
|
| 60 | 60 | $class="cancel"; |
| 61 | 61 | } |
| 62 | - $action=new HtmlButton("action-".$this->identifier,$action); |
|
| 63 | - if($class!=="") |
|
| 62 | + $action=new HtmlButton("action-".$this->identifier, $action); |
|
| 63 | + if ($class!=="") |
|
| 64 | 64 | $action->addToProperty("class", $class); |
| 65 | 65 | } |
| 66 | 66 | return $this->addElementInPart($action, "actions"); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - public function addContent($content,$before=false){ |
|
| 70 | - $this->content["content"]->addContent($content,$before); |
|
| 69 | + public function addContent($content, $before=false) { |
|
| 70 | + $this->content["content"]->addContent($content, $before); |
|
| 71 | 71 | return $this; |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - public function addImageContent($image,$description=NULL){ |
|
| 74 | + public function addImageContent($image, $description=NULL) { |
|
| 75 | 75 | $content=$this->content["content"]; |
| 76 | - if(isset($description)){ |
|
| 77 | - $description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description); |
|
| 78 | - $content->addContent($description,true); |
|
| 76 | + if (isset($description)) { |
|
| 77 | + $description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description); |
|
| 78 | + $content->addContent($description, true); |
|
| 79 | 79 | } |
| 80 | - if($image!==""){ |
|
| 81 | - $img=new HtmlImage("image-".$this->identifier,$image,"","medium"); |
|
| 82 | - $content->addContent($img,true); |
|
| 83 | - $content->addToProperty("class","image"); |
|
| 80 | + if ($image!=="") { |
|
| 81 | + $img=new HtmlImage("image-".$this->identifier, $image, "", "medium"); |
|
| 82 | + $content->addContent($img, true); |
|
| 83 | + $content->addToProperty("class", "image"); |
|
| 84 | 84 | } |
| 85 | 85 | return $this; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - public function addIconContent($icon,$description=NULL){ |
|
| 88 | + public function addIconContent($icon, $description=NULL) { |
|
| 89 | 89 | $content=$this->content["content"]; |
| 90 | - if(isset($description)){ |
|
| 91 | - $description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description); |
|
| 92 | - $content->addContent($description,true); |
|
| 90 | + if (isset($description)) { |
|
| 91 | + $description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description); |
|
| 92 | + $content->addContent($description, true); |
|
| 93 | 93 | } |
| 94 | - if($icon!==""){ |
|
| 95 | - $img=new HtmlIcon("image-".$this->identifier,$icon); |
|
| 96 | - $content->addContent($img,true); |
|
| 97 | - $content->addToProperty("class","image"); |
|
| 94 | + if ($icon!=="") { |
|
| 95 | + $img=new HtmlIcon("image-".$this->identifier, $icon); |
|
| 96 | + $content->addContent($img, true); |
|
| 97 | + $content->addToProperty("class", "image"); |
|
| 98 | 98 | } |
| 99 | 99 | return $this; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - private function addContentInPart($content,$uiClass,$part) { |
|
| 103 | - return $this->addElementInPart(new HtmlSemDoubleElement($part."-" . $this->identifier, "div", $uiClass, $content), $part); |
|
| 102 | + private function addContentInPart($content, $uiClass, $part) { |
|
| 103 | + return $this->addElementInPart(new HtmlSemDoubleElement($part."-".$this->identifier, "div", $uiClass, $content), $part); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - private function addElementInPart($element,$part) { |
|
| 106 | + private function addElementInPart($element, $part) { |
|
| 107 | 107 | $this->content[$part]->addContent($element); |
| 108 | 108 | return $element; |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - public function showDimmer($value){ |
|
| 112 | - $value=$value?"show":"hide"; |
|
| 111 | + public function showDimmer($value) { |
|
| 112 | + $value=$value ? "show" : "hide"; |
|
| 113 | 113 | $this->_paramParts[]=["'".$value." dimmer'"]; |
| 114 | 114 | return $this; |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - public function setInverted(){ |
|
| 117 | + public function setInverted() { |
|
| 118 | 118 | $this->_params["inverted"]=true; |
| 119 | 119 | return $this; |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - public function setBasic(){ |
|
| 122 | + public function setBasic() { |
|
| 123 | 123 | return $this->addToProperty("class", "basic"); |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - public function setActive(){ |
|
| 126 | + public function setActive() { |
|
| 127 | 127 | return $this->addToProperty("class", "active"); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - public function setTransition($value){ |
|
| 131 | - $this->_paramParts[]=["'setting'","'transition'","'".$value."'"]; |
|
| 130 | + public function setTransition($value) { |
|
| 131 | + $this->_paramParts[]=["'setting'", "'transition'", "'".$value."'"]; |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | /** |
@@ -138,8 +138,8 @@ discard block |
||
| 138 | 138 | * @param string $viewName |
| 139 | 139 | * @param $params The parameters to pass to the view |
| 140 | 140 | */ |
| 141 | - public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) { |
|
| 142 | - return $this->setContent($js->renderContent($initialController, $viewName,$params)); |
|
| 141 | + public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) { |
|
| 142 | + return $this->setContent($js->renderContent($initialController, $viewName, $params)); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | /** |
@@ -150,8 +150,8 @@ discard block |
||
| 150 | 150 | * @param string $controllerName the controller name |
| 151 | 151 | * @param string $actionName the action name |
| 152 | 152 | */ |
| 153 | - public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){ |
|
| 154 | - return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName,$params)); |
|
| 153 | + public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) { |
|
| 154 | + return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName, $params)); |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | /** |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
| 162 | 162 | */ |
| 163 | 163 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 164 | - $this->content=JArray::sortAssociative($this->content, ["header","content","actions" ]); |
|
| 164 | + $this->content=JArray::sortAssociative($this->content, ["header", "content", "actions"]); |
|
| 165 | 165 | return parent::compile($js, $view); |
| 166 | 166 | } |
| 167 | 167 | /* |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | * @see BaseHtml::run() |
| 170 | 170 | */ |
| 171 | 171 | public function run(JsUtils $js) { |
| 172 | - if(isset($this->_bsComponent)===false) |
|
| 173 | - $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
| 172 | + if (isset($this->_bsComponent)===false) |
|
| 173 | + $this->_bsComponent=$js->semantic()->modal("#".$this->identifier, $this->_params, $this->_paramParts); |
|
| 174 | 174 | $this->addEventsOnRun($js); |
| 175 | 175 | return $this->_bsComponent; |
| 176 | 176 | } |
@@ -59,6 +59,9 @@ discard block |
||
| 59 | 59 | return $this->addComponent(new Accordion($this->js), $attachTo, $params); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | + /** |
|
| 63 | + * @param string $attachTo |
|
| 64 | + */ |
|
| 62 | 65 | public function sticky($attachTo=NULL, $params=NULL) { |
| 63 | 66 | return $this->addComponent(new Sticky($this->js), $attachTo, $params); |
| 64 | 67 | } |
@@ -67,22 +70,37 @@ discard block |
||
| 67 | 70 | return $this->addComponent(new Checkbox($this->js), $attachTo, $params); |
| 68 | 71 | } |
| 69 | 72 | |
| 73 | + /** |
|
| 74 | + * @param string $attachTo |
|
| 75 | + */ |
|
| 70 | 76 | public function rating($attachTo=NULL, $params=NULL) { |
| 71 | 77 | return $this->addComponent(new Rating($this->js), $attachTo, $params); |
| 72 | 78 | } |
| 73 | 79 | |
| 80 | + /** |
|
| 81 | + * @param string $attachTo |
|
| 82 | + */ |
|
| 74 | 83 | public function progress($attachTo=NULL, $params=NULL) { |
| 75 | 84 | return $this->addComponent(new Progress($this->js), $attachTo, $params); |
| 76 | 85 | } |
| 77 | 86 | |
| 87 | + /** |
|
| 88 | + * @param string $attachTo |
|
| 89 | + */ |
|
| 78 | 90 | public function search($attachTo=NULL, $params=NULL) { |
| 79 | 91 | return $this->addComponent(new Search($this->js), $attachTo, $params); |
| 80 | 92 | } |
| 81 | 93 | |
| 94 | + /** |
|
| 95 | + * @param string $attachTo |
|
| 96 | + */ |
|
| 82 | 97 | public function dimmer($attachTo=NULL, $params=NULL) { |
| 83 | 98 | return $this->addComponent(new Dimmer($this->js), $attachTo, $params); |
| 84 | 99 | } |
| 85 | 100 | |
| 101 | + /** |
|
| 102 | + * @param string $attachTo |
|
| 103 | + */ |
|
| 86 | 104 | public function modal($attachTo=NULL, $params=NULL,$paramsParts=NULL) { |
| 87 | 105 | $result= $this->addComponent(new Modal($this->js), $attachTo, $params); |
| 88 | 106 | $result->setParamParts($paramsParts); |
@@ -83,8 +83,8 @@ |
||
| 83 | 83 | return $this->addComponent(new Dimmer($this->js), $attachTo, $params); |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - public function modal($attachTo=NULL, $params=NULL,$paramsParts=NULL) { |
|
| 87 | - $result= $this->addComponent(new Modal($this->js), $attachTo, $params); |
|
| 86 | + public function modal($attachTo=NULL, $params=NULL, $paramsParts=NULL) { |
|
| 87 | + $result=$this->addComponent(new Modal($this->js), $attachTo, $params); |
|
| 88 | 88 | $result->setParamParts($paramsParts); |
| 89 | 89 | return $result; |
| 90 | 90 | } |
@@ -12,9 +12,9 @@ discard block |
||
| 12 | 12 | $this->paramParts=array(); |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | - protected function generateParamParts(){ |
|
| 15 | + protected function generateParamParts() { |
|
| 16 | 16 | $results=[]; |
| 17 | - foreach ($this->paramParts as $paramPart){ |
|
| 17 | + foreach ($this->paramParts as $paramPart) { |
|
| 18 | 18 | $results[]="{$this->uiName}(".\implode(",", $paramPart).")"; |
| 19 | 19 | } |
| 20 | 20 | return \implode(".", $results); |
@@ -22,9 +22,9 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | public function getScript() { |
| 24 | 24 | $allParams=$this->params; |
| 25 | - $this->jquery_code_for_compile=array (); |
|
| 25 | + $this->jquery_code_for_compile=array(); |
|
| 26 | 26 | $paramParts=""; |
| 27 | - if(\sizeof($this->paramParts)>0){ |
|
| 27 | + if (\sizeof($this->paramParts)>0) { |
|
| 28 | 28 | $paramParts=".".$this->generateParamParts(); |
| 29 | 29 | } |
| 30 | 30 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).")".$paramParts.";"; |
@@ -16,11 +16,11 @@ |
||
| 16 | 16 | return $this; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function showDimmer(){ |
|
| 19 | + public function showDimmer() { |
|
| 20 | 20 | return $this->setBehavior("hide dimmer"); |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - public function setInverted(){ |
|
| 23 | + public function setInverted() { |
|
| 24 | 24 | $this->params["inverted"]=true; |
| 25 | 25 | } |
| 26 | 26 | |
@@ -4,24 +4,24 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Support\Facades\App; |
| 6 | 6 | |
| 7 | -class JsUtils extends \Ajax\JsUtils{ |
|
| 8 | - public function getUrl($url){ |
|
| 7 | +class JsUtils extends \Ajax\JsUtils { |
|
| 8 | + public function getUrl($url) { |
|
| 9 | 9 | return \url($url); |
| 10 | 10 | } |
| 11 | - public function addViewElement($identifier,$content,&$view){ |
|
| 11 | + public function addViewElement($identifier, $content, &$view) { |
|
| 12 | 12 | $controls=$view->__get("q"); |
| 13 | - if (isset($controls) === false) { |
|
| 14 | - $controls=array (); |
|
| 13 | + if (isset($controls)===false) { |
|
| 14 | + $controls=array(); |
|
| 15 | 15 | } |
| 16 | 16 | $controls[$identifier]=$content; |
| 17 | 17 | $view->__set("q", $controls); |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
| 21 | - $view->__set($view_var,$output); |
|
| 20 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
| 21 | + $view->__set($view_var, $output); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){ |
|
| 24 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) { |
|
| 25 | 25 | \ob_start(); |
| 26 | 26 | App::make($controllerName)->{$actionName}($params); |
| 27 | 27 | $result=\ob_get_contents(); |
@@ -29,11 +29,11 @@ discard block |
||
| 29 | 29 | return $result; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
| 33 | - return \view()->make($viewName,$params)->render(); |
|
| 32 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
| 33 | + return \view()->make($viewName, $params)->render(); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function fromDispatcher($dispatcher){ |
|
| 36 | + public function fromDispatcher($dispatcher) { |
|
| 37 | 37 | return $dispatcher->segments(); |
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | \ No newline at end of file |
@@ -48,15 +48,15 @@ |
||
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
| 51 | - if ($initialControllerInstance->has('templating')) { |
|
| 52 | - return $initialControllerInstance->get('templating')->render($viewName, $params); |
|
| 53 | - } |
|
| 51 | + if ($initialControllerInstance->has('templating')) { |
|
| 52 | + return $initialControllerInstance->get('templating')->render($viewName, $params); |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - if (!$initialControllerInstance->has('twig')) { |
|
| 56 | - throw new \LogicException('You can not use the "renderView" method if the Templating Component or the Twig Bundle are not available.'); |
|
| 57 | - } |
|
| 55 | + if (!$initialControllerInstance->has('twig')) { |
|
| 56 | + throw new \LogicException('You can not use the "renderView" method if the Templating Component or the Twig Bundle are not available.'); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - return $initialControllerInstance->get('twig')->render($viewName, $params); |
|
| 59 | + return $initialControllerInstance->get('twig')->render($viewName, $params); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | public function fromDispatcher($dispatcher){ |
@@ -6,27 +6,27 @@ discard block |
||
| 6 | 6 | use Symfony\Component\HttpFoundation\Request; |
| 7 | 7 | use Symfony\Component\HttpKernel\HttpKernelInterface; |
| 8 | 8 | use Ajax\service\JString; |
| 9 | -class JsUtils extends \Ajax\JsUtils{ |
|
| 10 | - public function getUrl($url){ |
|
| 9 | +class JsUtils extends \Ajax\JsUtils { |
|
| 10 | + public function getUrl($url) { |
|
| 11 | 11 | //$request = Request::createFromGlobals(); |
| 12 | 12 | $router=$this->getInjected(); |
| 13 | - if(isset($router)===true){ |
|
| 13 | + if (isset($router)===true) { |
|
| 14 | 14 | try { |
| 15 | 15 | $url=$router->generate($url); |
| 16 | - }catch (\Exception $e){ |
|
| 16 | + } catch (\Exception $e) { |
|
| 17 | 17 | return $router->getContext()->getBaseUrl(); |
| 18 | 18 | } |
| 19 | 19 | } |
| 20 | 20 | return $url; |
| 21 | 21 | } |
| 22 | - public function addViewElement($identifier,$content,&$view){ |
|
| 23 | - if(\array_key_exists("q", $view)===false){ |
|
| 22 | + public function addViewElement($identifier, $content, &$view) { |
|
| 23 | + if (\array_key_exists("q", $view)===false) { |
|
| 24 | 24 | $view["q"]=array(); |
| 25 | 25 | } |
| 26 | 26 | $view["q"][$identifier]=$content; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
| 29 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
| 30 | 30 | $view[$view_var]=$output; |
| 31 | 31 | } |
| 32 | 32 | |
@@ -37,17 +37,17 @@ discard block |
||
| 37 | 37 | * @param array $params |
| 38 | 38 | * @see \Ajax\JsUtils::forward() |
| 39 | 39 | */ |
| 40 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){ |
|
| 40 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) { |
|
| 41 | 41 | $path=$params; |
| 42 | - $request = $initialControllerInstance->get('request_stack')->getCurrentRequest(); |
|
| 43 | - $path['_forwarded'] = $request->attributes; |
|
| 44 | - $path['_controller'] = $controllerName.":".$actionName; |
|
| 45 | - $subRequest = $request->duplicate([], null, $path); |
|
| 46 | - $response= $initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST); |
|
| 42 | + $request=$initialControllerInstance->get('request_stack')->getCurrentRequest(); |
|
| 43 | + $path['_forwarded']=$request->attributes; |
|
| 44 | + $path['_controller']=$controllerName.":".$actionName; |
|
| 45 | + $subRequest=$request->duplicate([], null, $path); |
|
| 46 | + $response=$initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST); |
|
| 47 | 47 | return $response->getContent(); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
| 50 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
| 51 | 51 | if ($initialControllerInstance->has('templating')) { |
| 52 | 52 | return $initialControllerInstance->get('templating')->render($viewName, $params); |
| 53 | 53 | } |
@@ -59,10 +59,10 @@ discard block |
||
| 59 | 59 | return $initialControllerInstance->get('twig')->render($viewName, $params); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - public function fromDispatcher($dispatcher){ |
|
| 63 | - $request = $dispatcher->get('request_stack')->getCurrentRequest(); |
|
| 62 | + public function fromDispatcher($dispatcher) { |
|
| 63 | + $request=$dispatcher->get('request_stack')->getCurrentRequest(); |
|
| 64 | 64 | $uri=$request->getPathInfo(); |
| 65 | - if(JString::startswith($uri, "/")){ |
|
| 65 | + if (JString::startswith($uri, "/")) { |
|
| 66 | 66 | $uri=\substr($uri, 1); |
| 67 | 67 | } |
| 68 | 68 | return \explode("/", $uri); |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | if(isset($router)===true){ |
| 14 | 14 | try { |
| 15 | 15 | $url=$router->generate($url); |
| 16 | - }catch (\Exception $e){ |
|
| 16 | + } catch (\Exception $e){ |
|
| 17 | 17 | return $router->getContext()->getBaseUrl(); |
| 18 | 18 | } |
| 19 | 19 | } |
@@ -7,19 +7,19 @@ |
||
| 7 | 7 | |
| 8 | 8 | use Ajax\semantic\html\elements\HtmlIcon; |
| 9 | 9 | |
| 10 | -class HtmlPaginationMenu extends HtmlMenu{ |
|
| 10 | +class HtmlPaginationMenu extends HtmlMenu { |
|
| 11 | 11 | |
| 12 | - public function __construct( $identifier, $items=array() ){ |
|
| 13 | - parent::__construct( $identifier,$items); |
|
| 12 | + public function __construct($identifier, $items=array()) { |
|
| 13 | + parent::__construct($identifier, $items); |
|
| 14 | 14 | } |
| 15 | 15 | /** |
| 16 | 16 | * {@inheritDoc} |
| 17 | 17 | * @see \Ajax\common\html\BaseHtml::compile() |
| 18 | 18 | */ |
| 19 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
| 19 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
| 20 | 20 | $this->insertItem(new HtmlIcon("", "left chevron")); |
| 21 | 21 | $this->addItem(new HtmlIcon("", "right chevron")); |
| 22 | 22 | $this->asPagination(); |
| 23 | - return parent::compile($js,$view); |
|
| 23 | + return parent::compile($js, $view); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | \ No newline at end of file |