@@ -145,8 +145,9 @@ |
||
| 145 | 145 | */ |
| 146 | 146 | public function setErrorMessage($value) |
| 147 | 147 | { |
| 148 | - if(parent::getErrorMessage() === $value) |
|
| 149 | - return; |
|
| 148 | + if(parent::getErrorMessage() === $value) { |
|
| 149 | + return; |
|
| 150 | + } |
|
| 150 | 151 | |
| 151 | 152 | |
| 152 | 153 | parent::setErrorMessage($value); |
@@ -44,11 +44,13 @@ |
||
| 44 | 44 | public function setInterval($value) |
| 45 | 45 | { |
| 46 | 46 | $interval = TPropertyValue::ensureFloat($value); |
| 47 | - if($interval <= 0) |
|
| 48 | - throw new TConfigurationException('callback_interval_be_positive', $this->getID()); |
|
| 47 | + if($interval <= 0) { |
|
| 48 | + throw new TConfigurationException('callback_interval_be_positive', $this->getID()); |
|
| 49 | + } |
|
| 49 | 50 | |
| 50 | - if($this->getInterval() === $value) |
|
| 51 | - return; |
|
| 51 | + if($this->getInterval() === $value) { |
|
| 52 | + return; |
|
| 53 | + } |
|
| 52 | 54 | |
| 53 | 55 | $this->setViewState('Interval', $interval, 1); |
| 54 | 56 | if ($this->getActiveControl()->canUpdateClientSide()){ |
@@ -72,16 +72,13 @@ |
||
| 72 | 72 | try |
| 73 | 73 | { |
| 74 | 74 | return xmlrpc_server_call_method($this->_xmlrpcServer, $requestPayload, null); |
| 75 | - } |
|
| 76 | - catch(TRpcException $e) |
|
| 75 | + } catch(TRpcException $e) |
|
| 77 | 76 | { |
| 78 | 77 | return $this->createErrorResponse($e); |
| 79 | - } |
|
| 80 | - catch(THttpException $e) |
|
| 78 | + } catch(THttpException $e) |
|
| 81 | 79 | { |
| 82 | 80 | throw $e; |
| 83 | - } |
|
| 84 | - catch(\Exception $e) |
|
| 81 | + } catch(\Exception $e) |
|
| 85 | 82 | { |
| 86 | 83 | return $this->createErrorResponse(new TRpcException('An internal error occured')); |
| 87 | 84 | } |
@@ -69,8 +69,7 @@ |
||
| 69 | 69 | try |
| 70 | 70 | { |
| 71 | 71 | return $this->handler->callMethod($this->getPayload()); |
| 72 | - } |
|
| 73 | - catch(TRpcException $e) |
|
| 72 | + } catch(TRpcException $e) |
|
| 74 | 73 | { |
| 75 | 74 | return $this->handler->createErrorResponse($e); |
| 76 | 75 | } |
@@ -60,8 +60,7 @@ |
||
| 60 | 60 | $content = $response->createHtmlWriter(); |
| 61 | 61 | $content->getWriter()->setBoundary(TActivePageAdapter::CALLBACK_ERROR_HEADER); |
| 62 | 62 | $content->write($trace); |
| 63 | - } |
|
| 64 | - else |
|
| 63 | + } else |
|
| 65 | 64 | { |
| 66 | 65 | error_log("Error happened while processing an existing error:\n" . $exception->__toString()); |
| 67 | 66 | header('HTTP/1.0 500 Internal Server Error', true, 500); |
@@ -30,8 +30,7 @@ |
||
| 30 | 30 | if($this->_old === null) |
| 31 | 31 | { |
| 32 | 32 | return ($this->_new !== null) ? $this->_new->toArray() : $this->_null; |
| 33 | - } |
|
| 34 | - else |
|
| 33 | + } else |
|
| 35 | 34 | { |
| 36 | 35 | $new = $this->_new->toArray(); |
| 37 | 36 | $old = $this->_old->toArray(); |
@@ -104,8 +104,7 @@ |
||
| 104 | 104 | $this->_query = isset($ret['query'])?$ret['query']:''; |
| 105 | 105 | $this->_fragment = isset($ret['fragment'])?$ret['fragment']:''; |
| 106 | 106 | $this->_uri = $uri; |
| 107 | - } |
|
| 108 | - else |
|
| 107 | + } else |
|
| 109 | 108 | { |
| 110 | 109 | throw new TInvalidDataValueException('uri_format_invalid', $uri); |
| 111 | 110 | } |
@@ -135,28 +135,24 @@ |
||
| 135 | 135 | { |
| 136 | 136 | $param->setData($data); |
| 137 | 137 | $this->_nextPageList = null; |
| 138 | - } |
|
| 139 | - else |
|
| 138 | + } else |
|
| 140 | 139 | { |
| 141 | 140 | $param->setData(array_slice($data, 0, $pageSize)); |
| 142 | 141 | $this->_nextPageList = array_slice($data, $pageSize - 1, $total); |
| 143 | 142 | } |
| 144 | - } |
|
| 145 | - else |
|
| 143 | + } else |
|
| 146 | 144 | { |
| 147 | 145 | if($total <= $pageSize) |
| 148 | 146 | { |
| 149 | 147 | $this->_prevPageList = array_slice($data, 0, $total); |
| 150 | 148 | $param->setData([]); |
| 151 | 149 | $this->_nextPageList = null; |
| 152 | - } |
|
| 153 | - elseif($total <= $pageSize * 2) |
|
| 150 | + } elseif($total <= $pageSize * 2) |
|
| 154 | 151 | { |
| 155 | 152 | $this->_prevPageList = array_slice($data, 0, $pageSize); |
| 156 | 153 | $param->setData(array_slice($data, $pageSize, $total)); |
| 157 | 154 | $this->_nextPageList = null; |
| 158 | - } |
|
| 159 | - else |
|
| 155 | + } else |
|
| 160 | 156 | { |
| 161 | 157 | $this->_prevPageList = array_slice($data, 0, $pageSize); |
| 162 | 158 | $param->setData(array_slice($data, $pageSize, $pageSize)); |
@@ -46,8 +46,9 @@ |
||
| 46 | 46 | array_shift($args); |
| 47 | 47 | $n = count($args); |
| 48 | 48 | $tokens = []; |
| 49 | - for($i = 0;$i < $n;++$i) |
|
| 50 | - $tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]); |
|
| 49 | + for($i = 0;$i < $n;++$i) { |
|
| 50 | + $tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]); |
|
| 51 | + } |
|
| 51 | 52 | parent::__construct(strtr($errorMessage, $tokens)); |
| 52 | 53 | } |
| 53 | 54 | |