@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if ($this->sourcepath === NULL) |
| 59 | 59 | { |
| 60 | 60 | $this->sourcepath = $sourcepath; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->sourcepath->append($sourcepath); |
| 65 | 64 | } |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if ($this->sourcepath === NULL) |
| 59 | 59 | { |
| 60 | 60 | $this->sourcepath = $sourcepath; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->sourcepath->append($sourcepath); |
| 65 | 64 | } |
@@ -427,8 +427,7 @@ discard block |
||
| 427 | 427 | } |
| 428 | 428 | $control->setData($text); |
| 429 | 429 | } |
| 430 | - } |
|
| 431 | - else if($this->getAllowSorting()) |
|
| 430 | + } else if($this->getAllowSorting()) |
|
| 432 | 431 | { |
| 433 | 432 | $sortExpression=$this->getSortExpression(); |
| 434 | 433 | if(($url=$this->getHeaderImageUrl())!=='') |
@@ -441,8 +440,7 @@ discard block |
||
| 441 | 440 | $button->setAlternateText($text); |
| 442 | 441 | $button->setCausesValidation(false); |
| 443 | 442 | $cell->getControls()->add($button); |
| 444 | - } |
|
| 445 | - else if($text!=='') |
|
| 443 | + } else if($text!=='') |
|
| 446 | 444 | { |
| 447 | 445 | $button=Prado::createComponent('System.Web.UI.WebControls.TLinkButton'); |
| 448 | 446 | $button->setText($text); |
@@ -450,11 +448,9 @@ discard block |
||
| 450 | 448 | $button->setCommandParameter($sortExpression); |
| 451 | 449 | $button->setCausesValidation(false); |
| 452 | 450 | $cell->getControls()->add($button); |
| 453 | - } |
|
| 454 | - else |
|
| 451 | + } else |
|
| 455 | 452 | $cell->setText(' '); |
| 456 | - } |
|
| 457 | - else |
|
| 453 | + } else |
|
| 458 | 454 | { |
| 459 | 455 | if(($url=$this->getHeaderImageUrl())!=='') |
| 460 | 456 | { |
@@ -463,8 +459,7 @@ discard block |
||
| 463 | 459 | if($text!=='') |
| 464 | 460 | $image->setAlternateText($text); |
| 465 | 461 | $cell->getControls()->add($image); |
| 466 | - } |
|
| 467 | - else if($text!=='') |
|
| 462 | + } else if($text!=='') |
|
| 468 | 463 | $cell->setText($text); |
| 469 | 464 | else |
| 470 | 465 | $cell->setText(' '); |
@@ -498,8 +493,7 @@ discard block |
||
| 498 | 493 | } |
| 499 | 494 | $control->setData($text); |
| 500 | 495 | } |
| 501 | - } |
|
| 502 | - else if($text!=='') |
|
| 496 | + } else if($text!=='') |
|
| 503 | 497 | $cell->setText($text); |
| 504 | 498 | else |
| 505 | 499 | $cell->setText(' '); |
@@ -529,13 +523,11 @@ discard block |
||
| 529 | 523 | if(eval("\$result=$expression;")===false) |
| 530 | 524 | throw new Exception(''); |
| 531 | 525 | return $result; |
| 532 | - } |
|
| 533 | - catch(Exception $e) |
|
| 526 | + } catch(Exception $e) |
|
| 534 | 527 | { |
| 535 | 528 | throw new TInvalidDataValueException('datagridcolumn_expression_invalid',get_class($this),$expression,$e->getMessage()); |
| 536 | 529 | } |
| 537 | - } |
|
| 538 | - else |
|
| 530 | + } else |
|
| 539 | 531 | return sprintf($formatString,$value); |
| 540 | 532 | } |
| 541 | 533 | } |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if ($this->sourcepath === NULL) |
| 59 | 59 | { |
| 60 | 60 | $this->sourcepath = $sourcepath; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->sourcepath->append($sourcepath); |
| 65 | 64 | } |
@@ -70,8 +70,7 @@ |
||
| 70 | 70 | { |
| 71 | 71 | $domain=substr($value,$pos+1); |
| 72 | 72 | return $domain===''?false:checkdnsrr($domain,'MX'); |
| 73 | - } |
|
| 74 | - else |
|
| 73 | + } else |
|
| 75 | 74 | return false; |
| 76 | 75 | } |
| 77 | 76 | } |
@@ -106,8 +106,7 @@ discard block |
||
| 106 | 106 | { |
| 107 | 107 | if($this->getEnableClientScript() && $this->needPostBackScript()) |
| 108 | 108 | $this->renderClientControlScript($writer); |
| 109 | - } |
|
| 110 | - else if($this->getEnabled()) // in this case, parent will not render 'disabled' |
|
| 109 | + } else if($this->getEnabled()) // in this case, parent will not render 'disabled' |
|
| 111 | 110 | $writer->addAttribute('disabled','disabled'); |
| 112 | 111 | parent::addAttributesToRender($writer); |
| 113 | 112 | } |
@@ -141,8 +140,7 @@ discard block |
||
| 141 | 140 | { |
| 142 | 141 | $group=$this->getValidationGroup(); |
| 143 | 142 | return $this->getPage()->getValidators($group)->getCount()>0; |
| 144 | - } |
|
| 145 | - else |
|
| 143 | + } else |
|
| 146 | 144 | return false; |
| 147 | 145 | } |
| 148 | 146 | |
@@ -189,8 +189,7 @@ discard block |
||
| 189 | 189 | return file_put_contents($fileName,file_get_contents($this->_localName))!==false; |
| 190 | 190 | else |
| 191 | 191 | return false; |
| 192 | - } |
|
| 193 | - else |
|
| 192 | + } else |
|
| 194 | 193 | return false; |
| 195 | 194 | } |
| 196 | 195 | |
@@ -211,8 +210,7 @@ discard block |
||
| 211 | 210 | $this->_errorCode=$_FILES[$key]['error']; |
| 212 | 211 | $this->_localName=$_FILES[$key]['tmp_name']; |
| 213 | 212 | return $this->_dataChanged=true; |
| 214 | - } |
|
| 215 | - else |
|
| 213 | + } else |
|
| 216 | 214 | return false; |
| 217 | 215 | } |
| 218 | 216 | |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if ($this->sourcepath === NULL) |
| 59 | 59 | { |
| 60 | 60 | $this->sourcepath = $sourcepath; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->sourcepath->append($sourcepath); |
| 65 | 64 | } |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if ($this->sourcepath === NULL) |
| 59 | 59 | { |
| 60 | 60 | $this->sourcepath = $sourcepath; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->sourcepath->append($sourcepath); |
| 65 | 64 | } |