@@ -69,11 +69,9 @@ |
||
| 69 | 69 | $this->_forControl=$control->getClientID(); |
| 70 | 70 | parent::render($writer); |
| 71 | 71 | } |
| 72 | - } |
|
| 73 | - else |
|
| 72 | + } else |
|
| 74 | 73 | throw new TInvalidDataValueException('label_associatedcontrol_invalid',$aid); |
| 75 | - } |
|
| 76 | - else |
|
| 74 | + } else |
|
| 77 | 75 | parent::render($writer); |
| 78 | 76 | } |
| 79 | 77 | |
@@ -270,8 +270,7 @@ discard block |
||
| 270 | 270 | $cell->getControls()->add($listControl); |
| 271 | 271 | $cell->registerObject('DropDownList',$listControl); |
| 272 | 272 | $control=$listControl; |
| 273 | - } |
|
| 274 | - else |
|
| 273 | + } else |
|
| 275 | 274 | $control=$cell; |
| 276 | 275 | $control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn')); |
| 277 | 276 | break; |
@@ -307,8 +306,7 @@ discard block |
||
| 307 | 306 | $value=$text; |
| 308 | 307 | $formatString=$this->getDataTextFormatString(); |
| 309 | 308 | $text=$this->formatDataValue($formatString,$text); |
| 310 | - } |
|
| 311 | - else |
|
| 309 | + } else |
|
| 312 | 310 | $text=$value; |
| 313 | 311 | if($sender instanceof TTableCell) |
| 314 | 312 | $sender->setText($text); |
@@ -323,8 +323,7 @@ discard block |
||
| 323 | 323 | $writer->addAttributes($attributes); |
| 324 | 324 | if($value!==null) |
| 325 | 325 | $attributes->add('value',$value); |
| 326 | - } |
|
| 327 | - else |
|
| 326 | + } else |
|
| 328 | 327 | $onclick=''; |
| 329 | 328 | if($needspan=$this->getSpanNeeded()) |
| 330 | 329 | { |
@@ -338,14 +337,12 @@ discard block |
||
| 338 | 337 | { |
| 339 | 338 | $this->renderLabel($writer,$clientID,$text); |
| 340 | 339 | $this->renderInputTag($writer,$clientID,$onclick); |
| 341 | - } |
|
| 342 | - else |
|
| 340 | + } else |
|
| 343 | 341 | { |
| 344 | 342 | $this->renderInputTag($writer,$clientID,$onclick); |
| 345 | 343 | $this->renderLabel($writer,$clientID,$text); |
| 346 | 344 | } |
| 347 | - } |
|
| 348 | - else |
|
| 345 | + } else |
|
| 349 | 346 | $this->renderInputTag($writer,$clientID,$onclick); |
| 350 | 347 | if($needspan) |
| 351 | 348 | $writer->renderEndTag(); |
@@ -98,8 +98,7 @@ |
||
| 98 | 98 | { |
| 99 | 99 | $this->renderLinkButtonHref($writer); |
| 100 | 100 | $this->renderClientControlScript($writer); |
| 101 | - } |
|
| 102 | - else if($this->getEnabled()) // in this case, parent will not render 'disabled' |
|
| 101 | + } else if($this->getEnabled()) // in this case, parent will not render 'disabled' |
|
| 103 | 102 | $writer->addAttribute('disabled','disabled'); |
| 104 | 103 | } |
| 105 | 104 | |
@@ -84,8 +84,7 @@ discard block |
||
| 84 | 84 | { |
| 85 | 85 | $this->raiseBubbleEvent($this,new TDataListCommandEventParameter($this,$sender,$param)); |
| 86 | 86 | return true; |
| 87 | - } |
|
| 88 | - else |
|
| 87 | + } else |
|
| 89 | 88 | return false; |
| 90 | 89 | } |
| 91 | 90 | |
@@ -130,8 +129,7 @@ discard block |
||
| 130 | 129 | $this->renderBeginTag($writer); |
| 131 | 130 | $this->renderContents($writer); |
| 132 | 131 | $this->renderEndTag($writer); |
| 133 | - } |
|
| 134 | - else |
|
| 132 | + } else |
|
| 135 | 133 | $this->renderContents($writer); |
| 136 | 134 | } |
| 137 | 135 | |
@@ -97,8 +97,7 @@ discard block |
||
| 97 | 97 | $this->_cachedActiveViewIndex=-1; |
| 98 | 98 | if($index>=0) |
| 99 | 99 | $this->activateView($views->itemAt($index),true); |
| 100 | - } |
|
| 101 | - else |
|
| 100 | + } else |
|
| 102 | 101 | throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index); |
| 103 | 102 | } |
| 104 | 103 | |
@@ -153,8 +152,7 @@ discard block |
||
| 153 | 152 | $view->onActivate(null); |
| 154 | 153 | $this->onActiveViewChanged(null); |
| 155 | 154 | } |
| 156 | - } |
|
| 157 | - else if($v->getActive()) |
|
| 155 | + } else if($v->getActive()) |
|
| 158 | 156 | { |
| 159 | 157 | $v->setActive(false); |
| 160 | 158 | if($triggerEvent) |
@@ -232,8 +230,7 @@ discard block |
||
| 232 | 230 | { |
| 233 | 231 | $this->setActiveView($view); |
| 234 | 232 | return true; |
| 235 | - } |
|
| 236 | - else |
|
| 233 | + } else |
|
| 237 | 234 | throw new TInvalidDataValueException('multiview_viewid_invalid', $viewID); |
| 238 | 235 | case self::CMD_SWITCHVIEWINDEX: |
| 239 | 236 | $index=TPropertyValue::ensureInteger($param->getCommandParameter()); |
@@ -306,8 +306,7 @@ discard block |
||
| 306 | 306 | { |
| 307 | 307 | if($index===0 && $currentSection===TTableRowSection::Header) |
| 308 | 308 | $writer->renderBeginTag('thead'); |
| 309 | - } |
|
| 310 | - else |
|
| 309 | + } else |
|
| 311 | 310 | { |
| 312 | 311 | if($currentSection===TTableRowSection::Header) |
| 313 | 312 | { |
@@ -318,8 +317,7 @@ discard block |
||
| 318 | 317 | else |
| 319 | 318 | $writer->renderBeginTag('tfoot'); |
| 320 | 319 | $currentSection=$section; |
| 321 | - } |
|
| 322 | - else if($currentSection===TTableRowSection::Body) |
|
| 320 | + } else if($currentSection===TTableRowSection::Body) |
|
| 323 | 321 | { |
| 324 | 322 | $writer->renderEndTag(); |
| 325 | 323 | if($section===TTableRowSection::Footer) |
@@ -327,16 +325,14 @@ discard block |
||
| 327 | 325 | else |
| 328 | 326 | throw new TConfigurationException('table_tablesection_outoforder'); |
| 329 | 327 | $currentSection=$section; |
| 330 | - } |
|
| 331 | - else // Footer |
|
| 328 | + } else // Footer |
|
| 332 | 329 | throw new TConfigurationException('table_tablesection_outoforder'); |
| 333 | 330 | } |
| 334 | 331 | $row->renderControl($writer); |
| 335 | 332 | $writer->writeLine(); |
| 336 | 333 | } |
| 337 | 334 | $writer->renderEndTag(); |
| 338 | - } |
|
| 339 | - else |
|
| 335 | + } else |
|
| 340 | 336 | { |
| 341 | 337 | $writer->writeLine(); |
| 342 | 338 | foreach($this->getControls() as $row) |
@@ -211,8 +211,7 @@ discard block |
||
| 211 | 211 | $button=$this->createButton('Edit',$this->getEditText(),false,''); |
| 212 | 212 | $cell->getControls()->add($button); |
| 213 | 213 | $cell->registerObject('EditButton',$button); |
| 214 | - } |
|
| 215 | - else if($itemType===TListItemType::EditItem) |
|
| 214 | + } else if($itemType===TListItemType::EditItem) |
|
| 216 | 215 | { |
| 217 | 216 | $controls=$cell->getControls(); |
| 218 | 217 | $button=$this->createButton('Update',$this->getUpdateText(),$this->getCausesValidation(),$this->getValidationGroup()); |
@@ -222,8 +221,7 @@ discard block |
||
| 222 | 221 | $button=$this->createButton('Cancel',$this->getCancelText(),false,''); |
| 223 | 222 | $controls->add($button); |
| 224 | 223 | $cell->registerObject('CancelButton',$button); |
| 225 | - } |
|
| 226 | - else |
|
| 224 | + } else |
|
| 227 | 225 | parent::initializeCell($cell,$columnIndex,$itemType); |
| 228 | 226 | } |
| 229 | 227 | |
@@ -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 | } |