Code style (endif endforeach endfor and more)

app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php

@@ -95,19 +95,19 @@ protected function _initTotals()
             <td colspan="6" class="a-right"><strong><?php echo $this->__('Total Paid') ?></strong></td>
             <td class="last a-right"><strong><?php echo $_order->formatPrice($_creditmemo->getTotalPaid()) ?></strong></td>
         </tr>
-        <?php endif; ?>
+        <?php endif ?>
         <?php if ($this->getCanDisplayTotalRefunded()): ?>
         <tr>
             <td colspan="6" class="a-right"><strong><?php echo $this->__('Total Refunded') ?></strong></td>
             <td class="last a-right"><strong><?php echo $_order->formatPrice($_creditmemo->getTotalRefunded()) ?></strong></td>
         </tr>
-        <?php endif; ?>
+        <?php endif ?>
         <?php if ($this->getCanDisplayTotalDue()): ?>
         <tr>
             <td colspan="6" class="a-right"><strong><?php echo $this->__('Total Due') ?></strong></td>
             <td class="last a-right"><strong><?php echo $_order->formatPrice($_creditmemo->getTotalDue()) ?></strong></td>
         </tr>
-        <?php endif; ?>
+        <?php endif ?>
          */
         return $this;
     }

app/design/adminhtml/default/default/template/access_denied.phtml

@@ -37,4 +37,4 @@
 </p>
 <?php else: ?>
 <p><?php echo $this->helper('adminhtml')->__('Access denied.') ?></p>
-<?php endif?>
+<?php endif ?>

app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml

@@ -100,6 +100,6 @@
 <?php echo $myBlock->getJsObjectName() ?>.checkCheckboxes = myhandler;
 <?php echo $myBlock->getJsObjectName() ?>.rows.each(function(row){roleUsersRowInit(<?php echo $myBlock->getJsObjectName() ?>, row)});
     $('in_role_user_old').value = $('in_role_user').value;
-<?php endif; ?>
+<?php endif ?>
 //-->
 </script>

app/design/adminhtml/default/default/template/api/rolesedit.phtml

@@ -52,7 +52,7 @@
 <script type="text/javascript">
 <?php if($this->getEverythingAllowed()): ?>
     $('resources_container').hide();
-<?php endif; ?>
+<?php endif ?>
 Ext.EventManager.onDocumentReady(function() {
     var tree = new Ext.tree.TreePanel('resource-tree', {
         animate:false,

app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml

@@ -80,6 +80,6 @@
 <?php echo $myBlock->getJsObjectName() ?>.initRowCallback = rolesRowInit;
 <?php echo $myBlock->getJsObjectName() ?>.checkboxCheckCallback = registerUserRole;
 <?php echo $myBlock->getJsObjectName() ?>.rows.each(function(row){rolesRowInit(<?php echo $myBlock->getJsObjectName() ?>, row)});
-<?php endif; ?>
+<?php endif ?>
 //-->
 </script>

app/design/adminhtml/default/default/template/api/userinfo.phtml

@@ -34,7 +34,7 @@
                   <?php echo $this->__("Edit User '%s'", $_userName) ?>
                   <?php else: ?>
                   <?php echo $this->__('Add New User') ?>
-                  <?php endif; ?>
+                  <?php endif ?>
                 </h3>
             </td>
             <td class="form-buttons">

app/design/adminhtml/default/default/template/api/userroles.phtml

@@ -40,6 +40,6 @@
         }
     ?>
         <input type="checkbox" value="<?php echo $role->getRoleId(); ?>" <?php echo ($checked ? "checked" : ""); ?> name="roles[]" id="_<?php echo $role->getRoleId(); ?>" /> <label for="_<?php echo $role->getRoleId(); ?>" class="normal"><?php echo $role->getRoleName(); ?></label><br />
-    <?php endforeach; ?>
+    <?php endforeach ?>
     </fieldset>
 </div>

app/design/adminhtml/default/default/template/api2/attribute/resource.phtml

@@ -56,7 +56,7 @@
             <?php if ($this->hasEntityOnlyAttributes()): ?>
                 <div class="clear"></div>
                 <span>* This attribute data will be returned for a single resource only.</span>
-            <?php endif; ?>
+            <?php endif ?>
         </span>
 
     </fieldset>
@@ -66,7 +66,7 @@
 //<![CDATA[
 <?php if($this->getEverythingAllowed()): ?>
     $('resources_container').hide();
-<?php endif; ?>
+<?php endif ?>
 Ext.EventManager.onDocumentReady(function() {
     var tree = new Ext.tree.TreePanel('resource-tree', {
         animate:false,

app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml

@@ -117,6 +117,6 @@
         <?php echo $name ?>.checkCheckboxes = myhandler;
         <?php echo $name ?>.rows.each(function(row){roleUsersRowInit(<?php echo $name ?>, row)});
     $('in_role_users_old').value = $('in_role_users').value;
-        <?php endif; ?>
+        <?php endif ?>
 //]]>
 </script>

app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml

@@ -39,16 +39,16 @@ $_helper = $this->helper('authorizenet/admin');
 //<![CDATA[
 <?php if (isset($_params['redirect'])): ?>
 window.location="<?php echo $this->escapeUrl($_params['redirect']) ?>";
-<?php endif; ?>
+<?php endif ?>
 <?php if (isset($_params['redirect_parent'])): ?>
 window.top.location="<?php echo $this->escapeUrl($_params['redirect_parent']) ?>";
-<?php endif; ?>
+<?php endif ?>
 <?php if (isset($_params['error_msg'])): ?>
 window.top.directPostModel.showError(<?php echo $this->helper('core')->jsonEncode($_params['error_msg']) ?>);
 <?php if (isset($_params['x_invoice_num'])): ?>
 window.top.directPostModel.successUrl="<?php echo $_helper->getSuccessOrderUrl($_params) ?>";
-<?php endif; ?>
-<?php endif; ?>
+<?php endif ?>
+<?php endif ?>
 //]]>
 </script>
 </head>

app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml

@@ -82,7 +82,7 @@ $_orderUrl = $this->helper('authorizenet')->getPlaceOrderAdminUrl();
             <input type="text" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('payment')->__('Card Verification Number')) ?>" class="required-entry input-text validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" style="width:3em;" value="<?php echo $this->getInfoData('cc_cid')?>" />
         </div>
     </li>
-    <?php endif; ?>
+    <?php endif ?>
 </ul>
 <script type="text/javascript">
 //<![CDATA[
@@ -142,7 +142,7 @@ AdminOrder.prototype.getPaymentData = function(currentMethod) {
 };
 <?php if (!$this->isAjaxRequest()): ?>
 document.observe('dom:loaded', function(){
-<?php endif; ?>
+<?php endif ?>
 directPostModel = new directPost(
         '<?php echo $_code ?>',
         'directpost-iframe',
@@ -152,6 +152,6 @@ directPostModel = new directPost(
         '<?php echo $this->getUrl('*/*/save', array('_secure' => $this->getRequest()->isSecure())) ?>');
 <?php if (!$this->isAjaxRequest()): ?>
 });
-<?php endif; ?>
+<?php endif ?>
 //]]>
 </script>

app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml

@@ -35,8 +35,8 @@
             <?php foreach ($options as $option) : ?>
                 <?php if ($option->getSelections()) : ?>
                     <?php echo $this->getOptionHtml($option); ?>
-                <?php endif; ?>
-            <?php endforeach; ?>
+                <?php endif ?>
+            <?php endforeach ?>
         </dl>
     </div>
 </div>
@@ -92,4 +92,4 @@ BundleControl.prototype = {
 ProductConfigure.bundleControl = new BundleControl(<?php echo $this->getJsonConfig() ?>);
 </script>
 
-<?php endif; ?>
+<?php endif ?>

app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml

@@ -35,18 +35,18 @@
     <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
         <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
         <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" price="<?php echo $this->getSelectionPrice($_selections[0]) ?>"'/>
-    <?php else:?>
+    <?php else: ?>
         <ul class="options-list">
         <?php foreach($_selections as $_selection): ?>
             <li><input class="change-container-classname checkbox bundle-option-<?php echo $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" type="checkbox" name="bundle_option[<?php echo $_option->getId() ?>][]"<?php if ($this->_isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> value="<?php echo $_selection->getSelectionId() ?>" onclick="ProductConfigure.bundleControl.changeSelection(this)" price="<?php echo $this->getSelectionPrice($_selection) ?>"/>
                 <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection) ?></label></span>
                 <?php if($_option->getRequired()): ?>
                     <?php echo $this->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
-                <?php endif; ?>
+                <?php endif ?>
             </li>
-        <?php endforeach; ?>
+        <?php endforeach ?>
         </ul>
         <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
-    <?php endif; ?>
+    <?php endif ?>
     </div>
 </dd>

app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml

@@ -39,11 +39,11 @@
         <select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>][]" class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> bundle-option-select multiselect change-container-classname" onchange="ProductConfigure.bundleControl.changeSelection(this)">
         <?php if(!$_option->getRequired()): ?>
             <option value=""><?php echo $this->__('None') ?></option>
-        <?php endif; ?>
+        <?php endif ?>
         <?php foreach ($_selections as $_selection): ?>
             <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?php echo $this->getSelectionPrice($_selection) ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?></option>
-        <?php endforeach; ?>
+        <?php endforeach ?>
         </select>
-    <?php endif; ?>
+    <?php endif ?>
     </div>
 </dd>

app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml

@@ -43,23 +43,23 @@
     <?php if ($this->_showSingle()): ?>
         <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
         <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" price="<?php echo $this->getSelectionPrice($_selections[0]) ?>" />
-    <?php else:?>
+    <?php else: ?>
         <ul class="options-list">
         <?php if (!$_option->getRequired()): ?>
             <li><input type="radio" class="radio" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php echo ($_default && $_default->isSalable())?'':' checked="checked" ' ?> value="" onclick="ProductConfigure.bundleControl.changeSelection(this)"/>
             <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>"><?php echo $this->__('None') ?></label></span>
             </li>
-        <?php endif; ?>
+        <?php endif ?>
         <?php foreach ($_selections as $_selection): ?>
             <li><input type="radio" class="radio<?php echo $_option->getRequired()?' validate-one-required-by-name':'' ?> change-container-classname" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php if ($this->_isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>value="<?php echo $_selection->getSelectionId() ?>" onclick="ProductConfigure.bundleControl.changeSelection(this)" price="<?php echo $this->getSelectionPrice($_selection) ?>" qtyId="bundle-option-<?php echo $_option->getId() ?>-qty-input"/>
             <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionTitlePrice($_selection) ?></label></span>
             <?php if ($_option->getRequired()): ?>
                 <?php echo $this->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
-            <?php endif; ?>
+            <?php endif ?>
             </li>
-        <?php endforeach; ?>
+        <?php endforeach ?>
         </ul>
         <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
-    <?php endif; ?>
+    <?php endif ?>
     </div>
 </dd>

app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml

@@ -43,13 +43,13 @@
     <?php if ($this->_showSingle()): ?>
         <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
         <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" price="<?php echo $this->getSelectionPrice($_selections[0]) ?>"/>
-    <?php else:?>
+    <?php else: ?>
         <select id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]" class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> bundle-option-select change-container-classname" onchange="ProductConfigure.bundleControl.changeSelection(this)">
             <option value=""><?php echo $this->__('Choose a selection...') ?></option>
         <?php foreach ($_selections as $_selection): ?>
             <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?php echo $this->getSelectionPrice($_selection) ?>" qtyId="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->getSelectionTitlePrice($_selection, false) ?></option>
-        <?php endforeach; ?>
+        <?php endforeach ?>
         </select>
-    <?php endif; ?>
+    <?php endif ?>
     </div>
 </dd>

app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml

@@ -38,9 +38,9 @@ if(typeof Bundle=='undefined') {
         <table cellspacing="0" class="form-list">
         <tr>
             <td class="label"><label for="shipment_type"><?php echo Mage::helper('bundle')->__('Ship Bundle Items') ?></label></td>
-            <td class="value"><select <?php if ($this->isReadonly()): ?>disabled="disabled" <?php endif;?>id="shipment_type" name="<?php echo $this->getFieldSuffix() ?>[shipment_type]" class="select">
+            <td class="value"><select <?php if ($this->isReadonly()): ?>disabled="disabled" <?php endif ?>id="shipment_type" name="<?php echo $this->getFieldSuffix() ?>[shipment_type]" class="select">
                 <option value="1"><?php echo Mage::helper('bundle')->__('Separately') ?></option>
-                <option value="0"<?php if ($this->getProduct()->getShipmentType() == 0): ?> selected="selected"<?php endif; ?>><?php echo Mage::helper('bundle')->__('Together') ?></option>
+                <option value="0"<?php if ($this->getProduct()->getShipmentType() == 0): ?> selected="selected"<?php endif ?>><?php echo Mage::helper('bundle')->__('Together') ?></option>
             </select>
             </td>
         </tr>
@@ -70,7 +70,7 @@ $('product_bundle_container').select('input', 'select', 'textarea', 'button').ea
         input.addClassName('disabled');
     }
 });
-<?php endif; ?>
+<?php endif ?>
 Validation.add('validate-greater-zero-based-on-option', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Please enter a number greater 0 in this field.')) ?>', function(v, el) {
     var optionType = $(el).up('div.grid').previous('table.option-header').select('select.select-product-option-type')[0],
         v = Number(v) || 0;

app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml

@@ -32,15 +32,15 @@ optionTemplate = '<div id="<?php echo $this->getFieldId() ?>_{{index}}"  class="
     '<input class="input-text required-entry" type="text" name="<?php echo $this->getFieldName() ?>[{{index}}][title]" id="id_<?php echo $this->getFieldName() ?>_{{index}}_title" value="{{title}}">' +
     <?php else: ?>
     '<input class="input-text required-entry" type="text" name="<?php echo $this->getFieldName() ?>[{{index}}][default_title]" id="id_<?php echo $this->getFieldName() ?>_{{index}}_default_title" value="{{default_title}}">' +
-    <?php endif; ?>
+    <?php endif ?>
 '<?php echo $this->jsQuoteEscape($this->getOptionDeleteButtonHtml()) ?>' +
 '</div>' +
     '<table class="option-header" cellpadding="0" cellspacing="0">' +
         '<thead>' +
             '<tr>' +
                 <?php if (!$this->isDefaultStore()): ?>
                 '<th class="opt-title"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Store View Title')) ?>  <span class="required">*</span></th>' +
-                <?php endif; ?>
+                <?php endif ?>
                 '<th class="opt-type"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Input Type')) ?></th>' +
                 '<th class="opt-req"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Is Required')) ?></th>' +
                 '<th class="opt-order"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Position')) ?></th>' +
@@ -53,7 +53,7 @@ optionTemplate = '<div id="<?php echo $this->getFieldId() ?>_{{index}}"  class="
                 '<input type="hidden" name="<?php echo $this->getFieldName() ?>[{{index}}][delete]" value="" class="delete">' +
                 <?php if (!$this->isDefaultStore()): ?>
                 '<td><input class="input-text required-entry" type="text" name="<?php echo $this->getFieldName() ?>[{{index}}][title]" id="id_<?php echo $this->getFieldName() ?>_{{index}}_title_store" value="{{title}}"></td>' +
-                <?php endif; ?>
+                <?php endif ?>
                 '<td><?php echo $this->getTypeSelectHtml() ?></td>' +
                 '<td><?php echo $this->getRequireSelectHtml() ?></td>' +
                 '<td><input class="input-text validate-zero-or-greater" type="text" name="<?php echo $this->getFieldName() ?>[{{index}}][position]" value="{{position}}"></td>' +
@@ -217,9 +217,9 @@ bOption = new Bundle.Option(optionTemplate);
         <?php $_selection->setName($this->escapeHtml($_selection->getName())); ?>
         <?php $_selection->setSku($this->escapeHtml($_selection->getSku())); ?>
         bSelection.addRow(optionIndex, <?php echo $_selection->toJson() ?>);
-        <?php endforeach; ?>
-    <?php endif; ?>
-<?php endforeach; ?>
+        <?php endforeach ?>
+    <?php endif ?>
+<?php endforeach ?>
 /**
  * Adding event on price type select box of product to hide or show prices for selections
  */