@@ -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 | |
@@ -101,8 +101,7 @@ discard block |
||
| 101 | 101 | { |
| 102 | 102 | $this->setSelectedIndex($index); |
| 103 | 103 | return $this->_dataChanged=true; |
| 104 | - } |
|
| 105 | - else |
|
| 104 | + } else |
|
| 106 | 105 | return false; |
| 107 | 106 | } |
| 108 | 107 | if(!is_array($selections)) |
@@ -124,8 +123,7 @@ discard block |
||
| 124 | 123 | break; |
| 125 | 124 | } |
| 126 | 125 | } |
| 127 | - } |
|
| 128 | - else |
|
| 126 | + } else |
|
| 129 | 127 | $flag=true; |
| 130 | 128 | if($flag) |
| 131 | 129 | { |
@@ -133,13 +131,11 @@ discard block |
||
| 133 | 131 | $this->_dataChanged=true; |
| 134 | 132 | } |
| 135 | 133 | return $flag; |
| 136 | - } |
|
| 137 | - else if($this->getSelectedIndex()!==-1) |
|
| 134 | + } else if($this->getSelectedIndex()!==-1) |
|
| 138 | 135 | { |
| 139 | 136 | $this->clearSelection(); |
| 140 | 137 | return $this->_dataChanged=true; |
| 141 | - } |
|
| 142 | - else |
|
| 138 | + } else |
|
| 143 | 139 | return false; |
| 144 | 140 | } |
| 145 | 141 | |
@@ -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 | |
@@ -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 | |
@@ -163,8 +163,7 @@ discard block |
||
| 163 | 163 | if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance) |
| 164 | 164 | $this->copyFile($fullpath,$dst); |
| 165 | 165 | return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName; |
| 166 | - } |
|
| 167 | - else |
|
| 166 | + } else |
|
| 168 | 167 | { |
| 169 | 168 | $dir=$this->hash($fullpath); |
| 170 | 169 | if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance) |
@@ -287,8 +286,7 @@ discard block |
||
| 287 | 286 | @copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file); |
| 288 | 287 | @chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD); |
| 289 | 288 | } |
| 290 | - } |
|
| 291 | - else |
|
| 289 | + } else |
|
| 292 | 290 | $this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file); |
| 293 | 291 | } |
| 294 | 292 | closedir($folder); |
@@ -518,16 +518,14 @@ |
||
| 518 | 518 | { |
| 519 | 519 | $this->setIsValid(true); |
| 520 | 520 | $this->onValidationSuccess(); |
| 521 | - } |
|
| 522 | - else |
|
| 521 | + } else |
|
| 523 | 522 | { |
| 524 | 523 | if($target) |
| 525 | 524 | $target->setIsValid(false); |
| 526 | 525 | $this->setIsValid(false); |
| 527 | 526 | $this->onValidationError(); |
| 528 | 527 | } |
| 529 | - } |
|
| 530 | - else |
|
| 528 | + } else |
|
| 531 | 529 | { |
| 532 | 530 | $this->evaluateIsValid(); |
| 533 | 531 | $this->setIsValid(true); |
@@ -136,15 +136,13 @@ discard block |
||
| 136 | 136 | $activeView=$views->itemAt($index); |
| 137 | 137 | else |
| 138 | 138 | throw new TInvalidDataValueException('tabpanel_activeviewid_invalid',$id); |
| 139 | - } |
|
| 140 | - else if(($index=$this->getActiveViewIndex())>=0) |
|
| 139 | + } else if(($index=$this->getActiveViewIndex())>=0) |
|
| 141 | 140 | { |
| 142 | 141 | if($index<$views->getCount()) |
| 143 | 142 | $activeView=$views->itemAt($index); |
| 144 | 143 | else |
| 145 | 144 | throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index); |
| 146 | - } |
|
| 147 | - else |
|
| 145 | + } else |
|
| 148 | 146 | { |
| 149 | 147 | foreach($views as $index=>$view) |
| 150 | 148 | { |
@@ -320,8 +318,7 @@ discard block |
||
| 320 | 318 | $this->setActiveViewIndex($index); |
| 321 | 319 | $this->setActiveViewID($view->getID(false)); |
| 322 | 320 | $view->setActive(true); |
| 323 | - } |
|
| 324 | - else |
|
| 321 | + } else |
|
| 325 | 322 | $v->setActive(false); |
| 326 | 323 | } |
| 327 | 324 | } |
@@ -158,8 +158,7 @@ |
||
| 158 | 158 | $e->setAttribute('maxOccurs','unbounded'); |
| 159 | 159 | $sequence->appendChild($e); |
| 160 | 160 | $complexType->appendChild($sequence); |
| 161 | - } |
|
| 162 | - else |
|
| 161 | + } else |
|
| 163 | 162 | { |
| 164 | 163 | $all = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:all'); |
| 165 | 164 | foreach($elements as $elem) |
@@ -233,8 +233,7 @@ discard block |
||
| 233 | 233 | $newid=substr($id,$pos+1); |
| 234 | 234 | if ($control!==null) |
| 235 | 235 | $control=$control->$newid; |
| 236 | - } |
|
| 237 | - else |
|
| 236 | + } else |
|
| 238 | 237 | { |
| 239 | 238 | // TCheckBoxList overrides findControl() with a fake implementation |
| 240 | 239 | // but accepts a second parameter to use the standard one |
@@ -296,8 +295,7 @@ discard block |
||
| 296 | 295 | { |
| 297 | 296 | $group=$this->getValidationGroup(); |
| 298 | 297 | return $this->getPage()->getValidators($group)->getCount()>0; |
| 299 | - } |
|
| 300 | - else |
|
| 298 | + } else |
|
| 301 | 299 | return false; |
| 302 | 300 | } |
| 303 | 301 | |