Don't worry! It's only stuff...

#!/bin/bash

LOG=/var/log/magento/del_unused_img.log

. /etc/magento/magento.conf

function search_db() {
    COUNT=$(mysql -u ${DB_USER} -p${DB_PASS} ${DB_NAME} --execute="SELECT count(*) FROM catalog_product_entity_media_gallery WHERE value = \"$1\"")

    echo $(echo ${COUNT} | cut -d" " -f2)
}

echo $(date) | tee -a ${LOG}

for IMG in $(find /var/www/media/catalog/product/ -name '*.jpg' ! -path '*cache*' ! -name 'google*'); do
    # search in db
    if [ $(search_db ${IMG/'/var/www/media/catalog/product'/}) != 1 ]; then
        IMG=${IMG##*/}
        for CACHE_IMG in $(find /var/www/media/catalog/product/ -name "${IMG}"); do
            echo "${CACHE_IMG}" | tee -a ${LOG}
            
            rm "${CACHE_IMG}"
        done

        echo "" | tee -a ${LOG}
    fi
done

--- ./app/design/frontend/base/default/template/tax/order/tax.phtml	2011-06-22 16:08:45.000000000 +0200
+++ ./app/design/frontend/default/default/template/tax/order/tax.phtml	2011-06-22 16:07:28.000000000 +0200
@@ -46,9 +46,9 @@
         <tr class="tax-details-<?php echo $taxIter; ?> tax-details<?php if ($isTop): echo ' tax-details-first'; endif; ?>"<?php if (!$this->getIsPlaneMode()):?> style="display:none;"<?php endif;?>>
             <td <?php echo $this->getLabelProperties()?>>
                 <?php echo $rate['title']; ?>
-                <?php if ($rate['percent']): ?>
+                <!-- <?php if ($rate['percent']): ?>
                     (<?php echo $rate['percent']; ?>%)
-                <?php endif; ?>
+                <?php endif; ?>-->
                 <br />
             </td>
             <?php if ($isFirst): ?>
@@ -63,7 +63,7 @@
     <?php endforeach; ?>
 <?php endif;?>
 
-<?php if ($this->displayFullSummary() && $_fullInfo && !$this->getIsPlaneMode()): ?>
+<!-- <?php if ($this->displayFullSummary() && $_fullInfo && !$this->getIsPlaneMode()): ?>
 <tr class="tax-total" onclick="expandDetails(this, '.tax-details-<?php echo $taxIter;?>')">
 <?php elseif ($this->displayFullSummary() && $_fullInfo && $this->getIsPlaneMode()): ?>
 <tr class="show-details">
@@ -78,4 +78,4 @@
         <?php endif;?>
     </td>
     <td <?php echo $this->getValueProperties()?>><?php echo $_order->formatPrice($_source->getTaxAmount()) ?></td>
-</tr>
+</tr> -->

--- ./app/design/frontend/base/default/template/sales/order/totals.phtml	2011-06-22 16:05:58.000000000 +0200
+++ ./app/design/frontend/default/default/template/sales/order/totals.phtml	2011-06-22 16:05:47.000000000 +0200
@@ -29,9 +29,7 @@
  */
 ?>
 <?php foreach ($this->getTotals() as $_code => $_total): ?>
-    <?php if ($_total->getBlockName()): ?>
-        <?php echo $this->getChildHtml($_total->getBlockName(), false); ?>
-    <?php else:?>
+    <?php if (!$_total->getBlockName()): ?>
     <tr class="<?php echo $_code?>">
         <td <?php echo $this->getLabelProperties()?>>
             <?php if ($_total->getStrong()):?>
@@ -50,3 +48,11 @@
     </tr>
     <?php endif?>
 <?php endforeach?>
+
+<?php foreach ($this->getTotals() as $_code => $_total): ?>
+    <?php if ($_total->getBlockName()): ?>
+    <tr class="<?php echo $_code?>">
+        <?php  echo $this->getChildHtml($_total->getBlockName(), false); ?>
+    </tr>
+    <?php endif?>
+<?php endforeach?>

--- ./app/code/core/Mage/Checkout/Model/Type/Onepage.php.org	2011-04-06 16:23:32.000000000 +0200
+++ ./app/code/core/Mage/Checkout/Model/Type/Onepage.php	2011-04-06 16:43:11.000000000 +0200
@@ -623,13 +623,13 @@
         /**
          * we only want to send to customer about new order when there is no redirect to third party
          */
-        if(!$redirectUrl){
+//        if(!$redirectUrl){
             try {
                 $order->sendNewOrderEmail();
             } catch (Exception $e) {
                 Mage::logException($e);
             }
-        }
+//        }
 
         $this->getCheckout()->setLastQuoteId($this->getQuote()->getId())
             ->setLastOrderId($order->getId())

--- ./js/prototype/validation.js.org	2011-03-28 15:40:04.000000000 +0200
+++ ./js/prototype/validation.js	2011-03-28 15:39:46.000000000 +0200
@@ -456,7 +456,7 @@
                     }],
     ['validate-password', 'Please enter 6 or more characters. Leading or trailing spaces will be ignored.', function(v) {
                 var pass=v.strip(); /*strip leading and trailing spaces*/
-                return !(pass.length>0 && pass.length < 6);
+                return !(pass.length>0 && pass.length < 4);
             }],
     ['validate-admin-password', 'Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.', function(v) {
                 var pass=v.strip();

--- ./app/code/community/EM/DeleteOrder/Block/Adminhtml/Sales/Order/Grid.php.org	2011-02-10 16:16:35.000000000 +0100
+++ ./app/code/community/EM/DeleteOrder/Block/Adminhtml/Sales/Order/Grid.php	2011-03-27 18:16:36.000000000 +0200
@@ -50,10 +50,10 @@
      *
      * @return string
      */
-    /*protected function _getCollectionClass()
+    protected function _getCollectionClass()
     {
         return 'sales/order_grid_collection';
-    }*/
+    }
 
     protected function _prepareCollection()
     {

--- ./app/code/community/EM/DeleteOrder/controllers/Adminhtml/Sales/OrderController.php.org	2011-03-27 18:24:57.000000000 +0200
+++ ./app/code/community/EM/DeleteOrder/controllers/Adminhtml/Sales/OrderController.php	2011-03-27 18:25:14.000000000 +0200
@@ -43,6 +43,7 @@
 					$query=null;
 					$order = Mage::getModel('sales/order')->load($orderId);					
 					if($order->increment_id){
+                        $order->delete(); break;
 						/*$query="show tables like 'sales_flat_order'";
 						$rs=$write->fetchAll($query);*/						
 						$incId=$order->increment_id;

--- ./app/design/frontend/base/default/template/customer/address/book.phtml.org	2011-03-25 11:54:09.000000000 +0100
+++ ./app/design/frontend/base/default/template/customer/address/book.phtml	2011-03-25 12:38:08.000000000 +0100
@@ -32,7 +32,6 @@
 ?>
 <div class="page-title title-buttons">
     <h1><?php echo $this->__('Address Book') ?></h1>
-    <button type="button" title="<?php echo $this->__('Add New Address') ?>" class="button" onclick="window.location='<?php echo $this->getAddAddressUrl() ?>';"><span><span><?php echo $this->__('Add New Address') ?></span></span></button>
 </div>
 <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
 <div class="col2-set addresses-list">
@@ -56,15 +55,19 @@
         
         <?php if($_pAddsses = Mage::getSingleton('customer/session')->getCustomer()->getDefaultShipping()): ?>
             <li class="item">
-                <h3><?php echo $this->__('Default Shipping Address') ?></h3>
-                <address>
-                    <?php echo $this->getAddressHtml(Mage::getSingleton('customer/session')->getCustomer()->getAddressById($_pAddsses)) ?>
-                </address>
-                <p><a href="<?php echo $this->getAddressEditUrl(Mage::getSingleton('customer/session')->getCustomer()->getAddressById($_pAddsses)) ?>"><?php echo $this->__('Change Shipping Address') ?></a></p>
+            <h3><?php echo $this->__('Default Shipping Address') ?></h3>
+                <?php if($_pAddsses == Mage::getSingleton('customer/session')->getCustomer()->getDefaultBilling()): ?>
+                    <p><?php echo $this->__('Default Shipping Address will use the Billing Address') ?></p>
+                    <p><a href="<?php echo $this->getAddAddressUrl(); ?>"><?php echo $this->__('Add a new address to my address book') ?></a></p>
+                <?php else: ?>
+                    <address>
+                        <?php echo $this->getAddressHtml(Mage::getSingleton('customer/session')->getCustomer()->getAddressById($_pAddsses)) ?>
+                    </address>
+                    <a href="<?php echo $this->getAddressEditUrl(Mage::getSingleton('customer/session')->getCustomer()->getAddressById($_pAddsses)) ?>"><?php echo $this->__('Change Shipping Address') ?></a>
+                <?php endif ?>
             </li>
         <?php else: ?>
             <li class="item empty">
-                <h3><?php echo $this->__('Default Shipping Address') ?></h3>
                 <p><?php echo $this->__('You have no default shipping address in your address book.') ?></p>
             </li>
         <?php endif ?>
@@ -88,6 +91,7 @@
             </li>
         <?php endif ?>
         </ol>
+        <button type="button" title="<?php echo $this->__('Add New Address') ?>" class="button" onclick="window.location='<?php echo $this->getAddAddressUrl() ?>';"><span><span><?php echo $this->__('Add New Address') ?></span></span></button>
     </div>
 </div>
 <div class="buttons-set">

--- ./app/design/frontend/base/default/template/customer/account/dashboard/address.phtml.org	2011-03-25 11:42:43.000000000 +0100
+++ ./app/design/frontend/base/default/template/customer/account/dashboard/address.phtml	2011-03-25 12:40:01.000000000 +0100
@@ -28,7 +28,6 @@
     <div class="box">
         <div class="box-title">
             <h3><?php echo $this->__('Address Book') ?></h3>
-            <a href="<?php echo $this->getAddressBookUrl() ?>"><?php echo $this->__('Manage Addresses') ?></a>
         </div>
         <div class="box-content">
             <div class="col-1">
@@ -40,11 +39,23 @@
             </div>
             <div class="col-2">
                 <h4><?php echo $this->__('Default Shipping Address') ?></h4>
-                <address>
-                    <?php echo $this->getPrimaryShippingAddressHtml() ?><br />
-                    <a href="<?php echo $this->getPrimaryShippingAddressEditUrl() ?>"><?php echo $this->__('Edit Address') ?></a>
-                </address>
-            </div>
+                <?php if($_pAddsses = Mage::getSingleton('customer/session')->getCustomer()->getDefaultShipping()): ?>
+                    <?php if($_pAddsses == Mage::getSingleton('customer/session')->getCustomer()->getDefaultBilling()): ?>
+                        <?php echo $this->__('Default Shipping Address will use the Billing Address') ?>
+                        <br clear="all" />
+                        <br clear="all" />
+                        <a href="<?php echo $this->getAddressBookUrl() ?>"><?php echo $this->__('Manage Addresses') ?></a>
+                    <?php else: ?>
+                        <address>
+                            <?php echo $this->getPrimaryShippingAddressHtml() ?>
+                        </address>
+                        <br clear="all" />
+                        <a href="<?php echo $this->getPrimaryShippingAddressEditUrl() ?>"><?php echo $this->__('Edit Address') ?></a>
+                    <?php endif ?> 
+                <?php else: ?>
+                    <?php echo $this->__('You have no default shipping address in your address book.') ?>           
+                <?php endif ?>
+            </div> 
         </div>
     </div>
 </div>